Merge branch 'release-2.2.10' into stable

Conflicts:
	install.rdf

chrome.manifest

@@ -9,3 +9,6 @@ skin osbrowser simplewhite whitefox/ostarget/general/
 skin osbrowser simplewhite whitefox/ostarget/darwin/ os=Darwin
 skin osbrowser simplewhite whitefox/ostarget/win/ os=WINNT
 skin osbrowser simplewhite whitefox/ostarget/sunos/ os=SunOS
+
+skin apptarget simplewhite whitefox/apptarget/33/ appversion>=33.0a1
+skin apptarget simplewhite whitefox/apptarget/38/ appversion>=38.0a1

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.9</em:version>
+    <em:version>2.2.10</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>37.0</em:minVersion>
-        <em:maxVersion>40.0</em:maxVersion>
+        <em:maxVersion>42.0</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>

whitefox/apptarget/33/aboutReader.css

@@ -0,0 +1,3 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */

whitefox/apptarget/33/aboutSessionRestore.css

@@ -0,0 +1,63 @@
+
+html {
+  height: 100%;
+}
+
+body {
+  height: 100%;
+  text-align: center;
+}
+
+#errorPageContainer {
+  background-image: url("chrome://global/skin/icons/warning-large.png");
+  display: -moz-box;
+  width: -moz-available;
+  height: 70%;
+  -moz-box-orient: vertical;
+  text-align: start;
+}
+
+#errorShortDesc > p {
+  margin-top: 0.4em;
+  margin-bottom: 0;
+}
+
+#errorLongContent, #errorTrailerDesc {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  -moz-box-orient: vertical;
+}
+
+#tabList {
+  margin-top: 2.5em;
+  width: 100%;
+  min-height: 12em;
+}
+
+treechildren::-moz-tree-image(icon),
+treechildren::-moz-tree-image(noicon) {
+  padding-right: 2px;
+  margin: 0px 2px;
+  width: 16px;
+  height: 16px;
+}
+
+treechildren::-moz-tree-image(noicon) {
+  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
+}
+treechildren::-moz-tree-image(container, noicon) {
+  list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png");
+}
+treechildren::-moz-tree-image(checked) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
+}
+treechildren::-moz-tree-image(partial) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
+}
+
+#buttons {
+  width: 100%;
+}
+#buttons > button {
+  margin-top: 2em;
+}

whitefox/apptarget/33/aboutSupport.css

@@ -0,0 +1,113 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+html {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
+  font: message-box;
+}
+
+body {
+  width: 90%;
+  margin-left: 5%;
+  margin-right: 5%;
+}
+
+.page-subtitle {
+  margin-bottom: 3em;
+}
+
+.major-section {
+  margin-top: 2em;
+  margin-bottom: 1em;
+  font-size: large;
+  text-align: start;
+  font-weight: bold;
+}
+
+table {
+  background-color: -moz-Dialog;
+  color: -moz-DialogText;
+  font: message-box;
+  text-align: start;
+  width: 100%;
+  border: 1px solid ThreeDShadow;
+  border-spacing: 0px;
+}
+
+th, td {
+  border: 1px dotted ThreeDShadow;
+  padding: 3px;
+}
+
+thead th {
+  text-align: center;
+}
+
+th {
+  text-align: start;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+th.column {
+  white-space: nowrap;
+  width: 0px;
+}
+
+td {
+  text-align: start;
+  border-top: 1px dotted ThreeDShadow;
+}
+
+.prefs-table {
+  width: 100%;
+  table-layout: fixed;
+}
+
+.pref-name {
+  width: 70%;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.pref-value {
+  width: 30%;
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+#reset-box {
+  background-color: -moz-Dialog;
+  border: 1px solid ThreeDShadow;
+  color: -moz-DialogText;
+  float: right;
+  margin-top: 2em;
+  margin-bottom: 20px;
+  -moz-margin-start: 20px;
+  -moz-margin-end: 0;
+  padding: 16px;
+  width: 30%;
+  visibility: hidden;
+}
+
+#reset-box:-moz-dir(rtl) {
+  float: left;
+}
+
+#reset-box > h3 {
+  margin-top: 0;
+}
+
+#reset-box > button {
+  display: block;
+}
+
+.block {
+  display: block;
+}
+
+.hidden {
+  display: none;
+}

whitefox/apptarget/33/aboutTabCrashed.css

@@ -0,0 +1,108 @@
+body {
+  background-color: rgb(241, 244, 248);
+  margin-top: 2em;
+  font: message-box;
+  font-size: 100%;
+}
+
+p {
+  font-size: .8em;
+}
+
+#error-box {
+  background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px;
+  -moz-padding-start: 30px;
+}
+
+#error-box:-moz-locale-dir(rtl) {
+  background-position: right 4px;
+}
+
+#main-error-msg {
+  color: #4b4b4b;
+  font-weight: bold;
+}
+
+#report-box {
+  text-align: center;
+  width: 75%;
+  margin: 0 auto;
+  display: none;
+}
+
+.crashDumpAvailable #report-box {
+  display: block
+}
+
+#button-box {
+  text-align: center;
+  width: 75%;
+  margin: 0 auto;
+}
+
+@media all and (min-width: 300px) {
+  #error-box {
+    max-width: 50%;
+    margin: 0 auto;
+    background-image: url('chrome://global/skin/icons/information-32.png');
+    min-height: 36px;
+    -moz-padding-start: 38px;
+  }
+
+  button {
+    width: auto !important;
+    min-width: 150px;
+  }
+}
+
+@media all and (min-width: 780px) {
+  #error-box {
+    max-width: 30%;
+  }
+}
+
+button {
+  font: message-box;
+  font-size: 0.6875em;
+  -moz-appearance: none;
+  -moz-user-select: none;
+  width: 100%;
+  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-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-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;
+  transition-timing-function: ease;
+
+}
+
+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);
+  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;
+  transition-property: background-color, border-color, box-shadow;
+  transition-duration: 10ms;
+  transition-timing-function: linear;
+}

whitefox/apptarget/33/aboutWelcomeBack.css

@@ -0,0 +1,42 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#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;
+}