first part of sync for LCARStrek with browser windows theme in Firefox 23 cycle

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index a25e08aac18f440b9fc0f811e1dae6a1f6310768..419ad189c87f4516ccbb9393a02e945eb9805d44 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -2850,16 +2850,6 @@ html|*#gcli-output-frame {
   display: none;
 }
 
   display: none;
 }
 

-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar #social-toolbar-item {
-  margin-left: 2px;
-  margin-right: 2px;
-}
-
-#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar #social-toolbar-item > .toolbarbutton-1 {
-  padding-left: 0;
-  padding-right: 0;
-}
-

 .toolbarbutton-badge-container {
   margin: 0;
   padding: 0;
 .toolbarbutton-badge-container {
   margin: 0;
   padding: 0;


@@ -2867,7 +2857,7 @@ html|*#gcli-output-frame {
 }
 
 #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {
 }
 
 #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container {

-  padding: 2px 5px;
+  padding: 2px 2px;

 }
 
 .toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon {
 }
 
 .toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon {


@@ -2930,6 +2920,36 @@ html|*#gcli-output-frame {
   border: 0;
 }
 
   border: 0;
 }
 

+.popup-notification-icon[popupid="servicesInstall"] {
+  list-style-image: url("chrome://browser/skin/social/services-64.png");
+}
+#servicesInstall-notification-icon {
+  list-style-image: url("chrome://browser/skin/social/services-16.png");
+}
+#social-undoactivation-button,
+#servicesInstall-learnmore-link {
+  -moz-margin-start: 0; /* override default label margin to match description margin */
+}
+
+#socialActivatedNotification .popup-notification-button-container {
+  margin-left: 6px;
+}
+
+.social-activation-icon {
+  width: auto;
+  height: auto;
+  max-height: 64px;
+  max-width: 64px;
+}
+
+#social-activation-message {
+  max-width: 250px;
+}
+
+#social-activation-message > label {
+  margin: 0;
+}
+

 /* social toolbar provider menu */
 .social-statusarea-popup {
   margin-top: 0;
 /* social toolbar provider menu */
 .social-statusarea-popup {
   margin-top: 0;


@@ -3041,8 +3061,7 @@ html|*#gcli-output-frame {
 }
 
 .chatbar-button {
 }
 
 .chatbar-button {

-  /* XXX get a real image for this */
-  list-style-image: url("chrome://browser/skin/social/social.png");
+  list-style-image: url("chrome://browser/skin/social/services-16.png");

   background-color: #000000;
   border: none;
   margin: 0;
   background-color: #000000;
   border: none;
   margin: 0;


@@ -3053,6 +3072,12 @@ html|*#gcli-output-frame {
   -moz-border-end: 1px solid #008484;
 }
 
   -moz-border-end: 1px solid #008484;
 }
 

+@media (min-resolution: 2dppx) {
+  .chatbar-button {
+    list-style-image: url("chrome://browser/skin/social/services-16@2x.png");
+  }
+}
+

 .chatbar-button > menupopup > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
   width: auto;
   height: auto;
 .chatbar-button > menupopup > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
   width: auto;
   height: auto;

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

diff --git a/LCARStrek/browser/devtools/commandline.css b/LCARStrek/browser/devtools/commandline.css
index 14bfc921e061cd31a0164d03cfa7cc8df00d5924..1163245ea1b0e56a568d4deebe7b75bc91aefff9 100644 (file)
--- a/LCARStrek/browser/devtools/commandline.css
+++ b/LCARStrek/browser/devtools/commandline.css
@@ -144,3 +144,11 @@
   opacity: 0.6;
   text-decoration: line-through;
 }
   opacity: 0.6;
   text-decoration: line-through;
 }

+
+.gcli-breakpoint-label {
+  font-weight: bold;
+}
+
+.gcli-breakpoint-lineText {
+  font-family: "Liberation Mono", Consolas, "Courier New", monospace;
+}

diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css
index b226c7e25af013fabf063c066927d57b36be6c6e..7831a2b7d8c3cb3ccc9a64418ad75c5a4fe9558a 100644 (file)
--- a/LCARStrek/browser/devtools/common.css
+++ b/LCARStrek/browser/devtools/common.css
@@ -178,7 +178,10 @@ devtools-menulist:-moz-focusring,
 #devtools-side-splitter {
   min-width: 0;
   width: 3px;
 #devtools-side-splitter {
   min-width: 0;
   width: 3px;

+  border: none;
+  margin: 0 3px;

   position: relative;
   position: relative;

+  cursor: e-resize;

 }
 
 /* In-tools sidebar */
 }
 
 /* In-tools sidebar */


@@ -341,3 +344,28 @@ devtools-menulist:-moz-focusring,
 /*  color: #666;*/
 }
 
 /*  color: #666;*/
 }
 

+/* Responsive container */
+
+.devtools-responsive-container {
+  -moz-box-orient: horizontal;
+}
+
+@media (max-width: 700px) {
+  .devtools-responsive-container {
+    -moz-box-orient: vertical;
+  }
+
+  .devtools-responsive-container > .devtools-side-splitter {
+    border: 0;
+    margin: 3px 0;
+    min-height: 3px;
+    height: 3px;
+    /* In some edge case the cursor is not changed to n-resize */
+    cursor: n-resize;
+  }
+
+  .devtools-responsive-container > .devtools-sidebar-tabs {
+    min-height: 35vh;
+    max-height: 75vh;
+  }
+}

diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css
index 9e19bb376a69c95041835bfc7f2cad40819f4002..a931ce6f94260a2d75ff9641369c0d1f97b36ebb 100644 (file)
--- a/LCARStrek/browser/devtools/dark-theme.css
+++ b/LCARStrek/browser/devtools/dark-theme.css
@@ -37,19 +37,16 @@
 
 .theme-checkbox {
   display: inline-block;
 
 .theme-checkbox {
   display: inline-block;

-  border: 1px solid #FF9F00;
-  width: 6px;
-  height: 6px;
-  padding: 2px;
-  background-color: transparent;
-  background-repeat: no-repeat;
+  border: 0;
+  width: 14px;
+  height: 14px;
+  padding: 0;

   outline: none;
   outline: none;

+  background: url("chrome://browser/skin/devtools/checkbox.png") no-repeat;

 }
 
 .theme-checkbox[checked] {
 }
 
 .theme-checkbox[checked] {

-  background-clip: content-box;
-  background-image: linear-gradient(to bottom right, transparent 48%, #FF9F00 48%, #FF9F00 52%, transparent 52%),
-                    linear-gradient(to bottom left, transparent 48%, #FF9F00 48%, #FF9F00 52%, transparent 52%);
+  background: url("chrome://browser/skin/devtools/checkbox.png") 14px 0;

 }
 
 .theme-selected {
 }
 
 .theme-selected {

diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css
index 20079ae2f2689e17a890e7dd97033d9800fa6a4f..7e2523c0e7295fef4a5abe6c66b7ce447867e27d 100644 (file)
--- a/LCARStrek/browser/devtools/debugger.css
+++ b/LCARStrek/browser/devtools/debugger.css
@@ -20,20 +20,6 @@ window {
   -moz-border-start-color: transparent;
 }
 
   -moz-border-start-color: transparent;
 }
 

-/* Watch expressions, variables and other instruments pane */
-
-#instruments-pane {
-  min-width: 50px;
-  -moz-margin-start: 0px !important;
-  /* Unfortunately, transitions don't work properly with locale-aware properties,
-     so both the left and right margins are set via js, while the start margin
-     is always overridden here. */
-}
-
-#instruments-pane[animated] {
-  transition: margin 0.25s ease-in-out;
-}
-

 /* ListWidget items */
 
 .list-widget-item {
 /* ListWidget items */
 
 .list-widget-item {


@@ -277,6 +263,14 @@ window {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 

+#resumption-panel-desc {
+  width: 200px;
+}
+
+#resumption-order-panel {
+  -moz-margin-start: -8px;
+}
+

 #resume {
   list-style-image: url("chrome://browser/skin/devtools/debugger-play.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);
 #resume {
   list-style-image: url("chrome://browser/skin/devtools/debugger-play.png");
   -moz-image-region: rect(0px, 16px, 16px, 0px);


@@ -324,12 +318,12 @@ window {
   background: none;
   box-shadow: none;
   border: none;
   background: none;
   box-shadow: none;
   border: none;

-  list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");
+  list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png");

   -moz-image-region: rect(0px,16px,16px,0px);
 }
 
   -moz-image-region: rect(0px,16px,16px,0px);
 }
 

-#instruments-pane-toggle:not([toggled]) {
-  list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png");
+#instruments-pane-toggle[pane-collapsed] {
+  list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png");

 }
 
 #instruments-pane-toggle:hover,
 }
 
 #instruments-pane-toggle:hover,

diff --git a/LCARStrek/browser/devtools/light-theme.css b/LCARStrek/browser/devtools/light-theme.css
index 9e19bb376a69c95041835bfc7f2cad40819f4002..a931ce6f94260a2d75ff9641369c0d1f97b36ebb 100644 (file)
--- a/LCARStrek/browser/devtools/light-theme.css
+++ b/LCARStrek/browser/devtools/light-theme.css
@@ -37,19 +37,16 @@
 
 .theme-checkbox {
   display: inline-block;
 
 .theme-checkbox {
   display: inline-block;

-  border: 1px solid #FF9F00;
-  width: 6px;
-  height: 6px;
-  padding: 2px;
-  background-color: transparent;
-  background-repeat: no-repeat;
+  border: 0;
+  width: 14px;
+  height: 14px;
+  padding: 0;

   outline: none;
   outline: none;

+  background: url("chrome://browser/skin/devtools/checkbox.png") no-repeat;

 }
 
 .theme-checkbox[checked] {
 }
 
 .theme-checkbox[checked] {

-  background-clip: content-box;
-  background-image: linear-gradient(to bottom right, transparent 48%, #FF9F00 48%, #FF9F00 52%, transparent 52%),
-                    linear-gradient(to bottom left, transparent 48%, #FF9F00 48%, #FF9F00 52%, transparent 52%);
+  background: url("chrome://browser/skin/devtools/checkbox.png") 14px 0;

 }
 
 .theme-selected {
 }
 
 .theme-selected {

diff --git a/LCARStrek/browser/devtools/ruleview.css b/LCARStrek/browser/devtools/ruleview.css
index eaf441476c8311462af541d1b4aeb085a9d7f0ca..f19670a369a3d034e2315e8987281cb8fdddd795 100644 (file)
--- a/LCARStrek/browser/devtools/ruleview.css
+++ b/LCARStrek/browser/devtools/ruleview.css
@@ -28,10 +28,16 @@
   text-decoration: underline;
 }
 
   text-decoration: underline;
 }
 

-.ruleview-rule {
+.ruleview-rule,
+#noResults {

   padding: 2px 4px;
 }
 
   padding: 2px 4px;
 }
 

+#noResults {
+  font: message-box;
+  color: #8050B0;
+}
+

 .ruleview-rule + .ruleview-rule {
   border-top-width: 1px;
   border-top-style: dotted;
 .ruleview-rule + .ruleview-rule {
   border-top-width: 1px;
   border-top-style: dotted;

diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css
index db74540566db0e0975eacc285c505df0f2a5d0c9..be6686a6a3e628f41a691ab7fdda8e4595bdd4f4 100644 (file)
--- a/LCARStrek/browser/devtools/webconsole.css
+++ b/LCARStrek/browser/devtools/webconsole.css
@@ -6,16 +6,6 @@ window {
   padding: 0;
 }
 
   padding: 0;
 }
 

-.hud-outer-wrapper {
-  width: 100%; 
-  height: 100%;
-}
-
-.hud-console-wrapper {
-  width: 100%; 
-  overflow: auto; 
-}
-

 /* General output styles */
 
 .webconsole-timestamp {
 /* General output styles */
 
 .webconsole-timestamp {


@@ -104,7 +94,6 @@ window {
 .hud-output-node {
   -moz-appearance: none;
   border-bottom: 1px solid #9C9CFF;
 .hud-output-node {
   -moz-appearance: none;
   border-bottom: 1px solid #9C9CFF;

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

   margin: 0;
 }
 
   margin: 0;
 }
 


@@ -115,7 +104,7 @@ window {
 
 /* WebConsole colored drops */
 
 
 /* WebConsole colored drops */
 

-.webconsole-filter-button[checked=true] {
+.webconsole-filter-button[checked] {

   /* color: white !important; */
 }
 
   /* color: white !important; */
 }
 


@@ -278,3 +267,24 @@ webconsole-mixed-content {
 .hud-filter-box {
   width: 200px;
 }
 .hud-filter-box {
   width: 200px;
 }

+
+.webconsole-msg-inspector iframe {
+  height: 7em;
+  margin-bottom: 15px;
+  -moz-margin-end: 15px;
+  border-radius: 4px;
+}
+
+#webconsole-sidebar > tabs {
+  height: 0;
+  border: none;
+}
+
+.webconsole-msg-security > .webconsole-msg-icon-container {
+  -moz-border-start: solid #FF0000 6px;
+}
+
+.webconsole-filter-button[category="security"] > .toolbarbutton-menubutton-button:before {
+  background-color: #FF0000;
+  border-color: #FFCF00;
+}

diff --git a/LCARStrek/browser/downloads/downloads.css b/LCARStrek/browser/downloads/downloads.css
index 19b2594f58dff68d877957f67c09587f988da077..9fef1597b3399cac6086dd78a85b4d0663f16c4a 100644 (file)
--- a/LCARStrek/browser/downloads/downloads.css
+++ b/LCARStrek/browser/downloads/downloads.css
@@ -144,6 +144,7 @@ richlistitem[type="download"]:first-child {
 
 /*** Highlighted list items ***/
 
 
 /*** Highlighted list items ***/
 

+/* #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover { */

 #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"]:hover {
   border-radius: 3px;
   background-color: #794900;
 #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"]:hover {
   border-radius: 3px;
   background-color: #794900;

diff --git a/LCARStrek/browser/social/services-16.png b/LCARStrek/browser/social/services-16.png
new file mode 100644 (file)
index 0000000..11eaa2f
Binary files /dev/null and b/LCARStrek/browser/social/services-16.png differ

diff --git a/LCARStrek/browser/social/services-64.png b/LCARStrek/browser/social/services-64.png
new file mode 100644 (file)
index 0000000..ae3c9f0
Binary files /dev/null and b/LCARStrek/browser/social/services-64.png differ

diff --git a/LCARStrek/browser/social/social.png b/LCARStrek/browser/social/social.png
deleted file mode 100644 (file)
index ef11a9b..0000000
Binary files a/LCARStrek/browser/social/social.png and /dev/null differ