From 676f00918ee7482a23e0237d4ad6847be134b979 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <robert@widebook.box.kairo.at>
Date: Sun, 8 Jul 2012 23:17:41 +0200
Subject: [PATCH] sync LCARStrek with parts of browser winstripe changes in
 Firefox 14

---
 LCARStrek/browser/browser.css    |  74 ++++++++++++++++---------------
 LCARStrek/browser/webapps-16.png | Bin 193 -> 204 bytes
 LCARStrek/browser/webapps-64.png | Bin 381 -> 349 bytes
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index da4eff2f..c905ee5f 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -117,9 +117,9 @@ menubar {
   visibility: visible;
 }
 
-#navigator-toolbox[tabsontop="true"] > #nav-bar,
-#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar,
-#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar {
+#nav-bar[tabsontop="true"],
+#nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + toolbar,
+#nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + #customToolbars + #PersonalToolbar {
   /* background-image: -moz-linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); */
 }
 
@@ -709,7 +709,9 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   border-bottom-left-radius: 0;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button {
   border-radius: 10000px;
   width: 30px;
   height: 30px;
@@ -721,20 +723,32 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   -moz-image-region: rect(54px, 20px, 74px, 0);
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):hover,
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[open="true"] {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button:not([disabled="true"]):hover,
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button[open="true"] {
   -moz-image-region: rect(54px, 40px, 74px, 20px);
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[disabled="true"] {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button[disabled="true"] {
   -moz-image-region: rect(54px, 60px, 74px, 40px);
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover {
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button:not([disabled="true"]):hover:active,
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #back-button[open="true"] {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button:not([disabled="true"]):hover:active,
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #back-button[open="true"] {
 }
 
 #navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar[currentset*="unified-back-forward-button"],
@@ -748,7 +762,9 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 /*  padding-top: 5px; */
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button {
   /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
   mask: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-mask");
   -moz-margin-start: -6px !important;
@@ -758,17 +774,23 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   margin-bottom: 2px;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(ltr) {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button:-moz-locale-dir(ltr) {
   border-top-right-radius: 11px;
   border-bottom-right-radius: 11px;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:-moz-locale-dir(rtl) {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl) {
   border-top-left-radius: 11px;
   border-bottom-left-radius: 11px;
 }
 
-#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar #forward-button:not([disabled="true"]):not(:active):hover {
+window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] >
+    :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) >
+    #unified-back-forward-button > #forward-button:not([disabled="true"]):not(:active):hover {
   /*mask: url(keyhole-forward-mask.svg#mask-hover);*/
   mask: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-mask-hover");
 }
@@ -1075,27 +1097,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon
   -moz-image-region: rect(0, 306px, 18px, 288px);
 }
 
-#nav-bar #zoom-out-button {
-  -moz-margin-end: 0;
-}
-
-#nav-bar #zoom-in-button {
-  -moz-border-start: none;
-  -moz-margin-start: 0;
-}
-
-#nav-bar #zoom-out-button:-moz-locale-dir(ltr),
-#nav-bar #zoom-in-button:-moz-locale-dir(rtl) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-#nav-bar #zoom-out-button:-moz-locale-dir(rtl),
-#nav-bar #zoom-in-button:-moz-locale-dir(ltr) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
 #zoom-out-button:not([disabled="true"]):hover {
   -moz-image-region: rect(18px, 288px, 36px, 270px);
 }
@@ -2110,7 +2111,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
 .popup-notification-icon[popupid="addon-install-cancelled"],
 .popup-notification-icon[popupid="addon-install-blocked"],
 .popup-notification-icon[popupid="addon-install-failed"],
-.popup-notification-icon[popupid="addon-install-complete"] {
+.popup-notification-icon[popupid="addon-install-complete"],
+.popup-notification-icon[popupid="click-to-play-plugins"] {
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
   width: 32px;
   height: 32px;
diff --git a/LCARStrek/browser/webapps-16.png b/LCARStrek/browser/webapps-16.png
index 8c55742a5f9dcacfdbcdedbbc27fe5765ccaadfc..8e5ec015cecde2ec7b34b0d6b45e591357a5a8f6 100644
GIT binary patch
delta 134
zcmX@ec!qI;gf<g10|P_ST=7ppim^Dz-HBn{IhmJ04rhQ*h${m_`kXoc|IcSoO;Prq
z=wKPZ&LJwGv0E+D8mL0w)5S4_<9c!e1G5{u#6c+r6&II;mJE&w9K5VvZEaQx!j0=3
j4lyoiUD?R!#lXn$&6YiqNq);}pjHM?S3j3^P6<r_tT-iA

delta 123
zcmX@Zc#v^|ga#us0|SGqZLSiKVk{1FcVbv~PUa<$!xrEZ;tHhypJxc4>$Z5Jv!w^C
zj3B$*<+a5QKw))H7sn8e>&XcW%wnu;JGt1nB?Y3LnhvgOb3E46c#=`&L^wmz0S1QH
X7UrjpW>=>GwJ><P`njxgN@xNA!zd!&

diff --git a/LCARStrek/browser/webapps-64.png b/LCARStrek/browser/webapps-64.png
index 5322c6b20c0b97686c011da5fee531c6037ba6d0..9664881795fddd1204cc8cdda2f29cc4ff1a1a1c 100644
GIT binary patch
delta 280
zcmV+z0q6ex0^I_T7%l<>0002j2boO(0004VQb$4nuFf3k0000CP)t-sWi4m_005kv
z|NqYb;K>-Mkw7_r2M84o6W(l(zyJUMy-7qtR5;7s(lH9dFboAy2b0-T&SM|JLwreh
z=n?Akbn;w8)reF?62xuSYRkiX1@WCbna~YHFo3APJz~=lh<ywZ5lp5@wcrWb2m(P@
z@VFYdUlc?FP*AG^B)}m&YrUcQbNRyW(0+ihLznlW0kh;^SmPO*jyOUh1DFU7@dvcO
z1S*{bpjt)&{e8HmYV8H^<rsi(%dkbHi9$p(3FJ(9P73BcXASG3VJan!!Ik1Zz_J=J
eTesBYzMU88idxq}=$P^V0000<MNUMnLSTXuFLr(a

delta 313
zcmV-90mlB_0{sGz7$^Y)0001xr{kRf0004VQb$4nuFf3k00006P)t-s00030&j44Q
zMx&8NIe!Hl5eXclAV1;&0084jL_t(2&$W<2YQsPbMKy7$y$DPW5J(^wXm?(i=qfo#
zu-$zR<wBv?2=oH8%tH7_UrwRBY}&z|d1L;Uz9sVas}b1*sE7ri)Zm$L-C=U5aq-8&
zul~_tZ~<mY+@csAib!^l!5!61v0oC!&n$NO-G6iS12s2R&U6*JScfk4ZO1^vyu1R8
z31CxPDnwJ1jA%-rMj4f^jL!ozNrm^<2%oTRsTJwFuIKsGosZp~F&fhiHT8$-Tfn#J
zR{%`$01_c86P96`F2l^GC7?2$0+Q*t{QdcOAH%l2!}>-3bKL-kK6ql#`%l^c0000<
LMFvhpu0mjfnOcl?

-- 
2.43.0