third and last part of syncing LCARStrek with Firefox 39 windows theme changes

diff --git a/LCARStrek/browser/aboutNetError.css b/LCARStrek/browser/aboutNetError.css
index dc7aedc654fbdb52369bd5454f5714f861592afd..0ccc9c69dd25b6f08ea4557647fc8908e3558fc9 100644 (file)
--- a/LCARStrek/browser/aboutNetError.css
+++ b/LCARStrek/browser/aboutNetError.css
@@ -127,6 +127,15 @@ div#certificateErrorReportingPanel:-moz-dir(rtl) {
   right: 0;
 }
 
+#errorStatePanel {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  align-content: space-between;
+  align-items: flex-start;
+}
+
 span#hostname {
   font-weight: bold;
 }
@@ -135,25 +144,12 @@ span#hostname {
   cursor: pointer;
 }
 
-#reportingState {
-  padding-left: 150px;
-}
-
 #reportSendingMessage {
-  position: relative;
-  display: none;
+  /* adjust the line-height to match the link */
+  line-height: 22px;
 }
 
 #reportSentMessage {
-  position: relative;
-  display: none;
-}
-
-button#reportCertificateError {
-  position: relative;
-}
-
-button#reportCertificateErrorRetry {
-  position: relative;
-  display: none;
+  /* adjust the line-height to match the link */
+  line-height: 22px;
 }

diff --git a/LCARStrek/global/in-content/common.css b/LCARStrek/global/in-content/common.css
index d1bb5265398e6210a9cf7c51472153298ad18941..4643c06626dc907f3a980a4bca8a377fb5785e7e 100644 (file)
--- a/LCARStrek/global/in-content/common.css
+++ b/LCARStrek/global/in-content/common.css
@@ -680,6 +680,7 @@ xul|tree {
   -moz-appearance: none;
   font-size: 1em;
   border: 1px solid #c1c1c1;
+  margin: 0;
 }
 
 xul|tree:-moz-focusring,

diff --git a/LCARStrek/global/in-content/info-pages.css b/LCARStrek/global/in-content/info-pages.css
index b75ddd4aae6d48aa2ac611892dabead8af4437dc..3ad5e539704b68f85acb8b0a4c3b16f1b0c7e137 100644 (file)
--- a/LCARStrek/global/in-content/info-pages.css
+++ b/LCARStrek/global/in-content/info-pages.css
@@ -2,6 +2,7 @@
 /* Body and container */\r
 body {\r
   display: flex;\r
+  flex-direction: column;\r
   box-sizing: padding-box;\r
   min-height: 100vh;\r
   padding-top: 0;\r
@@ -17,6 +18,13 @@ body {
   max-width: 52em;\r
 }\r
 \r
+.container.flex {\r
+  display: flex;\r
+  flex-direction: column;\r
+  flex-grow: 1;\r
+  margin: 10vh 0;\r
+}\r
+\r
 /* Typography */\r
 .title {\r
   background-image: url("chrome://browser/skin/aboutNetError_info.svg");\r
@@ -82,8 +90,16 @@ ul {
 }\r
 \r
 /* Trees */\r
-tree {\r
-  min-height: 12em;\r
+.tree-container {\r
   margin-top: 1.2em;\r
+  flex-grow: 1;\r
+  min-height: 12em;\r
+}\r
+\r
+.tree-container > tree {\r
+  height: 100%;\r
+}\r
+\r
+tree {\r
   width: 100%;\r
-}
\ No newline at end of file
+}\r