sync LCARStrek with the rest of the modifications in Firefox 10

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 104b91c5653d1daa61d1bf7a31d683fbaeb96281..72546cfec6a8ae7f32fa5164e7b7be1e484120ab 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -29,6 +29,7 @@
  *   Jim Mathies (jmathies@mozilla.com)
  *   Drew Willcoxon (adw@mozilla.com)
  *   Paul Rouget (paul@mozilla.com)
  *   Jim Mathies (jmathies@mozilla.com)
  *   Drew Willcoxon (adw@mozilla.com)
  *   Paul Rouget (paul@mozilla.com)

+ *   Rob Campbell (rcampbell@mozilla.com)

  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or


@@ -2402,6 +2403,13 @@ panel[dimmed="true"] {
   border-width: 0;
 }
 
   border-width: 0;
 }
 

+#addon-bar[customizing] > #status-bar {
+  opacity: .5;
+/*  background-image: -moz-repeating-linear-gradient(-45deg,
+                                                   rgba(255,255,255,.3), rgba(255,255,255,.3) 5px,
+                                                   rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);*/
+}
+

 /* Remove all borders from statusbarpanel children of
    the statusbar.
 #status-bar > statusbarpanel {
 /* Remove all borders from statusbarpanel children of
    the statusbar.
 #status-bar > statusbarpanel {


@@ -2613,7 +2621,6 @@ highlighter-veil-transparentbox {
   /* The content of the button can be larger than the button */
   overflow: hidden;
   min-height: 25px;
   /* The content of the button can be larger than the button */
   overflow: hidden;
   min-height: 25px;

-

   margin: 0 -11px 0 0;
   padding: 0 9px;
 }
   margin: 0 -11px 0 0;
   padding: 0 9px;
 }

diff --git a/LCARStrek/browser/devtools/csshtmltree.css b/LCARStrek/browser/devtools/csshtmltree.css
index f7f2363865807dcb01a18c0e1ea16c910739aaad..0cfe4b5277b799988448fe5fbbe950969c5eb284 100644 (file)
--- a/LCARStrek/browser/devtools/csshtmltree.css
+++ b/LCARStrek/browser/devtools/csshtmltree.css
@@ -22,6 +22,7 @@
  *   Joe Walker <jwalker@mozilla.com> (original author)
  *   Mihai Șucan <mihai.sucan@gmail.com>
  *   Michael Ratcliffe <mratcliffe@mozilla.com>
  *   Joe Walker <jwalker@mozilla.com> (original author)
  *   Mihai Șucan <mihai.sucan@gmail.com>
  *   Michael Ratcliffe <mratcliffe@mozilla.com>

+ *   Dão Gottwald <dao@mozilla.com>

  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or


@@ -37,150 +38,232 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
  *
  * ***** END LICENSE BLOCK ***** */
 

-body {
-  font-family: "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif;
-  font-size: 11px;
+:root {

   background: #000000;
   background: #000000;

+  color: #FF9F00;

 }
 }

-.path,
-.filters {
-  font-size: 11px;
-  word-spacing: -1px;
-}
-.path ol {
-  list-style: none outside none;
-  margin: 0;
-  padding: 0;
-}
-.path li {
-  border-radius: 3px;
-  padding: 2px 3px;
-  font-weight: bold;
-  font-size: 11px;
-  display: inline-block;
-}
-.path li:after {
-  content: " > ";
-}
-.path li:last-child {
-}
-.path li:last-child:after {
-  color: red;
-  content: "";
+
+#root {
+  display: -moz-box;

 }
 
 .property-header {
 }
 
 .property-header {

-  padding: 2px 5px;
-  color: #9C9CFF;
+  padding: 4px;
+  -moz-padding-start: 0;
+  -moz-padding-end: 5px;

 }
 
 }
 

-.property-name,
-.rule-matched,

 .rule-unmatched {
   cursor: pointer;
 .rule-unmatched {
   cursor: pointer;

+  padding: 2px;
+  -moz-padding-start: 4px;
+  -moz-padding-end: 0;
+  white-space: nowrap;

 }
 
 /* Take away these two :visited rules to get a core dumper     */
 /* See https://bugzilla.mozilla.org/show_bug.cgi?id=575675#c30 */
 }
 
 /* Take away these two :visited rules to get a core dumper     */
 /* See https://bugzilla.mozilla.org/show_bug.cgi?id=575675#c30 */

-.link {
-  color: #55A;
-}
+.link,

 .link:visited {
 .link:visited {

-  color: #55A;
+  color: #0091ff;

 }
 }

-a.link {
+.link,
+.helplink,
+.link:visited,
+.helplink:visited {

   text-decoration: none;
   text-decoration: none;

-  cursor: pointer;

 }
 }

-a.link:visited {
-  text-decoration: none;
+
+.helplink-container {
+  position: relative;
+  top: 2px;

 }
 
 }
 

-.rule-matched,
-.rule-unmatched {
-  padding: 2px 0;
-  white-space: nowrap;
+.helplink {
+  display: block;
+  height: 14px;
+  width: 0;
+  overflow: hidden;
+  -moz-padding-start: 14px;
+  background-image: url("chrome://browser/skin/devtools/goto-mdn.png");
+  -moz-margin-end: 2px;
+}
+
+.property-header:not(:hover) > .helplink-container {
+  visibility: hidden;
+}
+
+.unmatchedSelectorTable {
+  -moz-margin-start: 15px;

 }
 
 .rulelink {
 }
 
 .rulelink {

-  color: #55A;
+  color: -moz-dialogtext;
+  -moz-margin-start: 12px;

 }
 
 .expander {
 }
 
 .expander {

-  width: 8px;
-  height: 8px;
-  float: left;
-  -moz-margin-start: 15px;
+  width: 9px;
+  height: 9px;
+  -moz-margin-start: 5px;

   -moz-margin-end: 5px;
   -moz-margin-end: 5px;

-  margin-top: 3px;
-  background: url("chrome://browser/skin/devtools/arrows.png");
-  background-position: 24px 0;
+  background: url("chrome://global/skin/tree/twisty-closed.png") center center no-repeat;

 }
 
 }
 

-.searchfield {
-  background: url("chrome://browser/skin/devtools/search.png") no-repeat;
-  border-radius: 5px;
-  -moz-padding-start: 20px;
-  width: 135px;
-  float: right;
+.expander[open] {
+  background-image: url("chrome://global/skin/tree/twisty-open.png");

 }
 
 }
 

-.expander[dir="rtl"] {
-  background-position: 16px 0;
+.expandable {
+  cursor: pointer;

 }
 }

-.expander[open] {
-  background-position: 8px 0;
+
+.match {
+  visibility: hidden;
+}
+
+.expandable > .match {
+  visibility: visible;
+}
+
+.only-unmatched {
+  -moz-margin-start: 0;

 }
 
 .property-name {
 }
 
 .property-name {

-  display: inline-block;

   font-size: 12px;
   font-size: 12px;

-  font-weight: bold;

   color: #FF9F00;
   color: #FF9F00;

+  width: 220px;

 }
 .property-value {
 }
 .property-value {

-  display: inline-block;

   font-size: 10px;
   font-size: 10px;

+  color: #8050B0;

 }
 
 }
 

-.property-view-hidden {
-  display: none;
+#propertyContainer {
+  display: -moz-box;
+  -moz-box-orient: vertical;
+  -moz-box-flex: 1;
+  overflow-y: auto;

 }
 
 }
 

-.rule-link {
-  text-align: end;
-  -moz-padding-start: 10px;
+.darkrow {
+  background-color: #404000;

 }
 
 }
 

-/* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */
-.rule-text {
-  direction: ltr;
-  -moz-padding-start: 10px;
+#noResults {
+  font-size: 18px;
+  margin-top: 5px;
+  text-align: center;

 }
 
 }
 

-.resizerbox {
+.headerControls {
+  color: #9C9CFF;

   background-color: #000000;
   background-color: #000000;

+  padding-top: 5px;

 }
 
 }
 

-.bestmatch {
-  color: #FFCF00;
+.onlyuserstyles {
+  cursor: pointer;
+  font-size: 11px;

 }
 }

-.matched {
-  text-decoration: line-through;
+
+.searchfield {
+  -moz-margin-start: 10px;

 }
 }

-.parentmatch {
-  color: #9C9CFF;
+
+.styleinspector-legend {
+  -moz-margin-start: 12px;

 }
 }

-.unmatched {
-  color: #E7ADE7;
+
+#footer {
+  border-top: 1px solid #9C9CFF;

 }
 
 }
 

-.userStyles {
-  position: relative;
-  top: 3px;
+.legendKey {
+  margin: 0 5px;

 }
 
 }
 

-.userStyles,
-.userStylesLabel {
+/**
+ * CSS Rule View
+ */
+
+.ruleview {
+  background-color: #000000;
+}
+
+.ruleview-rule-source {
+  background-color: #000000;
+  padding: 2px 5px;
+}
+
+.ruleview-code {
+  padding: 2px 5px;
+}
+
+.ruleview-propertylist {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.ruleview-enableproperty {
+  height: 10px;
+  width: 10px;
+  -moz-margin-start: 2px;
+  -moz-margin-end: 0;
+}
+
+.ruleview-expander {
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  background: url("chrome://browser/skin/devtools/arrows.png") 24px 0;

   cursor: pointer;
   cursor: pointer;

+  -moz-margin-start: 2px;
+  -moz-margin-end: 5px;
+}
+
+.ruleview-expander:-moz-locale-dir(rtl) {
+  background-position: 16px 0;
+}
+
+.ruleview-expander.styleinspector-open {
+  background-position: 8px 0;
+}
+
+.ruleview-newproperty {
+  /* (enable checkbox width: 12px) + (expander width: 15px) */
+  -moz-margin-start: 27px;
+}
+
+.ruleview-propertyname {
+  display: inline-block;
+  padding: 1px 0;
+  cursor: text;
+  color: #9C9CFF;
+  text-decoration: inherit;
+}
+
+.ruleview-propertyvalue {
+  cursor: text;
+  text-decoration: inherit;
+}
+
+.ruleview-computedlist {
+  list-style: none;
+  padding: 0;
+}
+
+.ruleview-computed {
+  -moz-margin-start: 4em;
+}
+
+.ruleview-overridden {
+  text-decoration: line-through;
+}
+
+.styleinspector-propertyeditor {
+  border: 1px solid #9C9CFF;
+  padding: 0;

 }
 }

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

diff --git a/LCARStrek/browser/devtools/itemArrow-ltr.png b/LCARStrek/browser/devtools/itemArrow-ltr.png
new file mode 100644 (file)
index 0000000..7ccd93c
Binary files /dev/null and b/LCARStrek/browser/devtools/itemArrow-ltr.png differ

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

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

diff --git a/LCARStrek/browser/devtools/splitview.css b/LCARStrek/browser/devtools/splitview.css
new file mode 100644 (file)
index 0000000..cd3883f
--- /dev/null
+++ b/LCARStrek/browser/devtools/splitview.css
@@ -0,0 +1,155 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Style Editor code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Cedric Vivier <cedricv@neonux.com> (original author)
+ *   Paul Rouget <paul@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+.splitview-nav-container {
+  background-color: #00000;
+  color: #FF9F00;
+}
+
+.loading .splitview-nav-container {
+  background-image: url("chrome://global/skin/icons/loading.gif");
+  background-repeat: no-repeat;
+  background-position: center center;
+}
+
+.splitview-nav {
+  -moz-appearance: none;
+  margin: 0;
+  border-right: #9C9CFF;
+}
+
+.splitview-nav > li {
+  color: white;
+  background-clip: padding-box;
+  border-bottom: 1px solid #008484;
+  -moz-padding-end: 8px;
+  -moz-box-align: center;
+}
+
+.splitview-nav {
+  list-style-image: none;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.splitview-nav > li {
+  outline: 0;
+  vertical-align: bottom;
+}
+
+.placeholder {
+  -moz-box-flex: 1;
+  -moz-box-back: center;
+  text-align: center;
+}
+
+.splitview-nav > li.splitview-active {
+  background-image: url("itemArrow-ltr.png");
+  background-repeat: no-repeat, no-repeat, repeat-x;
+  background-position: center right, top right, top left;
+  background-size: auto, 1px 100%, auto;
+  border-bottom: 1px solid #008484;
+}
+
+.splitview-nav > li.splitview-active:-moz-locale-dir(rtl) {
+  background-image: url("itemArrow-rtl.png");
+  background-repeat: no-repeat, no-repeat, repeat-x;
+  background-position: center left, top left, top right;
+}
+
+/* Toolbars */
+
+.devtools-toolbar {
+  height: 26px;
+  background-origin: border-box;
+  background-clip: border-box;
+  border-top: 1px solid #008484;
+  border-bottom: 1px solid #008484;
+  padding: 3px;
+}
+
+.splitview-main > toolbar:-moz-locale-dir(ltr) {
+  border-right: 1px solid #008484;
+}
+
+.splitview-main > toolbar:-moz-locale-dir(rtl) {
+  border-left: 1px solid #008484;
+}
+
+.devtools-toolbarbutton {
+  font-size: 11px;
+  padding: 0 8px;
+  width: auto;
+  min-width: 48px;
+  min-height: 0;
+}
+
+
+/* Resizers */
+
+.splitview-landscape-resizer {
+  -moz-appearance: none;
+  width: 7px;
+  background-image: -moz-linear-gradient(left, #FFCF00 1px, #000000 1px);
+  background-size: 2px 10px;
+  background-clip: padding-box;
+  background-repeat: repeat-x;
+  border-width: 1px;
+  border-style: solid;
+  border-color: #9C9CFF;
+  margin: 5px 0;
+  -moz-transform: translateX(-7px);
+}
+
+.splitview-landscape-resizer:-moz-locale-dir(rtl) {
+  -moz-transform: translateX(7px);
+}
+
+.splitview-portrait-resizer {
+  -moz-appearance: none;
+  background: -moz-linear-gradient(top, #FFCF00 1px, #000000 1px);
+  height: 12px;
+  background-size: 10px 2px, 100% 12px;
+  background-clip: content-box, border-box;
+  background-repeat: repeat-y, no-repeat;
+  background-position: center center;
+  padding: 2px 0;
+  border-top: 1px solid #008484;
+  border-bottom: 1px solid #008484;
+}

diff --git a/LCARStrek/browser/devtools/styleeditor.css b/LCARStrek/browser/devtools/styleeditor.css
new file mode 100644 (file)
index 0000000..a83e18e
--- /dev/null
+++ b/LCARStrek/browser/devtools/styleeditor.css
@@ -0,0 +1,160 @@
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Style Editor code.
+ *
+ * The Initial Developer of the Original Code is Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Cedric Vivier <cedricv@neonux.com> (original author)
+ *   Paul Rouget <paul@mozilla.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#style-editor-chrome {
+  background-color: #000000;
+}
+
+.stylesheet-title,
+.stylesheet-name {
+  text-decoration: none;
+  color: #9C9CFF;
+}
+
+.stylesheet-name {
+  font-size: 13px;
+}
+
+.stylesheet-rule-count,
+.stylesheet-saveButton {
+  color: #FF9F00;
+}
+
+.stylesheet-saveButton {
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+.splitview-active .stylesheet-title,
+.splitview-active .stylesheet-name {
+  color: #FFCF00;
+}
+
+.splitview-active .stylesheet-rule-count,
+.splitview-active .stylesheet-saveButton {
+  color: #E7ADE7;
+}
+
+.splitview-nav:focus {
+  outline: 0; /* focus ring is on the stylesheet name */
+}
+
+.splitview-nav > li.unsaved > hgroup .stylesheet-name {
+  font-style: italic;
+}
+
+.splitview-nav:-moz-locale-dir(ltr) > li.unsaved > hgroup .stylesheet-name:before,
+.splitview-nav:-moz-locale-dir(rtl) > li.unsaved > hgroup .stylesheet-name:after {
+  font-style: italic;
+}
+
+.stylesheet-enabled {
+  padding: 8px 0;
+  margin: 0 8px;
+  background-image: url("itemToggle.png");
+  background-repeat: no-repeat;
+  background-clip: content-box;
+  background-position: 0 8px;
+  width: 24px;
+  height: 40px;
+}
+
+.disabled > .stylesheet-enabled {
+  background-position: -24px 8px;
+}
+
+.splitview-nav > li > .stylesheet-enabled:focus,
+.splitview-nav > li:hover > .stylesheet-enabled {
+  outline: 0;
+}
+
+.stylesheet-error-message {
+  color: #FF0000;
+}
+
+.stylesheet-more > h3 {
+  font-size: 11px;
+  -moz-margin-end: 2px;
+}
+
+.devtools-searchinput {
+  max-width: 25ex;
+  font-size: 11px;
+}
+
+.placeholder {
+  color: white;
+}
+
+.placeholder a {
+  text-decoration: underline;
+}
+
+h1,
+h2,
+h3 {
+  font-size: inherit;
+  font-weight: normal;
+  margin: 0;
+  padding: 0;
+}
+
+/* portrait mode */
+@media (max-width: 550px) {
+  .splitview-nav {
+    box-shadow: none;
+  }
+
+  .splitview-nav > li.splitview-active {
+    background-size: 0 0, 0 0, auto;
+  }
+
+  .stylesheet-enabled {
+    padding: 0;
+    background-position: 0 0;
+    height: 24px;
+  }
+
+  .disabled > .stylesheet-enabled {
+    background-position: -24px 0;
+  }
+
+  .splitview-nav > li > hgroup.stylesheet-info {
+    -moz-box-align: baseline;
+  }
+}