Merge branch 'release-2.2.8' into stable

Conflicts:
	install.rdf

install.rdf

@@ -5,7 +5,7 @@
     <em:type>4</em:type>
     <em:name>Simple White</em:name>
     <em:description>Paint your firefox white. Make it look simpler, nicer.</em:description>
-    <em:version>2.2.7</em:version>
+    <em:version>2.2.8</em:version>
     <em:creator>Louis Chan</em:creator>
     <em:contributor></em:contributor>
     <em:homepageURL>http://www.louis.hk/whitefox/</em:homepageURL>
@@ -14,7 +14,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
         <em:minVersion>33.0</em:minVersion>
-        <em:maxVersion>38.0</em:maxVersion>
+        <em:maxVersion>39.0</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>

whitefox/apptarget/33/general_menu.css

@@ -299,3 +299,33 @@ menulist > menupopup > menuseparator,
     text-shadow: inherit;
   }
 }
+
+@media not all and (-moz-windows-theme) { /* for Linux */
+  menulist > menupopup > menuitem,
+  menulist > menupopup > menu {
+    -moz-appearance: menuitem !important;
+  }
+
+  menu[_moz-menuactive="true"],
+  menuitem[_moz-menuactive="true"],
+  .splitmenu-menuitem[_moz-menuactive="true"] {
+    color: -moz-menuhovertext;
+    background-color: -moz-menuhover;
+  }
+
+  menu[disabled="true"],
+  menuitem[disabled="true"],
+  .splitmenu-menuitem[disabled="true"] {
+    color: GrayText;
+  }
+
+  menubar > menu,
+  menubar > menu[_moz-menuactive="true"]:not([open]):not([disabled="true"]):not(:-moz-lwtheme) {
+    color: -moz-menubartext;
+  }
+
+  menubar > menu[open] {
+    color: -moz-menubarhovertext;
+    background-color: -moz-menuhover;
+  }
+}

whitefox/apptarget/33/general_menulist.css

@@ -181,3 +181,9 @@ menulist:-moz-focusring:not([open="true"]):not(.menulist-compact) > .menulist-la
     margin-bottom: -1px;
   }
 }
+
+@media not all and (-moz-windows-theme) { /* for Linux */
+  .menulist-dropmarker {
+    display: none;
+  }
+}

whitefox/apptarget/35/general_menu.css

@@ -132,7 +132,7 @@ menubar > menu[_moz-menuactive="true"][open="true"] {
 
 menubar > menu:-moz-lwtheme {
   -moz-appearance: none;
-  border-style: none;
+  border-color: transparent;
 }
 
 menubar > menu:-moz-lwtheme:not([disabled="true"]) {
@@ -290,3 +290,33 @@ menulist > menupopup > menuseparator {
     text-shadow: inherit;
   }
 }
+
+@media not all and (-moz-windows-theme) { /* for Linux */
+  menulist > menupopup > menuitem,
+  menulist > menupopup > menu {
+    -moz-appearance: menuitem !important;
+  }
+
+  menu[_moz-menuactive="true"],
+  menuitem[_moz-menuactive="true"],
+  .splitmenu-menuitem[_moz-menuactive="true"] {
+    color: -moz-menuhovertext;
+    background-color: -moz-menuhover;
+  }
+
+  menu[disabled="true"],
+  menuitem[disabled="true"],
+  .splitmenu-menuitem[disabled="true"] {
+    color: GrayText;
+  }
+
+  menubar > menu,
+  menubar > menu[_moz-menuactive="true"]:not([open]):not([disabled="true"]):not(:-moz-lwtheme) {
+    color: -moz-menubartext;
+  }
+
+  menubar > menu[open] {
+    color: -moz-menubarhovertext;
+    background-color: -moz-menuhover;
+  }
+}

whitefox/apptarget/35/general_menulist.css

@@ -141,3 +141,9 @@ menulist:-moz-focusring:not([open="true"]) > .menulist-label-box {
     margin-bottom: -1px;
   }
 }
+
+@media not all and (-moz-windows-theme) { /* for Linux */
+  .menulist-dropmarker {
+    display: none;
+  }
+}

whitefox/browser/aboutNetError.css

@@ -45,7 +45,7 @@ ul {
   }
 }
 
-#errorTitleText[sslv3] {
+#errorTitleText[sslv3=true] {
   background-image: url("aboutNetError_alert.svg");
 }
 

whitefox/browser/aboutProviderDirectory.css

@@ -1,5 +1,5 @@
 body {
-  background-color: rgb(241, 244, 248);
+  background-color: rgb(255, 255, 255);
   margin-top: 2em;
   font: message-box;
   font-size: 100%;
@@ -61,15 +61,10 @@ button {
   margin: 2px 0;
   padding: 2px 6px;
   line-height: 1.2;
-  background-color: hsla(210,30%,95%,.1);
-  background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
+  background-image: linear-gradient(rgba(255,255,255,.8), rgba(240,240,240,.8));
   background-clip: padding-box;
-  border: 1px solid hsla(210,15%,25%,.4);
-  border-color: hsla(210,15%,25%,.3) hsla(210,15%,25%,.35) hsla(210,15%,25%,.4);
+  border: 1px solid rgba(0,0,0,.2);
   border-radius: 3px;
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
-              0 0 0 1px hsla(0,0%,100%,.3) inset,
-              0 1px 0 hsla(0,0%,100%,.1);
 
   transition-property: background-color, border-color, box-shadow;
   transition-duration: 150ms;
@@ -78,21 +73,14 @@ button {
 }
 
 button:hover {
-  background-color: hsla(210,30%,95%,.8);
-  border-color: hsla(210,15%,25%,.45) hsla(210,15%,25%,.5) hsla(210,15%,25%,.55);
-  box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
-              0 0 0 1px hsla(0,0%,100%,.3) inset,
-              0 1px 0 hsla(0,0%,100%,.1),
-              0 0 3px hsla(210,15%,25%,.1);
+  background-image: linear-gradient(rgba(246,246,246,.8), rgba(231,231,231,.8));
   transition-property: background-color, border-color, box-shadow;
   transition-duration: 150ms;
   transition-timing-function: ease;
 }
 
 button:hover:active {
-  background-color: hsla(210,15%,25%,.2);
-  box-shadow: 0 1px 1px hsla(210,15%,25%,.2) inset,
-              0 0 2px hsla(210,15%,25%,.4) inset;
+  background-image: linear-gradient(rgba(218,218,218,.8), rgba(225,225,225,.8));
   transition-property: background-color, border-color, box-shadow;
   transition-duration: 10ms;
   transition-timing-function: linear;

whitefox/browser/aboutWelcomeBack.css

@@ -4,4 +4,39 @@
 
 #errorPageContainer {
   background-image: url("chrome://global/skin/icons/information-64.png");
+  height: auto;
+}
+
+/* tablist starts out hidden, but JS may make it visible in response to
+   clicks on the radio buttons by setting an "available" attribute.
+*/
+#tabList {
+  display: none;
+}
+
+#tabList[available] {
+  display: -moz-box;
+}
+
+.radioRestoreContainer {
+  display: flex;
+}
+
+.radioRestoreButton {
+  flex: 0 0 auto;
+}
+
+.radioRestoreButton:-moz-focusring {
+  outline: 1px dotted black;
+}
+
+.radioChooseLabel {
+  flex: 1 1 auto;
+}
+
+/* We want errorTrailerDesc to have the same padding-top as errorShortDesc
+   has padding-bottom
+*/
+#errorTrailerDesc {
+  padding-top: 1em;
 }

whitefox/browser/browser-common.css

@@ -88,7 +88,7 @@
   background-color: #c7c7c7;
 }
 
-#navigator-toolbox > toolbar:not(:-moz-lwtheme) {
+#navigator-toolbox > toolbar {
   -moz-appearance: none;
   border-style: none;
 }
@@ -1090,7 +1090,7 @@ toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   -moz-padding-end: 5px;
 }*/
 
-#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button)/*:not(#PanelUI-menu-button)*/ {
+#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button)/*:not(#PanelUI-menu-button)*/ {
   padding-left: 5px;
   padding-right: 5px;
 }
@@ -1142,7 +1142,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   width: 32px;
 }
 
-#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#social-provider-button):not(#PanelUI-menu-button) > .toolbarbutton-icon,
+#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) > .toolbarbutton-icon,
 #nav-bar .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ {
   -moz-padding-end: 17px;
 }
@@ -1983,14 +1983,14 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 /* social share panel */
 
 #social-share-panel > iframe {
-  background: linear-gradient(to bottom, #f0f4f7, #fafbfc);
+  background: #fff;
   width: 300px;
   height: 150px;
 }
 
 .social-share-toolbar {
-  border-right: 1px solid #e2e5e8;
-  background: linear-gradient(to bottom, #ffffff, #f5f7fa);
+  border-right: 1px solid #d1d1d1;
+  background: #efefef;
 }
 
 #social-share-provider-buttons {
@@ -2006,16 +2006,16 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   border-radius: 2px;
 }
 
-#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]),
+#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"])/*,
 #social-share-provider-buttons > .share-provider-button:hover,
-#social-share-provider-buttons > .share-provider-button:active {
-  padding: 4px;
-  border: 1px solid #aeb8c1;
-  box-shadow: inset 1px 1px 1px rgba(10, 31, 51, 0.1);
+#social-share-provider-buttons > .share-provider-button:active*/ {
+  /*padding: 4px;
+  border: 1px solid #aeb8c1;*/
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
 }
 
 #social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]) {
-  background: linear-gradient(to bottom, rgba(230,232,234,.65), #d2d5d9);
+  background: #fff;
 }
 
 #social-share-provider-buttons > .share-provider-button > .toolbarbutton-text {
@@ -2225,7 +2225,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon {
 
 .tabbrowser-tab:not([pinned]) {
   max-width: 190px;
-  min-width: 46px;
+  min-width: 88px;
 }
 
 .tabbrowser-tab:not([pinned]):not([fadein]) {
@@ -4204,15 +4204,6 @@ toolbar[brighttext] #downloads-indicator-counter {
 
 /* Social toolbar item */
 
-#social-provider-button {
-  -moz-image-region: rect(0, 16px, 16px, 0);
-  list-style-image: url(chrome://browser/skin/social/services-16.png);
-}
-
-#social-provider-button > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 #switch-to-metro-button[cui-areatype="toolbar"] {
   list-style-image: url(chrome://browser/skin/Metro_Glyph.png);
 }

whitefox/browser/devtools/app-manager/device.css

@@ -303,7 +303,7 @@ button {
 
 header {
   padding-top: 140px;
-  background-image: linear-gradient(to bottom, rgba(0,0,0,0), rgba(0,0,0,0.7));
+  background-image: linear-gradient(to bottom, transparent, rgba(0,0,0,0.7));
   color: #FFF;
   text-shadow: 0 1px 2px rgba(0,0,0,0.8);
   padding: 10px;