From f777a4f1d5abd2057e324f87c8c90e21189ec9d7 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Thu, 5 Apr 2012 03:11:09 +0200 Subject: [PATCH] start 2.9 cycle with most of the toolkit winstripe changes for both themes --- EarlyBlue/global/customizeToolbar.css | 9 +++++++++ EarlyBlue/global/listbox.css | 14 -------------- EarlyBlue/global/media/videocontrols.css | 9 +++------ EarlyBlue/install.rdf | 4 ++-- EarlyBlue/mozapps/extensions/extensions.css | 11 ++++++++--- LCARStrek/global/customizeToolbar.css | 9 +++++++++ LCARStrek/global/listbox.css | 13 ------------- LCARStrek/global/media/scrubberThumb.png | Bin 632 -> 200 bytes LCARStrek/global/media/scrubberThumbWide.png | Bin 747 -> 200 bytes LCARStrek/global/media/videocontrols.css | 13 +++++-------- LCARStrek/install.rdf | 4 ++-- LCARStrek/mozapps/extensions/extensions.css | 11 ++++++++--- origdiff | 16 ++++++++-------- 13 files changed, 54 insertions(+), 59 deletions(-) diff --git a/EarlyBlue/global/customizeToolbar.css b/EarlyBlue/global/customizeToolbar.css index 0879fbb7..407571df 100644 --- a/EarlyBlue/global/customizeToolbar.css +++ b/EarlyBlue/global/customizeToolbar.css @@ -46,3 +46,12 @@ dialog { font-weight: bold; font-size: larger; } + +#palette-box { + margin: 0 0 10px; +} + +#palette-box > toolbarpaletteitem { + padding: 8px 2px; + margin: 0 8px; +} diff --git a/EarlyBlue/global/listbox.css b/EarlyBlue/global/listbox.css index 898ec362..4a1436c5 100644 --- a/EarlyBlue/global/listbox.css +++ b/EarlyBlue/global/listbox.css @@ -137,17 +137,3 @@ listheader[sortable="true"]:hover:active { min-height: 12px; background: #FFFFFF no-repeat 50% 50%; } - -.listcell-check[checked="true"] { - background-image: url("chrome://global/skin/checkbox/cbox-check.gif"); -} - -.listcell-check[disabled="true"] { - border-color: #808080; - background-image: url("chrome://global/skin/checkbox/cbox-disabled.gif"); -} - -.listcell-check[disabled="true"][checked="true"] { - background-image: url("chrome://global/skin/checkbox/cbox-check-disabled.gif"); -} - diff --git a/EarlyBlue/global/media/videocontrols.css b/EarlyBlue/global/media/videocontrols.css index c76db360..9d85d889 100644 --- a/EarlyBlue/global/media/videocontrols.css +++ b/EarlyBlue/global/media/videocontrols.css @@ -40,10 +40,7 @@ } .fullscreenButton { - background-color: transparent; - list-style-image: url("chrome://global/skin/media/fullscreenButton.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); - -moz-appearance: none; + background: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0) no-repeat center; margin: 0; padding: 0; min-height: 28px; @@ -52,7 +49,7 @@ } .fullscreenButton[fullscreened] { - -moz-image-region: rect(0px, 32px, 16px, 16px); + background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 32, 16, 16); } .volumeStack { @@ -178,7 +175,7 @@ font-size: 10px; font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; text-shadow: rgba(102,102,153, 0.3) 0 1px; - padding-top: 2px; + padding-top: 5px; } .statusOverlay { diff --git a/EarlyBlue/install.rdf b/EarlyBlue/install.rdf index e2ba6127..3a93f421 100644 --- a/EarlyBlue/install.rdf +++ b/EarlyBlue/install.rdf @@ -5,13 +5,13 @@ EarlyBlue@kairo.at - 2.8 + 2.9 {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} - 2.8 + 2.9 2.11a1 diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css index 9f5e40f2..21f90ab3 100644 --- a/EarlyBlue/mozapps/extensions/extensions.css +++ b/EarlyBlue/mozapps/extensions/extensions.css @@ -90,7 +90,7 @@ border-bottom: 1px solid #9999CC; } -@media all and (max-width: 600px) { +@media (max-width: 600px) { .global-warning-text { display: none; } @@ -239,7 +239,7 @@ } /* Maximize the size of the viewport when the window is small */ -@media all and (max-width: 800px) { +@media (max-width: 800px) { .category-name { display: none; } @@ -739,9 +739,13 @@ -moz-margin-start: 0; } -#detail-icon { +#detail-icon-container { + width: 64px; -moz-margin-end: 10px; margin-top: 6px; +} + +#detail-icon { max-width: 64px; max-height: 64px; } @@ -819,6 +823,7 @@ } #detail-grid > columns > column:first-child { + min-width: 15em; max-width: 25em; } diff --git a/LCARStrek/global/customizeToolbar.css b/LCARStrek/global/customizeToolbar.css index 0879fbb7..407571df 100644 --- a/LCARStrek/global/customizeToolbar.css +++ b/LCARStrek/global/customizeToolbar.css @@ -46,3 +46,12 @@ dialog { font-weight: bold; font-size: larger; } + +#palette-box { + margin: 0 0 10px; +} + +#palette-box > toolbarpaletteitem { + padding: 8px 2px; + margin: 0 8px; +} diff --git a/LCARStrek/global/listbox.css b/LCARStrek/global/listbox.css index 2f5a6d3c..e2e50165 100644 --- a/LCARStrek/global/listbox.css +++ b/LCARStrek/global/listbox.css @@ -139,16 +139,3 @@ listheader[sortable="true"]:hover:active { min-height: 12px; background: #000000 no-repeat 50% 50%; } - -.listcell-check[checked="true"] { - background-image: url("chrome://global/skin/checkbox/cbox-check.gif"); -} - -.listcell-check[disabled="true"] { - border-color: #8050B0; - background-image: url("chrome://global/skin/checkbox/cbox-disabled.gif"); -} - -.listcell-check[disabled="true"][checked="true"] { - background-image: url("chrome://global/skin/checkbox/cbox-check-disabled.gif"); -} diff --git a/LCARStrek/global/media/scrubberThumb.png b/LCARStrek/global/media/scrubberThumb.png index 7bbdaf5635092ed5af467d247a6406e3b12ad7a4..698823e58feed969cd63a1d66069c0f6c81f50ba 100644 GIT binary patch delta 157 zcmeyta)NP!gcBn(0|Ud=b1v~fim^Dz-HBn{IhmJ04qJdvh%1nuGw1)p8J7-#q)USQ zf*Bm1-ADs*lDyqr7&=&GJtjKH1>9kl6lXU*%=B3SD5dA=;uyklJvre3!`J`+|EDJ~ z2>qANaB@16{@_33rk=md9VvATN|O8yZ}SrlFfl|l`o%9W-{b+*$>8bg=d#Wzp$Pya C<}@z= delta 593 zcmV-X0DC?eU_<;pX;Z?TZVhqch zhDfRG#(f;lf%l+2zhD1NSqHIpyu=cIWuQ6SiZM)W2$52G3iogfojGu;w1n^YgxfKO z_v;{1D(~Q0{`o zn2a&hHe1TuaULgf8Nbv-@E5s^f54jO06Bw~x$9ch0xrfF-fq=j(F{Zm zG_q!Rq#1ywA+iQ@AGz974mRtkX^0rZ&wT!2CO_Nlm5^`0dRqy^SndhNs)U%ummX}Z fQ%dE-?fUo)IpC3f5WfEQ00000NkvXXu0mjfyM-6) diff --git a/LCARStrek/global/media/scrubberThumbWide.png b/LCARStrek/global/media/scrubberThumbWide.png index a2a52573ea5a803b190da16bbfd97edef3b6fd91..a76ec78fe8416db453430ca971527517b1fbecfc 100644 GIT binary patch delta 157 zcmaFOdV+C+gcBn(0|UePPfIQWDaPU;cPEB*=VV?2IcxzwA+A7r&Yb@XXIwe}k}e7I z3ubV5b|VeMN%D4gVd!9$^_b`&7jTDJQk=uWN_%n;P)g6!#W95AdUC=6wpag|53;if z{QS=@tFfY%hvysrfp4ef8G`@tCUnU@(okcQVPIIuoVIH7yk*HioeZ9?elF{r5}E)6 CN-`G! delta 709 zcmV;$0y_Q30qX^j7$^t^0002>JT{U50004VQb$4nuFf3k00006VoOIv0RI600RN!9 zr<0Ld9)H;e2NV}8Sz=ry0007ONkln=MKF1;}Eu@MA$NghomxhRFCi&s>``bxmVD&pc6nALSbvB`c#jYGitiY}JM`iqZp9ehwK{%i z0&qF@U^|v!DQ2QbO$IP6{jO^9x&~`wHPQr!;=k|)uW=h!VhlYkL6>C}(1~5xhmFll zE~6?uKo_o~FUC;)6S^#`9XNv(=$K&Gk>LCB3P)oMxBh}o*}Z_>SkNMD)vVQ8Y+L{4 zBY&>qP>i7(^44YSO&e)6HPW-F4IFarp?`eSnXEb!`$MwC4a_t7^#wZ%oJju7?Z@#@ z2Tl~p?BCMyV-mv;CeHo>Z_^BljG%SD=K?Ph=i36u(UUnNqrJDI9vm-X481s&uGw4} z8SQGjdUZf$0e-8tc+P2tIdAmF%HBS9*tIe zOv6?j!zRqH6+{!E20r6HPUCKjq0#ixm1Q+A6;21S8nbH^T22k%2cF|1uE!X@w0*6X zWz~UgIGk2sZksF6NOksooWq?ML;rZy0?M)~uoh>rIr+a?{lq;S!IK!nV7oiLRe$(^ zEot+v`A_B>c!mS$9$q6)7<3JOI(8=b&JmjQCDC_5BA4$P%wjY8TH400000NkvXXu0mjftCLc> diff --git a/LCARStrek/global/media/videocontrols.css b/LCARStrek/global/media/videocontrols.css index 1c7d9fc4..2e2b7131 100644 --- a/LCARStrek/global/media/videocontrols.css +++ b/LCARStrek/global/media/videocontrols.css @@ -59,10 +59,7 @@ } .fullscreenButton { - background-color: transparent; - list-style-image: url("chrome://global/skin/media/fullscreenButton.png"); - -moz-image-region: rect(0px, 16px, 16px, 0px); - -moz-appearance: none; + background: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0) no-repeat center; margin: 0; padding: 0; min-height: 28px; @@ -72,16 +69,16 @@ .fullscreenButton:hover { background-color: rgba(255,207,0,0.75); - -moz-image-region: rect(16px, 16px, 32px, 0px); + background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 16, 16, 32, 0); } .fullscreenButton[fullscreened] { - -moz-image-region: rect(0px, 32px, 16px, 16px); + background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 32, 16, 16); } .fullscreenButton[fullscreened]:hover { background-color: rgba(255,207,0,0.75); - -moz-image-region: rect(16px, 32px, 32px, 16px); + background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 16, 32, 32, 16); } .volumeStack { @@ -215,7 +212,7 @@ font-size: 10px; font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; text-shadow: rgba(255,259,0, 0.3) 0 1px; - padding-top: 2px; + padding-top: 5px; } .statusOverlay { diff --git a/LCARStrek/install.rdf b/LCARStrek/install.rdf index 283a2be4..5105f2ad 100644 --- a/LCARStrek/install.rdf +++ b/LCARStrek/install.rdf @@ -5,7 +5,7 @@ LCARStrek@kairo.at - 2.8 + 2.9 @@ -19,7 +19,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} - 11.0 + 12.0 14.0a1 diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css index 24f925b4..b8e7e4f9 100644 --- a/LCARStrek/mozapps/extensions/extensions.css +++ b/LCARStrek/mozapps/extensions/extensions.css @@ -90,7 +90,7 @@ border-bottom: 3px solid #000000; } -@media all and (max-width: 600px) { +@media (max-width: 600px) { .global-warning-text { display: none; } @@ -251,7 +251,7 @@ } /* Maximize the size of the viewport when the window is small */ -@media all and (max-width: 800px) { +@media (max-width: 800px) { .category-name { display: none; } @@ -786,9 +786,13 @@ -moz-margin-start: 0; } -#detail-icon { +#detail-icon-container { + width: 64px; -moz-margin-end: 10px; margin-top: 6px; +} + +#detail-icon { max-width: 64px; max-height: 64px; } @@ -862,6 +866,7 @@ } #detail-grid { + min-width: 15em; margin-bottom: 2em; } diff --git a/origdiff b/origdiff index 8d99e2df..b680858b 100755 --- a/origdiff +++ b/origdiff @@ -6,15 +6,15 @@ SCRIPT_DIR=$(pwd) # ============ vars specific to the versions ============== -NAME_PRE=10 -NAME_POST=11 +NAME_PRE=11 +NAME_POST=12 -TAG_PRE_COMM=BETA_10_END -TAG_POST_COMM=tip #BETA_11_END -TAG_PRE_MOZ=FIREFOX_BETA_10 #FIREFOX_BETA_10_END -TAG_POST_MOZ=tip #FIREFOX_BETA_11_END -TAG_PRE_EXT=SEAMONKEY_2_7_RELEASE #SEAMONKEY_2_7_RELEASE -TAG_POST_EXT=tip #SEAMONKEY_2_8_RELEASE +TAG_PRE_COMM=BETA_11_END +TAG_POST_COMM=tip #BETA_12_END +TAG_PRE_MOZ=FIREFOX_BETA_11_END +TAG_POST_MOZ=tip #FIREFOX_BETA_12_END +TAG_PRE_EXT=SEAMONKEY_2_8_RELEASE +TAG_POST_EXT=tip #SEAMONKEY_2_9_RELEASE # ===================== process repos ===================== -- 2.35.3