From 87a1144f3acafe3109028fc3d30c7dd2dbdff01e Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 22 Sep 2013 21:01:19 +0200 Subject: [PATCH] sync both themes with toolkit windows theme changes in Mozilla 25 cycle --- EarlyBlue/global/findBar.css | 106 +++++++++------ EarlyBlue/global/icons/close.png | Bin 0 -> 170 bytes EarlyBlue/global/icons/find-arrows.png | Bin 0 -> 221 bytes EarlyBlue/global/icons/webapps-16.png | Bin 0 -> 191 bytes EarlyBlue/global/icons/webapps-64.png | Bin 0 -> 336 bytes EarlyBlue/global/scrollbars.css | 13 ++ LCARStrek/browser/browser.css | 4 +- LCARStrek/browser/notifyPluginBlocked.png | Bin 226 -> 0 bytes LCARStrek/browser/notifyPluginOutdated.png | Bin 263 -> 0 bytes LCARStrek/global/findBar.css | 128 +++++++++++------- LCARStrek/global/icons/find-arrows.png | Bin 0 -> 254 bytes .../{browser => global/icons}/webapps-16.png | Bin .../{browser => global/icons}/webapps-64.png | Bin LCARStrek/global/scrollbars.css | 13 ++ 14 files changed, 170 insertions(+), 94 deletions(-) create mode 100644 EarlyBlue/global/icons/close.png create mode 100644 EarlyBlue/global/icons/find-arrows.png create mode 100644 EarlyBlue/global/icons/webapps-16.png create mode 100644 EarlyBlue/global/icons/webapps-64.png delete mode 100644 LCARStrek/browser/notifyPluginBlocked.png delete mode 100644 LCARStrek/browser/notifyPluginOutdated.png create mode 100644 LCARStrek/global/icons/find-arrows.png rename LCARStrek/{browser => global/icons}/webapps-16.png (100%) rename LCARStrek/{browser => global/icons}/webapps-64.png (100%) diff --git a/EarlyBlue/global/findBar.css b/EarlyBlue/global/findBar.css index 52edacef..8e4c3379 100644 --- a/EarlyBlue/global/findBar.css +++ b/EarlyBlue/global/findBar.css @@ -1,9 +1,5 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -.findbar-closebutton { - list-style-image: url("chrome://global/skin/icons/close-button.gif"); -} - findbar { border-top: 1px solid #666699; border-bottom: 1px solid transparent; @@ -13,6 +9,10 @@ findbar { transition-timing-function: ease-in-out, ease-in-out, linear; } +findbar[position="top"] { + transition-property: margin-top, opacity, visibility; +} + findbar[hidden] { /* Override display:none to make the transition work. */ display: -moz-box; @@ -22,71 +22,91 @@ findbar[hidden] { transition-delay: 0s, 0s, 150ms; } -/* find-next button */ +findbar[position="top"][hidden] { + margin-bottom: auto; + margin-top: -1em; +} -.findbar-find-next { - list-style-image: url("chrome://global/skin/icons/find.png"); - -moz-image-region: rect(0px 16px 16px 0px); +.findbar-closebutton { + list-style-image: url("chrome://global/skin/icons/close.png"); } -.findbar-find-next[disabled="true"] { - -moz-image-region: rect(16px 16px 32px 0px); +/* Search field */ + +.findbar-textbox { + width: 14em; +} + +.findbar-textbox[status="notfound"] { + background-color: #FFC0C0; + color: #000000; +} + +.findbar-textbox[flash="true"] { + background-color: #FFFFC0; + color: #000000; +} + +.findbar-textbox.minimal { +} + +/* Buttons */ + +.findbar-find-previous, +.findbar-find-next { + list-style-image: url("chrome://global/skin/icons/find-arrows.png"); } -/* find-previous button */ +.findbar-find-previous:not([disabled]):active, +.findbar-find-next:not([disabled]):active { +} .findbar-find-previous { - list-style-image: url("chrome://global/skin/icons/find.png"); - -moz-image-region: rect(0px 32px 16px 16px); + -moz-image-region: rect(0, 12px, 9px, 0); } -.findbar-find-previous[disabled="true"] { - -moz-image-region: rect(16px 32px 32px 16px); +.findbar-find-next { + -moz-image-region: rect(0, 24px, 9px, 12px); } -/* highlight button */ +.findbar-find-previous, +.findbar-find-previous:not([disabled]):active { +} -.findbar-highlight { - list-style-image: url("chrome://global/skin/icons/find.png"); - -moz-image-region: rect(0px 48px 16px 32px); +.findbar-find-previous[disabled="true"] { + -moz-image-region: rect(9px, 12px, 18px, 0); } -.findbar-higlight[disabled="true"] { - -moz-image-region: rect(16px 48px 32px 32px); +.findbar-find-next[disabled="true"] { + -moz-image-region: rect(9px, 24px, 18px, 12px); } -.find-status-icon { - list-style-image: none; - margin-top: 0px; - margin-bottom: 0px; - -moz-margin-start: 12px; - -moz-margin-end: 0px; - width: 16px; - height: 16px; +.findbar-find-previous > .toolbarbutton-icon, +.findbar-find-next > .toolbarbutton-icon { } -.findbar-find-status { - margin: 0 !important; - -moz-margin-start: 3px !important; - padding: 2px !important; +.findbar-find-previous > .toolbarbutton-text, +.findbar-find-next > .toolbarbutton-text { } -.find-status-icon[status="notfound"] { - list-style-image: url("chrome://global/skin/icons/information-16.png"); +.findbar-find-previous[disabled="true"] > .toolbarbutton-icon, +.findbar-find-next[disabled="true"] > .toolbarbutton-icon { } -.findbar-textbox[status="notfound"] { - box-shadow: 0 0 0 1em #FFC0C0 inset; - color: #000000; +.findbar-highlight, +.findbar-case-sensitive { + -moz-margin-start: 5px; } -.findbar-textbox[flash="true"] { - box-shadow: 0 0 0 1em #FFFFC0 inset; - color: #000000; +.findbar-highlight > .toolbarbutton-icon, +.findbar-case-sensitive > .toolbarbutton-icon { + display: none; } -.find-status-icon[status="wrapped"] { - list-style-image: url("chrome://global/skin/icons/wrap.png"); +.findbar-find-status { + color: #808080; + margin: 0 !important; + -moz-margin-start: 12px !important; } .find-status-icon[status="pending"] { diff --git a/EarlyBlue/global/icons/close.png b/EarlyBlue/global/icons/close.png new file mode 100644 index 0000000000000000000000000000000000000000..07769cb3c423053de3e43684d5c3dd96007d5bb8 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9E06|)rRh7*11ZLmAirP+ zhi5m^K%69RcNc~ZR#^`qhqJ&VvY3H^TNs2H8D`Cq01C2~c>21s-{lk&;*u{4j%5N0 z$$GjthHzX@PH4nJa0`PlBg3pYAm!{Op1!W^cR9s`6;7{YNqIiZ0`kWGw@k*zI&EwD|1?N|VN*l`9n1-4BGlos+NR0^`mI5aml zJ2o~ZiZ+WK=3-kG${XX$Ezuxxf~k8=62s~21uvNxHrw&!dfIz;01amFboFyt=akR{ E0O3YCyZ`_I literal 0 HcmV?d00001 diff --git a/EarlyBlue/global/icons/webapps-16.png b/EarlyBlue/global/icons/webapps-16.png new file mode 100644 index 0000000000000000000000000000000000000000..9fd2bef9aafeb3d97043939caa52270379944d43 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|t_%$6GiRRpKa+v8_pBpO zkg+7lFPOpM*^M+1C&}C0g`tC0)&r!xz$3Dlfq`2Xgc%uT&5-~KvX^-Jy0YKp6caMF z7VDe*9w?;m>Eal|aXmSKf!U2+;-D0Rii=A^O9saT4qjHTwl*sT;l_0ihZvW%u54uV bVqj$WX3HMQB)?@fP%DF{tDnm{r-UW|f0He9 literal 0 HcmV?d00001 diff --git a/EarlyBlue/global/icons/webapps-64.png b/EarlyBlue/global/icons/webapps-64.png new file mode 100644 index 0000000000000000000000000000000000000000..beef31ccd19b8050c3faea8fcaa5efa16a26c27d GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSJOMr-uBp1||7S8ZG&H28%{1#0 zcmfn>ED7=pW^j0RBMrn!@^*J&=wOxg0CG4BJR*x37`TN&n2}-D90{Nxdx@v7EBjqe zF(EUh$P*cFfI@pcT^vI!PT##`$aUC&hc$qG^3C9L$?^xCYdp(e2)_DU@+rpUYDb8R z(2?BhS*H)zuzs9tJ@W#ui$TMR{kBP$1v_ea1O^|DB5K2UHG&3=b`r(>KZmUPyfD%ar2Xi$C9)9ES!{>XK?U+WZ$x%MQbk0f+#n} zzqLD-WxZwn@KmB9|MUjeC7n(##+*-lD*d>g*`)KnUX-Y%+Iw*7BfA5eqzt0BUwN`` auK3HYsOyd|W_$vAgu&C*&t;ucLK6V_EPI>) literal 0 HcmV?d00001 diff --git a/EarlyBlue/global/scrollbars.css b/EarlyBlue/global/scrollbars.css index 0abbcb35..c645af5e 100644 --- a/EarlyBlue/global/scrollbars.css +++ b/EarlyBlue/global/scrollbars.css @@ -15,6 +15,19 @@ scrollbar { -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar"); cursor: default; background-color: #999999; + pointer-events: auto; +} + +scrollbar[root="true"] { + position: relative; + z-index: 2147483647; /* largest positive value of a signed 32-bit integer */ +} + +@media all and (-moz-overlay-scrollbars) { + scrollbar:not([active="true"]), + scrollbar[disabled="true"] { + visibility: hidden; + } } /* ::::: slider ::::: */ diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index a36ffb4e..0c0b9fcc 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -2272,7 +2272,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="webapps-install"] { - list-style-image: url("chrome://browser/skin/webapps-64.png"); + list-style-image: url("chrome://global/skin/icons/webapps-64.png"); } .popup-notification-icon[popupid="mixed-content-blocked"] { @@ -2352,7 +2352,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon } #webapps-notification-icon { - list-style-image: url("chrome://browser/skin/webapps-16.png"); + list-style-image: url("chrome://gobal/skin/icons/webapps-16.png"); } #plugins-notification-icon { diff --git a/LCARStrek/browser/notifyPluginBlocked.png b/LCARStrek/browser/notifyPluginBlocked.png deleted file mode 100644 index 15e06cbb7a766efc89693ea28f5f5bb45e70d8cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF%E`p= zpMhb{od3_)KL7v!|ASxypbP_JNswPKgTu2MX&_FLx4R2N2dk_Hki%Kv5n0T@z%2~I zj105pNB{-dOFVsD*>5q62=NJ2+oZArh3q|D978y+Cnq>CsIjWC8aUtdxXGczuw<&E zlaGQR>k6I-KTaM8rDIJ^#}oupogEz$ISwCXoy$16NwY26ot@!l9M^=7*2(5TqZmA0 L{an^LB{Ts5446CM diff --git a/LCARStrek/browser/notifyPluginOutdated.png b/LCARStrek/browser/notifyPluginOutdated.png deleted file mode 100644 index 96e7b3e5a120e7ee46c3c32eca5852538c2e3437..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF$|=C` zpMhb{od5slGyMPmU&8rT07zX)kY6x^!?PP{AWo9Ey9+}HtE>l*!&%@FS^)r^LpZJ{Cpa*uv8u5eIN$WR$)UrrWU8Z+kAfiU3Z4i*P96uPV@*xR u6a-V99UT)n4j*Nm%Q(47vn|`5o#AI3*MyGN$>u<#7(8A5T-G@yGywp!kwwP< diff --git a/LCARStrek/global/findBar.css b/LCARStrek/global/findBar.css index 63e13a9b..6e87692a 100644 --- a/LCARStrek/global/findBar.css +++ b/LCARStrek/global/findBar.css @@ -1,20 +1,15 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -.findbar-closebutton { - list-style-image: url("chrome://global/skin/icons/close-button.gif"); -} - -.findbar-closebutton:hover { - list-style-image: url("chrome://global/skin/icons/close-button-hover.gif"); -} - findbar { border-top: 3px solid #000000; border-bottom: none; min-width: 1px; - transition-property: margin-bottom, opacity, visibility; - transition-duration: 150ms, 150ms, 0s; - transition-timing-function: ease-in-out, ease-in-out, linear; +} + +findbar[position="top"] { + border-top: none; + border-bottom: 3px solid #000000; + transition-property: margin-top, opacity, visibility; } findbar[hidden] { @@ -26,71 +21,106 @@ findbar[hidden] { transition-delay: 0s, 0s, 150ms; } -/* find-next button */ +findbar[position="top"][hidden] { + margin-bottom: auto; + margin-top: -1em; +} -.findbar-find-next { - list-style-image: url("chrome://global/skin/icons/find.png"); - -moz-image-region: rect(0px 16px 16px 0px); +.findbar-closebutton { + list-style-image: url("chrome://global/skin/icons/close.png"); + -moz-image-region: rect(0, 16px, 16px, 0); } -.findbar-find-next[disabled="true"] { - -moz-image-region: rect(16px 16px 32px 0px); +.findbar-closebutton:hover { + -moz-image-region: rect(0, 32px, 16px, 16px); +} + +/* Search field */ + +.findbar-textbox { + width: 14em; +} + +.findbar-textbox[status="notfound"] { + background-color: #FF0000; + color: #000000; +} + +.findbar-textbox[flash="true"] { + background-color: #FFCF00; + color: #000000; +} + +.findbar-textbox.minimal { +} + +/* Buttons */ + +.findbar-find-previous, +.findbar-find-next { + list-style-image: url("chrome://global/skin/icons/find-arrows.png"); } -/* find-previous button */ +.findbar-find-previous:not([disabled]):active, +.findbar-find-next:not([disabled]):active { +} .findbar-find-previous { - list-style-image: url("chrome://global/skin/icons/find.png"); - -moz-image-region: rect(0px 32px 16px 16px); + -moz-image-region: rect(0, 12px, 9px, 0); +} + +.findbar-find-next { + -moz-image-region: rect(0, 24px, 9px, 12px); +} + +.findbar-find-previous, +.findbar-find-previous:not([disabled]):active { } .findbar-find-previous[disabled="true"] { - -moz-image-region: rect(16px 32px 32px 16px); + -moz-image-region: rect(9px, 12px, 18px, 0); } -/* highlight button */ +.findbar-find-next[disabled="true"] { + -moz-image-region: rect(9px, 24px, 18px, 12px); +} -.findbar-highlight { - list-style-image: url("chrome://global/skin/icons/find.png"); - -moz-image-region: rect(0px 48px 16px 32px); +.findbar-find-previous:not([disabled]):hover, +.findbar-find-previous:not([disabled]):active { + -moz-image-region: rect(18px, 12px, 27px, 0); } -.findbar-higlight[disabled="true"] { - -moz-image-region: rect(16px 48px 32px 32px); +.findbar-find-next:not([disabled]):hover, +.findbar-find-next:not([disabled]):active { + -moz-image-region: rect(18px, 24px, 27px, 12px); } -.find-status-icon { - list-style-image: none; - margin-top: 0px; - margin-bottom: 0px; - -moz-margin-start: 12px; - -moz-margin-end: 0px; - width: 16px; - height: 16px; +.findbar-find-previous > .toolbarbutton-icon, +.findbar-find-next > .toolbarbutton-icon { } -.findbar-find-status { - margin: 0 !important; - -moz-margin-start: 3px !important; - padding: 2px !important; +.findbar-find-previous > .toolbarbutton-text, +.findbar-find-next > .toolbarbutton-text { } -.find-status-icon[status="notfound"] { - list-style-image: url("chrome://global/skin/icons/information-16.png"); +.findbar-find-previous[disabled="true"] > .toolbarbutton-icon, +.findbar-find-next[disabled="true"] > .toolbarbutton-icon { } -.findbar-textbox[status="notfound"] { - box-shadow: 0 0 0 1em #FF0000 inset; - color: #000000; +.findbar-highlight, +.findbar-case-sensitive { + -moz-margin-start: 5px; } -.findbar-textbox[flash="true"] { - box-shadow: 0 0 0 1em #FFCF00 inset; - color: #000000; +.findbar-highlight > .toolbarbutton-icon, +.findbar-case-sensitive > .toolbarbutton-icon { + display: none; } -.find-status-icon[status="wrapped"] { - list-style-image: url("chrome://global/skin/icons/wrap.png"); +.findbar-find-status { + color: #A09090; + margin: 0 !important; + -moz-margin-start: 12px !important; } .find-status-icon[status="pending"] { diff --git a/LCARStrek/global/icons/find-arrows.png b/LCARStrek/global/icons/find-arrows.png new file mode 100644 index 0000000000000000000000000000000000000000..f5b46cc08bbcc3b815c0efe52fbbf10ce856321d GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^5&kwYQ%p!+ zNw)7hJ5VUw)5S4_<9cbgFPB4rglqr)Ng~Y8+Ke_aw8~0U{GK>f;?-KGn-f@9Jb!)K zV`u5>5`Xb~SB``vWZwArcG4Q@AjMdnSJ`!!CSGb<{9LWTy)4e7wWM&x`+x6P6)h#a o(rk=f9=C*eh&TUw^tp