improve 2.0a1-updated LCARStrek

diff --git a/LCARStrek/communicator/button.css b/LCARStrek/communicator/button.css
index bc33a754b77a0243dd2b88aeb1cb0c9bca5ba00c..68e1fc3bbf5d4148bf70a20f7dee16e274d8d778 100644 (file)
--- a/LCARStrek/communicator/button.css
+++ b/LCARStrek/communicator/button.css
@@ -58,13 +58,16 @@
 .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 .toolbarbutton-1[disabled="true"]:hover:active,
 .toolbarbutton-1[disabled="true"]:hover:active > .toolbarbutton-menubutton-button {
-  padding: 1px;
+  padding: 1px 2px;
 }
 
 .toolbarbutton-1:hover:active,
 .toolbarbutton-1[open="true"],
 .toolbarbutton-1:hover:active > .toolbarbutton-menubutton-button {
-  padding: 2px 0px 0px 2px;
+  padding-top: 2px;
+  padding-bottom: 0px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 1px;
 }
 
 .toolbarbutton-1[type="menu"] {
@@ -84,33 +87,51 @@ toolbar[mode="icons"] .toolbarbutton-menubutton-button,
 }
 
 toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker {
-  padding: 4px 1px 8px 1px;
+  padding-top: 4px;
+  padding-bottom: 8px;
+  -moz-padding-start: 1px;
+  -moz-padding-end: 1px;
 }
 
 toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker {
-  padding: 0px 1px 13px 1px;
+  padding-top: 0px;
+  padding-bottom: 13px;
+  -moz-padding-start: 1px;
+  -moz-padding-end: 1px;
 }
 
 toolbar[mode="text"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
 toolbar[mode="text"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
-  padding: 5px 0px 7px 2px;
+  padding-top: 5px;
+  padding-bottom: 7px;
+  -moz-padding-start: 0px;
+  -moz-padding-end: 2px;
 }
 
 toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
 toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1[toolbarmode="small"][type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1[toolbarmode="small"][type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
-  padding: 1px 0px 12px 2px;
+  padding-top: 1px;
+  padding-bottom: 12px;
+  -moz-padding-start: 0px;
+  -moz-padding-end: 2px;
 }
 
 toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  padding: 4px 1px 8px 1px !important;
+  padding-top: 4px !important;
+  padding-bottom: 8px !important;
+  -moz-padding-start: 1px !important;
+  -moz-padding-end: 1px !important;
 }
 
 toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker[disabled="true"],
 .toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  padding: 0px 1px 13px 1px !important;
+  padding-top: 0px !important;
+  padding-bottom: 13px !important;
+  -moz-padding-start: 1px !important;
+  -moz-padding-end: 1px !important;
 }
 
 toolbar[mode="icons"] .toolbarbutton-text,

diff --git a/LCARStrek/communicator/communicator.css b/LCARStrek/communicator/communicator.css
index 2a895cda8d414b0de366a8963035045e1d8059e7..e396d160ac3f87cc6284089826f5f5f218ca5dfd 100644 (file)
--- a/LCARStrek/communicator/communicator.css
+++ b/LCARStrek/communicator/communicator.css
@@ -47,8 +47,24 @@
    == Styles shared everywhere throughout the Communicator suite.
    ========================================================================== */
 
+toolbar {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#grippytoolbar");
+}
+
+menubar {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#grippymenubar");
+}
+
 .toolbar-primary {
-  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary");
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#grippytoolbar-primary");
+}
+
+toolbar[xpfe="false"] {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar");
+}
+
+menubar[xpfe="false"] {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar");
 }
 
 /* ::::: autocomplete ::::: */

diff --git a/LCARStrek/communicator/preferences.css b/LCARStrek/communicator/preferences.css
index b80957f1c49baecb4f82ef70a06f91bb18d28bbb..5b7c30d71052b37201a513d71da7d1f3f3682f3a 100644 (file)
--- a/LCARStrek/communicator/preferences.css
+++ b/LCARStrek/communicator/preferences.css
@@ -41,10 +41,15 @@
 /* ::::: Main Window ::::: */
 
 prefwindow {
-  padding-top: 8px;
-  padding-bottom: 10px;
-  -moz-padding-start: 8px;
-  -moz-padding-end: 10px;
+  padding: 3px;
+}
+
+#categoryCol {
+  -moz-border-radius: 3px 3px 0px 0px;
+}
+
+dialogheader {
+  -moz-margin-start: 3px;
 }
 
 /* File Field Widget */

diff --git a/LCARStrek/global/dialog.css b/LCARStrek/global/dialog.css
index 98612ebc3a311e8c7a6189f068e092c176685fe0..98616f0a8627a9e789895d6cd8ccaeb8b0cd4d99 100644 (file)
--- a/LCARStrek/global/dialog.css
+++ b/LCARStrek/global/dialog.css
@@ -46,28 +46,24 @@
 /* ::::: dialog ::::: */
 
 dialog {
-  padding-top: 8px;
-  padding-bottom: 10px;
-  -moz-padding-start: 8px;
-  -moz-padding-end: 10px;
+  padding: 3px;
 }
 
 /* ::::: dialog buttons ::::: */
 
 .dialog-button {
 /*  font: menu; */
-  margin-top: 5px;
+  margin-top: 3px;
 }
 
 /* ::::: dialog header ::::: */
 
 dialogheader {
-  -moz-border-radius: 3px;
-  margin: 0px 5px 5px 5px;
-  border: 1px solid #9C9CFF;
-  padding: 3px 4px;
-  background-color: #000000;
-  color: #9C9CFF;
+  -moz-border-radius: 8px;
+  margin: 0px;
+  padding: 1px 12px;
+  background-color: #FF9F00;
+  color: #000000;
 }
 
 .dialogheader-title {

diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css
index be8e862d5a5060b360de7969dc75c689a419f6d3..40ec0616d990bab4282ea5d2a859ca2e275be03c 100644 (file)
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -79,6 +79,10 @@ menubar {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar");
 }
 
+toolbaritem > menubar {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar");
+}
+
 /*
 progressmeter[mode="undetermined"] {
   -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter-undetermined");

diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index 4eb76356d4a1bcd1e8070c1ba4ab73b1198149ef..b248396e22aa84dbc78e2333405c0bb2376d82bf 100755 (executable)
--- a/LCARStrek/global/globalBindings.xml
+++ b/LCARStrek/global/globalBindings.xml
@@ -63,30 +63,55 @@
   </binding>
 
   <binding id="toolbar" extends="chrome://global/content/bindings/toolbar.xml#toolbar">
+    <content>
+      <xul:hbox class="toolbar-startcap"/>
+      <xul:hbox flex="1" class="toolbar-holder" align="center"
+                xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+        <children/>
+      </xul:hbox>
+      <xul:hbox class="toolbar-endcap"/>
+    </content>
+  </binding>
+
+  <binding id="menubar" extends="chrome://global/content/bindings/toolbar.xml#menubar">
+    <resources>
+      <stylesheet src="chrome://global/skin/toolbar.css"/>
+    </resources>
+
+    <content>
+      <xul:hbox class="menubar-startcap"/>
+      <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar" align="center">
+        <children/>
+      </xul:hbox>
+      <xul:hbox class="menubar-endcap"/>
+    </content>
+  </binding>
+
+  <binding id="grippytoolbar" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar">
     <content>
       <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
                          tbattr="toolbar-grippy" class="toolbar-grippy"/>
       <xul:hbox flex="1" class="toolbar-holder" align="center"
-               xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+                xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
         <children/>
       </xul:hbox>
       <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
-  <binding id="toolbar-primary" extends="chrome://global/content/bindings/toolbar.xml#toolbar-primary">
+  <binding id="grippytoolbar-primary" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary">
     <content>
       <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
                          tbattr="toolbar-grippy" class="toolbar-grippy"/>
       <xul:hbox flex="1" class="toolbar-holder" align="center"
-               xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+                xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
         <children/>
       </xul:hbox>
       <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
-  <binding id="menubar" extends="chrome://global/content/bindings/toolbar.xml#menubar">
+  <binding id="grippymenubar" extends="chrome://communicator/content/bindings/toolbar.xml#grippymenubar">
     <resources>
       <stylesheet src="chrome://global/skin/toolbar.css"/>
     </resources>

diff --git a/LCARStrek/global/preferences.css b/LCARStrek/global/preferences.css
index 4cb96c7ee5b8f5626661ab29f84122acd12951bb..9912c2747f8799f1f81e8c780a73b2782b9052ab 100644 (file)
--- a/LCARStrek/global/preferences.css
+++ b/LCARStrek/global/preferences.css
@@ -49,17 +49,17 @@ prefwindow {
 }
 
 prefpane {
-  padding-top: 8px;
-  padding-bottom: 10px;
-  -moz-padding-start: 8px;
-  -moz-padding-end: 10px;
+  padding-top: 3px;
+  padding-bottom: 0px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 0px;
 }
 
 prefwindow[type="child"] {
-  padding-top: 8px;
-  padding-bottom: 10px;
-  -moz-padding-start: 8px;
-  -moz-padding-end: 10px;
+  padding-top: 3px;
+  padding-bottom: 0px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 0px;
 }
 
 prefwindow[type="child"] > prefpane {
@@ -67,9 +67,7 @@ prefwindow[type="child"] > prefpane {
 }
 
 .prefWindow-dlgbuttons {
-  padding-bottom: 10px;
-  -moz-padding-start: 8px;
-  -moz-padding-end: 10px;
+  padding-top: 3px;
 }
 
 prefwindow[type="child"] .prefWindow-dlgbuttons {
@@ -86,6 +84,7 @@ radio[pane] {
 .paneSelector {
   border-bottom: 1px solid #9C9CFF;
   margin: 0px;
+  margin-bottom: 3px;
   -moz-padding-start: 10px;
   background-color: #000000;
   color: #FF9F00;

diff --git a/LCARStrek/global/textbox.css b/LCARStrek/global/textbox.css
index 1f41c8e708c541af9a29d0d666f3c7428b3b855b..3d4cfc5ea03ff6f9cb970cb05014caeeb8fc0b12 100644 (file)
--- a/LCARStrek/global/textbox.css
+++ b/LCARStrek/global/textbox.css
@@ -46,6 +46,7 @@
 
 textbox {
   -moz-border-radius: 3px;
+  -moz-outline-radius: 3px;
   cursor: text;
   margin: 2px 3px;
   border: 1px solid #9C9CFF;
@@ -95,7 +96,6 @@ textbox[disabled="true"] {
 textbox[focused="true"] {
   border: 1px solid #008484;
   outline: 1px solid #008484;
-  margin: 1px 3px;
 }
 
 textbox[focused="true"][readonly="true"] {

diff --git a/LCARStrek/global/toolbar.css b/LCARStrek/global/toolbar.css
index 556d3f21304ddb87fcbea51dce4759420431fdbf..ea9bbcdd348703253726ddf5a91a9140e32f5295 100644 (file)
--- a/LCARStrek/global/toolbar.css
+++ b/LCARStrek/global/toolbar.css
@@ -66,10 +66,11 @@ toolbar#toolbar-menubar > .toolbar-holder {
   background-color: #6000CF;
 }
 
-/* ::::: toolbargrippy ::::: */
+/* ::::: toolbargrippy, startcap (LCARStrek specific) ::::: */
 
 toolbargrippy,
-toolbar > .toolbar-begcap {
+toolbar > .toolbar-startcap,
+menubar > .menubar-startcap {
   -moz-border-radius: 8px 0px 0px 8px;
   -moz-box-orient: vertical;
   -moz-box-align: center;

diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css
index c0dd11b31af9e1ffba8a7c972fa76ae35fa09691..ea05e9f7d915cba7c41d42337ab539d66eb8f2a2 100644 (file)
--- a/LCARStrek/global/toolbarbutton.css
+++ b/LCARStrek/global/toolbarbutton.css
@@ -52,12 +52,13 @@ toolbarbutton {
   margin: 0px;
   margin-left: 2px;
   border: none;
-  padding: 1px;
+  padding: 1px 2px;
   background-color: #000000;
   color: #FFCF00;
 }
 
 .toolbarbutton-icon {
+  -moz-margin-start: 1px;
   -moz-margin-end: 2px;
 }
 
@@ -94,8 +95,8 @@ toolbarbutton:hover:active,
 toolbarbutton[open="true"] {
   padding-top: 2px;
   padding-bottom: 0px;
-  -moz-padding-start: 2px;
-  -moz-padding-end: 0px;
+  -moz-padding-start: 3px;
+  -moz-padding-end: 1px;
 }
 
 toolbarbutton[disabled="true"],
@@ -112,8 +113,8 @@ toolbarbutton[disabled="true"][open="true"] {
 toolbarbutton[checked="true"] {
   padding-top: 2px !important;
   padding-bottom: 0px !important;
-  -moz-padding-start: 2px !important;
-  -moz-padding-end: 0px !important;
+  -moz-padding-start: 3px !important;
+  -moz-padding-end: 1px !important;
   background-color: #008484;
   color: #FFCF00;
 }
@@ -215,6 +216,17 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm
   -moz-padding-end: 0px;
 }
 
+toolbarbutton[type="menu-button"]:not([disabled="true"]):hover > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"]:not([disabled="true"]):hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][open="true"]:not([disabled="true"]) > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu"]:not([disabled="true"]):hover > .toolbarbutton-menu-dropmarker,
+toolbarbutton[type="menu"]:not([disabled="true"]):hover:active > .toolbarbutton-menu-dropmarker,
+toolbarbutton[type="menu"][open="true"]:not([disabled="true"]) > .toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif");
+ -moz-image-region: auto;
+}
+
+
 .toolbarbutton-menubutton-dropmarker[disabled="true"] {
   padding: 3px 1px 1px 1px !important;
   border: none !important;

diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css
index 50dc77db9c1260f356a93ed823c28f1363e4961f..21b196ebc197c9799bbb02a4ae5fc2a75829d1cb 100644 (file)
--- a/LCARStrek/mozapps/extensions/extensions.css
+++ b/LCARStrek/mozapps/extensions/extensions.css
@@ -348,6 +348,7 @@ vbox[typeName="status"][type="header-recommended"] {
 .viewSelector {
   border-bottom: 1px solid #9C9CFF;
   margin: 0px;
+  margin-bottom: 3px;
   -moz-padding-start: 10px;
   background-color: #000000;
   color: #FF9F00;

diff --git a/LCARStrek/preview.png b/LCARStrek/preview.png
index 464d23b51fe8fbfe331c4ea24b9d4bf19916625c..a79f36399ae71d23595e2dbfb5dad10a9e47f672 100755 (executable)
Binary files a/LCARStrek/preview.png and b/LCARStrek/preview.png differ