Merge branch 'master' of https://github.com/johngraciliano/simplewhite

devtools changes Conflicts:
3marcusw · Jan 2, 2016 · 0a60227 · 0a60227
2 parents 75098a1 + 4f9300c
commit 0a60227
Show file tree

Hide file tree

Showing 18 changed files with 810 additions and 248 deletions.
diff --git a/install.rdf b/install.rdf
@@ -5,7 +5,7 @@
     <em:type>4</em:type>
     <em:name>Simple White Compact</em:name>
     <em:description>Paint your Firefox white. Make it look simpler, nicer, compact.</em:description>
-    <em:version>2.2b18.C1.06</em:version>
+    <em:version>2.2b18.C1.08</em:version>
     <em:creator>Louis Chan (updated by Graciliano, 3marcusw)</em:creator>
     <em:contributor>3marcusw</em:contributor>
     <em:homepageURL>https://github.com/3marcusw/simplewhitecompact</em:homepageURL>
@@ -14,7 +14,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
         <em:minVersion>37.0</em:minVersion>
-        <em:maxVersion>45.0</em:maxVersion>
+        <em:maxVersion>46.0</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>

diff --git a/whitefox/browser/browser-common.css b/whitefox/browser/browser-common.css
@@ -803,45 +803,45 @@ toolbar[brighttext] #sync-button[status="active"] {
   -moz-image-region: rect(0, 720px, 18px, 702px);
 }
 
-#loop-button,
+:root #loop-button,
 #loop-button > .toolbarbutton-badge-container {
   list-style-image: url(chrome://browser/skin/loop/toolbar.png);
   -moz-image-region: rect(0, 18px, 18px, 0);
 }
 
-toolbar[brighttext] #loop-button,
+:root toolbar[brighttext] #loop-button,
 toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
   list-style-image: url(chrome://browser/skin/loop/toolbar-inverted.png);
 }
 
-#loop-button[state="disabled"],
-#loop-button[disabled="true"],
+:root #loop-button[state="disabled"],
+:root #loop-button[disabled="true"],
 #loop-button[state="disabled"] > .toolbarbutton-badge-container,
 #loop-button[disabled="true"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 36px, 18px, 18px);
 }
 
-#loop-button:not([disabled="true"])[state="error"],
+:root #loop-button:not([disabled="true"])[state="error"],
 #loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 54px, 18px, 36px);
 }
 
-#loop-button:not([disabled="true"])[state="action"],
+:root #loop-button:not([disabled="true"])[state="action"],
 #loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 72px, 18px, 54px);
 }
 
-#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]),
+:root #loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]),
 #loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 90px, 18px, 72px);
 }
 
-#loop-button:not([disabled="true"])[state="active"],
+:root #loop-button:not([disabled="true"])[state="active"],
 #loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 108px, 18px, 90px);
 }
 
-#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]),
+:root #loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]),
 #loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
   -moz-image-region: rect(0, 126px, 18px, 108px);
 }
@@ -1271,48 +1271,48 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container {
     -moz-image-region: rect(0, 832px, 32px, 800px);
   }
 
-  #loop-button[cui-areatype="menu-panel"],
-  toolbarpaletteitem[place="palette"] > #loop-button,
+  :root #loop-button[cui-areatype="menu-panel"],
+  :root toolbarpaletteitem[place="palette"] > #loop-button,
   #loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container,
   toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container {
     list-style-image: url(chrome://browser/skin/loop/menuPanel.png);
     -moz-image-region: rect(0, 32px, 32px, 0);
   }
 
   /* Make sure that the state icons are not shown in the customization palette. */
-  toolbarpaletteitem[place="palette"] > #loop-button,
+  :root toolbarpaletteitem[place="palette"] > #loop-button,
   toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container {
     -moz-image-region: rect(0, 32px, 32px, 0) !important;
   }
 
-  #loop-button[cui-areatype="menu-panel"][state="disabled"],
-  #loop-button[cui-areatype="menu-panel"][disabled="true"],
+  :root #loop-button[cui-areatype="menu-panel"][state="disabled"],
+  :root #loop-button[cui-areatype="menu-panel"][disabled="true"],
   #loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container,
   #loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container {
     -moz-image-region: rect(0, 64px, 32px, 32px);
   }
 
-  #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"],
+  :root #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"],
   #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container {
     -moz-image-region: rect(0, 96px, 32px, 64px);
   }
 
-  #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"],
+  :root #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"],
   #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container {
     -moz-image-region: rect(0, 128px, 32px, 96px);
   }
 
-  #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]),
+  :root #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]),
   #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
     -moz-image-region: rect(0, 160px, 32px, 128px);
   }
 
-  #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"],
+  :root #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"],
   #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container {
     -moz-image-region: rect(0, 192px, 32px, 160px);
   }
 
-  #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]),
+  :root #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]),
   #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container {
     -moz-image-region: rect(0, 224px, 32px, 192px);
   }

diff --git a/whitefox/browser/browser-etc.css b/whitefox/browser/browser-etc.css
@@ -0,0 +1,21 @@
+/**  Additional customizations for Firefox Extensions */
+
+/* Tab Groups */
+:root #tabGroups-tabview-button {
+  list-style-image: url("chrome://browser/skin/Toolbar.png");
+  -moz-image-region: rect(0, 648px, 18px, 630px);
+}
+:root toolbar[brighttext] #tabGroups-tabview-button {
+  list-style-image: url("chrome://browser/skin/Toolbar-inverted.png");
+}
+:root #tabGroups-tabview-button[cui-areatype="menu-panel"],
+:root toolbarpaletteitem[place="palette"] > #tabGroups-tabview-button {
+  list-style-image: url(chrome://browser/skin/menuPanel.png);
+  -moz-image-region: rect(0px, 608px, 32px, 576px);
+}
+
+/* Chatzilla */
+#tb-chatzilla-open[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #tb-chatzilla-open {
+  list-style-image: url(chrome://chatzilla/skin/images/logo.png)
+}
diff --git a/whitefox/browser/browser.css b/whitefox/browser/browser.css
@@ -1 +1,2 @@
-@import url("chrome://osbrowser/skin/browser.css");
+@import url("chrome://osbrowser/skin/browser.css");
+@import url("./browser-etc.css");
diff --git a/whitefox/browser/customizableui/panelUIOverlay.css b/whitefox/browser/customizableui/panelUIOverlay.css
@@ -663,6 +663,85 @@ toolbarbutton#PanelUI-fxa-status,
   list-style-image: url(chrome://browser/skin/sync-horizontalbar.png);
 }
 
+.PanelUI-remotetabs-instruction-label,
+#PanelUI-remotetabs-mobile-promo {
+  margin: 15px;
+  text-align: center;
+  text-shadow: none;
+  max-width: 15em;
+  color: GrayText;
+}
+
+/* The boxes with "instructions" get extra padding for space around the
+   illustration and buttons */
+.PanelUI-remotetabs-instruction-box {
+  padding: 30px 15px 15px 15px;
+}
+
+.PanelUI-remotetabs-prefs-button {
+  -moz-appearance: none;
+  background-color: #0096dd;
+  color: white;
+  border-radius: 2px;
+  margin: 10px;
+  padding: 8px;
+  text-shadow: none;
+  min-width: 200px;
+}
+
+.PanelUI-remotetabs-prefs-button:hover,
+.PanelUI-remotetabs-prefs-button:hover:active {
+  background-color: #018acb;
+}
+
+.remotetabs-promo-link {
+  margin: 0;
+}
+
+.PanelUI-remotetabs-notabsforclient-label {
+  color: GrayText;
+  /* This margin is to line this label up with the labels in toolbarbuttons. */
+  margin-left: 28px;
+}
+
+.fxaSyncIllustration {
+  width: 180px;
+  list-style-image: url(chrome://browser/skin/fxa/sync-illustration.svg);
+}
+
+.PanelUI-remotetabs-prefs-button > .toolbarbutton-text {
+  /* !important to override ".cui-widget-panel toolbarbutton > .toolbarbutton-text" above. */
+  text-align: center !important;
+  text-shadow: none;
+}
+
+#PanelUI-remotetabs[mainview] { /* panel anchored to toolbar button might be too skinny */
+  min-width: 19em;
+}
+
+/* Work around bug 1224412 - these boxes will cause scrollbars to appear when
+   the panel is anchored to a toolbar button.
+*/
+#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync,
+#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-reauthsync,
+#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-nodevicespane,
+#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-tabsdisabledpane {
+  min-height: 30em;
+}
+
+#PanelUI-remotetabs-tabslist > label[itemtype="client"] {
+  color: GrayText;
+}
+
+/* Collapse the non-active vboxes in the remotetabs deck to use only the
+   height the active box needs */
+#PanelUI-remotetabs-deck:not([selectedIndex="1"]) > #PanelUI-remotetabs-tabsdisabledpane,
+#PanelUI-remotetabs-deck:not([selectedIndex="2"]) > #PanelUI-remotetabs-fetching,
+#PanelUI-remotetabs-deck:not([selectedIndex="3"]) > #PanelUI-remotetabs-nodevicespane {
+  visibility: collapse;
+}
+
+toolbarbutton#PanelUI-fxa-icon[syncstatus="active"],
 toolbarbutton#PanelUI-fxa-status[syncstatus="active"],
 #PanelUI-footer-fxa[syncstatus="active"] > #PanelUI-fxa-icon {
   list-style-image: url(chrome://browser/skin/syncProgress-horizontalbar.png);
@@ -1065,10 +1144,12 @@ menuitem.panel-subview-footer:not([disabled])[_moz-menuactive]:active,
   color: GrayText;
 }
 
+#PanelUI-remotetabs-tabslist > toolbarbutton,
 #PanelUI-historyItems > toolbarbutton {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
 }
 
+#PanelUI-remotetabs-tabslist > toolbarbutton > .toolbarbutton-icon,
 #PanelUI-recentlyClosedWindows > toolbarbutton > .toolbarbutton-icon,
 #PanelUI-recentlyClosedTabs > toolbarbutton > .toolbarbutton-icon,
 #PanelUI-historyItems > toolbarbutton > .toolbarbutton-icon {
@@ -1533,6 +1614,7 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
     list-style-image: url(chrome://browser/skin/sync-horizontalbar@2x.png);
   }
 
+  toolbarbutton#PanelUI-fxa-icon[syncstatus="active"],
   toolbarbutton#PanelUI-fxa-status[syncstatus="active"],
   #PanelUI-footer-fxa[syncstatus="active"] > #PanelUI-fxa-icon {
     list-style-image: url(chrome://browser/skin/syncProgress-horizontalbar@2x.png);