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

updates from upstream

chrome.manifest

@@ -36,6 +36,8 @@ override  chrome://devtools/skin/images/tool-webaudio.svg         chrome://devto
 
 override  chrome://devtools/skin/images/tool-scratchpad.svg       chrome://devtools/skin/tool-scratchpad.svg
 
+override  chrome://devtools/skin/images/tool-dom.svg              chrome://devtools/skin/tool-dom.svg
+
 override  chrome://devtools/skin/images/tool-options.svg          chrome://devtools/skin/tool-options.svg
 
 ##  For Firefox 44.0a2 and similar only:

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.16</em:version>
+    <em:version>2.2b18.C1.18</em:version>
     <em:creator>Louis Chan (updated by Graciliano, 3marcusw)</em:creator>
     <em:contributor>3marcusw</em:contributor>
     <em:contributor>Graciliano</em:contributor>
@@ -17,7 +17,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
         <em:minVersion>37.0</em:minVersion>
-        <em:maxVersion>48.0</em:maxVersion>
+        <em:maxVersion>49.0</em:maxVersion>
       </Description>
     </em:targetApplication>
   </Description>

whitefox/browser/aboutNetError48.css

@@ -33,41 +33,42 @@ ul {
   max-width: 512px;
 }
 
+.title,
 #errorTitle {
   background: url("aboutNetError_info.svg") left 2px no-repeat;
   background-size: 45px; /* it was 3em */
   -moz-margin-start: -5em;
   -moz-padding-start: 5em;
 }
 
+body.certerror .title,
 body.certerror #errorTitle {
   background-image: url("chrome://browser/skin/cert-error.svg");
 }
 
+.title-text,
 #errorTitleText {
   border-bottom: 1px solid #C1C1C1;
   padding-bottom: 0.4em;
 }
+.title-text:empty::before{ /* If the title is missing, as in 49.0a1, insert 'ellipsis' */
+  display: inline;
+  content: "..."
+}
 
+.title:-moz-dir(rtl),
 #errorTitle:-moz-dir(rtl) { /* It was #errorTitleText... (wrong!) --johnGraciliano */
   background-position: right 2px;
 }
 
+body.certerror .title,
 #errorTitle[sslv3=true],
 #errorTitle[weakCrypto=true] {
   background-image: url("cert-error.svg");
 }
 
-#errorTryAgain {
-  margin-top: 1.2em;
-  min-width: 150px
-}
-
-#errorContainer {
-  display: none;
-}
-
 @media (max-width: 675px) {
+  .title,
   #errorTitle,
   #errorTitle[sslv3=true],
   #errorTitle[weakCrypto=true] {
@@ -78,6 +79,10 @@ body.certerror #errorTitle {
   }
 }
 
+#errorContainer {
+  display: none;
+}
+
 /* Pressing the retry button will cause the cursor to flicker from a pointer to
  * not-allowed. Override the disabled cursor behaviour since we will never show
  * the button disabled as the initial state. */
@@ -89,40 +94,52 @@ button:disabled {
   display: none;
 }
 
+#certErrorButtonContainer {
+  display: none;
+}
+
 #buttonContainer {
   display: none;
   flex-flow: row wrap;
 }
 
+.button-spacer,
 #buttonSpacer {
   flex: 1;
 }
 
-#returnButton {
-  background-color: var(--in-content-primary-button-background);
-  border: none;
-  color: var(--in-content-selected-text);
-  min-width: 250px;
-  margin-inline-start: 0;
+body.certerror #certErrorButtonContainer {
+  display: flex;
+}
+
+body.certerror #netErrorButtonContainer {
+  display: none;
 }
 
-#returnButton:hover {
-  background-color: var(--in-content-primary-button-background-hover) !important;
+#errorTryAgain {
+  margin-top: 1.2em;
 }
 
-#returnButton:hover:active {
-  background-color: var(--in-content-primary-button-background-active) !important;
+#errorTryAgain,
+#returnButton {
+  min-width: 250px;
+  margin-inline-start: 0;
 }
 
 #advancedButton {
   display: none;
   min-width: 150px;
 }
 
+body.certerror #advancedButton {
+  display: block;
+}
+
 #certificateErrorReporting {
   display: none;
 }
 
+.advanced-panel,
 #weakCryptoAdvancedPanel,
 #badCertAdvancedPanel {
   /* Hidden until the link is clicked */
@@ -131,16 +148,16 @@ button:disabled {
   border: 1px lightgray solid;
   /* Don't use top padding because the default p style has top padding, and it
    * makes the overall div look uneven */
-  padding: 0 12px 12px 12px;
+  padding: 0 12px 10px;
   box-shadow: 0 0 4px #ddd;
   font-size: 0.9em;
   margin-top: 24px;
 }
 
-#badCertAdvancedPanel {
+body.certerror > div > #badCertAdvancedPanel {
   margin-top: 10px;
 }
-#badCertAdvancedPanel:not([style="display: block;"]){
+body.certerror > div > #badCertAdvancedPanel:not([style="display: block;"]){
   display: block !important; /* Reserve the space for it. */
   visibility: hidden; /* Just leave the space */
   pointer-events: none; /* Make sure it behaves as if it is not there at all */
@@ -165,12 +182,14 @@ span.hostname {
   cursor: pointer;
 }
 
+#errorCode:not([href]),
 body:not(.certerror) #errorCode {
   color: var(--in-content-page-color);
   cursor: text;
   text-decoration: none;
 }
 
+#errorCode[href],
 body.certerror #errorCode {
   white-space: nowrap;
 }
@@ -200,22 +219,3 @@ body.certerror #errorCode {
   white-space: pre-wrap;
   padding: 1em 0;
 }
-
-
-
-button#errorTryAgain {
-  background-color: var(--in-content-primary-button-background);
-  border: none;
-  color: var(--in-content-selected-text);
-  min-width: 250px;
-  margin-inline-start: 0;
-}
-
-button#errorTryAgain:hover {
-  background-color: var(--in-content-primary-button-background-hover) !important;
-}
-
-button#errorTryAgain:hover:active {
-  background-color: var(--in-content-primary-button-background-active) !important;
-}
-