second part of syncing LCARStrek with Firefox 36 windows theme changes

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 2c5602a4fc779052159f6c5c8119f42f3af5ed2e..343f0bd626ded4b9407d3fc98873e651b6c889e4 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -3580,136 +3580,6 @@ notification[value="translation"] {
   background-color: transparent !important;
 }
 
   background-color: transparent !important;
 }
 

-/* === BEGIN highlighter.inc.css === */
-
-/* Box model highlighter */
-svg|g.box-model-container {
-  opacity: 0.4;
-}
-
-svg|polygon.box-model-content {
-  fill: #008484;
-}
-
-svg|polygon.box-model-padding {
-  fill: #9C9CFF;
-}
-
-svg|polygon.box-model-border {
-  fill: #FFCF00;
-}
-
-svg|polygon.box-model-margin {
-  fill: #A09090;
-}
-
-svg|polygon.box-model-content,
-svg|polygon.box-model-padding,
-svg|polygon.box-model-border,
-svg|polygon.box-model-margin {
-  stroke: none;
-}
-
-svg|line.box-model-guide-top,
-svg|line.box-model-guide-right,
-svg|line.box-model-guide-bottom,
-svg|line.box-model-guide-left {
-  stroke: #E7ADE7;
-  stroke-dasharray: 5 3;
-  shape-rendering: crispEdges;
-}
-
-/* Highlighter - Node Infobar */
-
-.highlighter-nodeinfobar {
-  color: #FF9F00;
-  border-radius: 3px;
-  background-color: #000000;
-  background-clip: padding-box;
-  border: 1px solid #008484;
-  padding: 5px;
-  /* Avoid cases where the infobar is smaller than the arrow, when the text is
-  short */
-  min-width: 75px;
-}
-
-/* Highlighter - Node Infobar - text */
-
-.highlighter-nodeinfobar-text {
-  text-align: center;
-  /* 100% - size of the buttons and margins */
-  max-width: calc(100% - 2 * (26px + 6px));
-  padding-bottom: 1px;
-}
-
-html|*.highlighter-nodeinfobar-tagname {
-  color: #FFCF00;
-}
-
-html|*.highlighter-nodeinfobar-id {
-  color: #9C9CFF;
-}
-
-html|*.highlighter-nodeinfobar-pseudo-classes {
-  color: #FF9F00;
-}
-
-html|*.highlighter-nodeinfobar-dimensions {
-  color: #A09090;
-  -moz-border-start: 1px solid #9C9CFF;
-  -moz-margin-start: 6px;
-  -moz-padding-start: 6px;
-}
-
-/* Highlighter - Node Infobar - box & arrow */
-
-.highlighter-nodeinfobar-arrow {
-  width: 14px;
-  height: 14px;
-  -moz-margin-start: calc(50% - 7px);
-  transform: rotate(-45deg);
-  background-clip: padding-box;
-  background-repeat: no-repeat;
-}
-
-.highlighter-nodeinfobar-arrow-top {
-  margin-bottom: -8px;
-  margin-top: 8px;
-  background-image: linear-gradient(to bottom left, transparent 50%, rgb(0, 132, 132) 50%);
-}
-
-.highlighter-nodeinfobar-arrow-bottom {
-  margin-top: -8px;
-  margin-bottom: 8px;
-  background-image: linear-gradient(to top right, transparent 50%, rgb(0, 132, 132) 50%);
-}
-
-.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar {
-  margin: 7px 0;
-}
-
-/* Css transform highlighter */
-
-svg|polygon.css-transform-transformed {
-  fill: #9C9CFF;
-  opacity: 0.8;
-}
-
-svg|polygon.css-transform-untransformed {
-  fill: #A09090;
-  opacity: 0.8;
-}
-
-svg|polygon.css-transform-transformed,
-svg|polygon.css-transform-untransformed,
-svg|line.css-transform-line {
-  stroke: #E7ADE7;
-  stroke-dasharray: 5 3;
-  stroke-width: 2;
-}
-
-/* === END highlighter.inc.css === */
-

 #full-screen-warning-message {
   background-color: #000000;
   color: #FF9F00;
 #full-screen-warning-message {
   background-color: #000000;
   color: #FF9F00;

diff --git a/LCARStrek/browser/devtools/debugger-prettyprint.png b/LCARStrek/browser/devtools/debugger-prettyprint.png
new file mode 100644 (file)
index 0000000..f85c82f
Binary files /dev/null and b/LCARStrek/browser/devtools/debugger-prettyprint.png differ

diff --git a/LCARStrek/browser/devtools/debugger-prettyprint@2x.png b/LCARStrek/browser/devtools/debugger-prettyprint@2x.png
new file mode 100644 (file)
index 0000000..fd421a2
Binary files /dev/null and b/LCARStrek/browser/devtools/debugger-prettyprint@2x.png differ

diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css
index 580635f848d9e65868b4a57b5e3b8515ea79f64d..d953c9c3b83c22ad13fbc50ce1a26491451d5bab 100644 (file)
--- a/LCARStrek/browser/devtools/debugger.css
+++ b/LCARStrek/browser/devtools/debugger.css
@@ -34,7 +34,13 @@ window {
 }
 
 #pretty-print {
 }
 
 #pretty-print {

-  font-weight: bold;
+  list-style-image: url(debugger-prettyprint.png);
+}
+
+@media (min-resolution: 2dppx) {
+  #pretty-print {
+    list-style-image: url(debugger-prettyprint@2x.png);
+  }

 }
 
 #toggle-breakpoints {
 }
 
 #toggle-breakpoints {

diff --git a/LCARStrek/browser/devtools/highlighter.css b/LCARStrek/browser/devtools/highlighter.css
new file mode 100644 (file)
index 0000000..5e02dc8
--- /dev/null
+++ b/LCARStrek/browser/devtools/highlighter.css
@@ -0,0 +1,169 @@
+/* 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/. */
+
+/*
+  The :-moz-native-anonymous selector prefix prevents the styles defined here
+  from impacting web content.
+  Indeed, this pseudo-class is only available to chrome code.
+  This stylesheet is loaded as a ua stylesheet via the addon sdk, so having this
+  pseudo-class is important.
+  Having bug 1086532 fixed would make it possible to load this stylesheet in a
+  <style scoped> node instead, directly in the native anonymous container
+  element.
+*/
+
+:-moz-native-anonymous .highlighter-container {
+  pointer-events: none;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+}
+
+:-moz-native-anonymous .highlighter-container [hidden] {
+  display: none;
+}
+
+/* Box model highlighter */
+:-moz-native-anonymous .box-model-container {
+  opacity: 0.4;
+}
+
+:-moz-native-anonymous .box-model-content {
+  fill: #008484;
+}
+
+:-moz-native-anonymous .box-model-padding {
+  fill: #9C9CFF;
+}
+
+:-moz-native-anonymous .box-model-border {
+  fill: #FFCF00;
+}
+
+:-moz-native-anonymous .box-model-margin {
+  fill: #A09090;
+}
+
+:-moz-native-anonymous .box-model-content,
+:-moz-native-anonymous .box-model-padding,
+:-moz-native-anonymous .box-model-border,
+:-moz-native-anonymous .box-model-margin {
+  stroke: none;
+}
+
+:-moz-native-anonymous .box-model-guide-top,
+:-moz-native-anonymous .box-model-guide-right,
+:-moz-native-anonymous .box-model-guide-bottom,
+:-moz-native-anonymous .box-model-guide-left {
+  stroke: #E7ADE7;
+  stroke-dasharray: 5 3;
+  shape-rendering: crispEdges;
+}
+
+/* Highlighter - Node Infobar */
+
+:-moz-native-anonymous .box-model-nodeinfobar-container {
+  position: absolute;
+  max-width: 95%;
+
+  font: message-box;
+  font-size: 11px;
+}
+
+:-moz-native-anonymous .box-model-nodeinfobar {
+  position: relative;
+
+  /* Centering the nodeinfobar in the container */
+  left: -50%;
+
+  padding: 5px;
+  min-width: 75px;
+
+  border-radius: 3px;
+  background: #000000 no-repeat padding-box;
+
+  color: #FF9F00;
+}
+
+:-moz-native-anonymous .box-model-nodeinfobar-container[hide-arrow] > .box-model-nodeinfobar {
+  margin: 7px 0;
+}
+
+/* Arrows */
+
+:-moz-native-anonymous .box-model-nodeinfobar-container > .box-model-nodeinfobar:before {
+  content: "";
+  display: none;
+
+  position: absolute;
+  left: calc(50% - 14px);
+
+  height: 0;
+  width: 0;
+  border: 14px solid #008484;
+  border-left-color: transparent;
+  border-right-color: transparent;
+}
+
+:-moz-native-anonymous .box-model-nodeinfobar-container[position="top"]:not([hide-arrow]) > .box-model-nodeinfobar:before {
+  border-bottom: 0;
+  top: 100%;
+  display: block;
+}
+
+:-moz-native-anonymous .box-model-nodeinfobar-container[position="bottom"]:not([hide-arrow]) > .box-model-nodeinfobar:before {
+  border-top: 0;
+  bottom: 100%;
+  display: block;
+}
+
+/* Text container */
+
+:-moz-native-anonymous .box-model-nodeinfobar-text {
+  overflow: hidden;
+  white-space: nowrap;
+  direction: ltr;
+  text-align: center;
+  padding-bottom: 1px;
+}
+
+:-moz-native-anonymous .highlighter-nodeinfobar-tagname {
+  color: #FFCF00;
+}
+
+:-moz-native-anonymous .highlighter-nodeinfobar-id {
+  color: #9C9CFF;
+}
+
+:-moz-native-anonymous .highlighter-nodeinfobar-classes,
+:-moz-native-anonymous .highlighter-nodeinfobar-pseudo-classes {
+  color: #FF9F00;
+}
+
+:-moz-native-anonymous .highlighter-nodeinfobar-dimensions {
+  color: #A09090;
+  -moz-border-start: 1px solid #9C9CFF;
+  -moz-margin-start: 6px;
+  -moz-padding-start: 6px;
+}
+
+/* Css transform highlighter */
+
+:-moz-native-anonymous .css-transform-transformed {
+  fill: #9C9CFF;
+  opacity: 0.8;
+}
+
+:-moz-native-anonymous .css-transform-untransformed {
+  fill: #A09090;
+  opacity: 0.8;
+}
+
+:-moz-native-anonymous .css-transform-transformed,
+:-moz-native-anonymous .css-transform-untransformed,
+:-moz-native-anonymous .css-transform-line {
+  stroke: #E7ADE7;
+  stroke-dasharray: 5 3;
+  stroke-width: 2;
+}

diff --git a/LCARStrek/browser/preferences/in-content/dialog.css b/LCARStrek/browser/preferences/in-content/dialog.css
new file mode 100644 (file)
index 0000000..5434298
--- /dev/null
+++ b/LCARStrek/browser/preferences/in-content/dialog.css
@@ -0,0 +1,66 @@
+/* - 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/. */
+
+dialog,
+window,
+prefpane,
+prefwindow,
+.windowDialog {
+  -moz-appearance: none;
+  background-color: #000000;
+  color: #FF9F00;
+  margin: 0;
+  padding: 0;
+}
+
+.contentPane {
+  margin: 0;
+}
+
+tabbox {
+  /* override the rule in certManager.xul */
+  margin: 0 0 5px !important;
+}
+
+tabpanels {
+  font-size: 1em;
+}
+
+tabs,
+label,
+description,
+#useDocumentColors {
+  margin-right: 4px;
+  margin-left: 4px;
+}
+
+tree:not(#rejectsTree) {
+  min-height: 15em;
+}
+
+.actionButtons {
+  margin: 3px 0 0 !important;
+}
+
+caption {
+  -moz-padding-start: 0;
+}
+
+groupbox {
+  font-size: 1em;
+  margin-top: 0;
+  margin-right: 4px;
+  margin-left: 4px;
+  padding-top: 0;
+  padding-bottom: 5px;
+}
+
+prefpane .groupbox-body {
+  padding: 0 0 5px;
+}
+
+groupbox description {
+  margin-right: 0;
+  margin-left: 0;
+}

diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css
index 4ad8747ffe925de80da2296552a7357944437fc4..2a7185067d795f5b44f63aa2853c2b95077edfec 100644 (file)
--- a/LCARStrek/browser/preferences/in-content/preferences.css
+++ b/LCARStrek/browser/preferences/in-content/preferences.css
@@ -6,14 +6,6 @@
 
 @namespace html "http://www.w3.org/1999/xhtml";
 
 
 @namespace html "http://www.w3.org/1999/xhtml";
 

-#dialogBox,
-dialog,
-window,
-prefwindow,
-.windowDialog {
-  background-color: #000000;
-}
-

 .main-content {
   padding: 1.5em 0 0; /* That padding needs to match the upper stripe. */
   overflow: auto;
 .main-content {
   padding: 1.5em 0 0; /* That padding needs to match the upper stripe. */
   overflow: auto;


@@ -28,7 +20,7 @@ prefwindow,
   background-repeat: no-repeat;
 }
 
   background-repeat: no-repeat;
 }
 

-prefpane {
+#mainPrefPane {

   padding: 10px 20px 0px;
   border-radius: 1em 0 0 0;
   background-color: #000000;
   padding: 10px 20px 0px;
   border-radius: 1em 0 0 0;
   background-color: #000000;


@@ -370,7 +362,7 @@ description > html|a {
 }
 
 /**
 }
 
 /**

- * Sub-dialog
+ * Dialog

  */
 
 #dialogOverlay {
  */
 
 #dialogOverlay {


@@ -379,7 +371,11 @@ description > html|a {
 }
 
 #dialogBox {
 }
 
 #dialogBox {

+  background-color: #000000;
+  color: #FF9F00;
+  /* font-size: 14px; */

   border: 1px solid #9C9CFF;
   border: 1px solid #9C9CFF;

+  border-radius: 10px;

   display: -moz-box;
   margin: 0;
   padding-right: 6px;
   display: -moz-box;
   margin: 0;
   padding-right: 6px;


@@ -389,10 +385,15 @@ description > html|a {
 #dialogBox[resizable="true"] {
   resize: both;
   overflow: hidden;
 #dialogBox[resizable="true"] {
   resize: both;
   overflow: hidden;

-  min-height: 30em;
+  min-height: 20em;

   min-width: 66ch;
 }
 
   min-width: 66ch;
 }
 

+.titlebar {
+  -moz-margin-start: 0;
+  -moz-margin-end: 0;
+}
+

 .close-icon {
   background-color: transparent !important;
   border: none;
 .close-icon {
   background-color: transparent !important;
   border: none;


@@ -416,21 +417,12 @@ description > html|a {
 #dialogFrame {
   -moz-box-flex: 1;
   /* Default dialog dimensions */
 #dialogFrame {
   -moz-box-flex: 1;
   /* Default dialog dimensions */

-  height: 30em;
+  height: 20em;

   width: 66ch;
 }
 
   width: 66ch;
 }
 

-tree:not(#rejectsTree) {
-  min-height: 15em;
-}
-
-:-moz-any(dialog, window, prefwindow) groupbox {
-  -moz-margin-start: 8px;
-  -moz-margin-end: 8px;
-}
-

 /**
 /**

- * End sub-dialog
+ * End Dialog

  */
 
 /* === END shared/in-content/preferences.css === */
  */
 
 /* === END shared/in-content/preferences.css === */