even more fixes for LCARStrek 2.0a1

diff --git a/LCARStrek/communicator/tasksOverlay.css b/LCARStrek/communicator/tasksOverlay.css
index b8aa18e7416accb802725dbb1760ef192d7e4240..8563071665721423e29d5e280790292d223b5f26 100644 (file)
--- a/LCARStrek/communicator/tasksOverlay.css
+++ b/LCARStrek/communicator/tasksOverlay.css
@@ -85,11 +85,3 @@
 #component-bar {
   -moz-box-align: stretch;
 }
-
-/* ::::: cookie button ::::: */
-
-#mini-cookie {
-  background-color: transparent;
-  padding: 1px;
-  
-}

diff --git a/LCARStrek/communicator/toolbar.css b/LCARStrek/communicator/toolbar.css
index d4f6c6660f0b56d9ce1af6fc8b7aa844ad352217..3121a574a2baddda29cc7709e41141ba45e08dfd 100644 (file)
--- a/LCARStrek/communicator/toolbar.css
+++ b/LCARStrek/communicator/toolbar.css
@@ -43,18 +43,18 @@
 
 /* ::::: primary toolbar ::::: */
 
-.toolbar-primary > .toolbar-holder {
+.toolbar-primary > .toolbar-box > .toolbar-holder {
   background-color: #FF9F00;
 }
 
-.toolbar-primary > .toolbar-endcap {
+.toolbar-primary > .toolbar-box > .toolbar-endcap {
   background-color: #9C9CFF;
 }
 
-.toolbar-primary > toolbargrippy {
+.toolbar-primary > .toolbar-box > toolbargrippy {
   background-color: #9C9CFF;
 }
 
-.toolbar-primary > toolbargrippy:hover {
+.toolbar-primary > .toolbar-box > toolbargrippy:hover {
   background-color: #FFCF00;
 }

diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css
index 40ec0616d990bab4282ea5d2a859ca2e275be03c..b0da51eefc6409bcea70e0689d5196188590cc53 100644 (file)
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -162,7 +162,7 @@ statusbar {
   background-color: #8050B0;
   padding-left: 2px;
   color: #000000;
-  -moz-box-align: center;
+  -moz-box-align: stretch;
 }
 
 .statusbar-left {

diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index cac912b751e276fe0cf5f7a6ab0ed761c02cc0c1..b8dafc85670a09d3cea6fce7f3f63772844bf2a1 100755 (executable)
--- a/LCARStrek/global/globalBindings.xml
+++ b/LCARStrek/global/globalBindings.xml
@@ -64,12 +64,14 @@
 
   <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 flex="1" class="toolbar-box">
+        <xul:vbox 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:vbox class="toolbar-endcap"/>
       </xul:hbox>
-      <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
@@ -79,35 +81,43 @@
     </resources>
 
     <content>
-      <xul:hbox class="menubar-startcap"/>
-      <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar" align="center">
-        <children/>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:vbox class="menubar-startcap"/>
+        <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar" align="center">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="menubar-endcap"/>
       </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">
-        <children/>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy"
+                           class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder"
+                  xbl:inherits="collapsed,last-toolbar,orient,align,pack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
       </xul:hbox>
-      <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
   <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">
-        <children/>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy"
+                           class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder"
+                  xbl:inherits="collapsed,last-toolbar,orient,align,pack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
       </xul:hbox>
-      <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
@@ -117,12 +127,14 @@
     </resources>
 
     <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" xbl:inherits="collapsed,last-toolbar" align="center">
-        <children/>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy" class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="menubar-endcap"/>
       </xul:hbox>
-      <xul:hbox class="menubar-endcap"/>
     </content>
   </binding>
 

diff --git a/LCARStrek/global/menu.css b/LCARStrek/global/menu.css
index ecd1b248cf441bb026fdcfa8126a0c677cd62e33..d61da0df6a9097f934bfdd4d991901b01dd57c33 100644 (file)
--- a/LCARStrek/global/menu.css
+++ b/LCARStrek/global/menu.css
@@ -71,8 +71,9 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
 }
 
 menubar > menu {
-  padding: 2px 0px 2px 3px;
-  margin: 0px 0px 0px 2px;
+  padding: 2px;
+  margin: 0px;
+  -moz-margin-start: 2px;
   border: none;
 }
 

diff --git a/LCARStrek/global/menulist.css b/LCARStrek/global/menulist.css
index 8f6a081824f96aa66ad8b9e81306ce6838c5494b..39581aa2d5b49a17e1a761a7120f7021cb5d944b 100644 (file)
--- a/LCARStrek/global/menulist.css
+++ b/LCARStrek/global/menulist.css
@@ -180,9 +180,3 @@ html|*.menulist-editable-input {
 .menulist-compact[disabled="true"] {
   list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
 }
-
-.menulist-compact:focus > .menulist-label-box {
-  border: 1px dotted #008484;
-  background-color: transparent;
-  color: inherit;
-}

diff --git a/LCARStrek/global/textbox.css b/LCARStrek/global/textbox.css
index 3d4cfc5ea03ff6f9cb970cb05014caeeb8fc0b12..496cfd0e86d4c4aceac9748aff3b9c1e8d958467 100644 (file)
--- a/LCARStrek/global/textbox.css
+++ b/LCARStrek/global/textbox.css
@@ -46,7 +46,7 @@
 
 textbox {
   -moz-border-radius: 3px;
-  -moz-outline-radius: 3px;
+  -moz-outline-radius: 5px;
   cursor: text;
   margin: 2px 3px;
   border: 1px solid #9C9CFF;

diff --git a/LCARStrek/global/toolbar.css b/LCARStrek/global/toolbar.css
index ea9bbcdd348703253726ddf5a91a9140e32f5295..2c9734d68c84b3672fa9ac111a40494fd8128249 100644 (file)
--- a/LCARStrek/global/toolbar.css
+++ b/LCARStrek/global/toolbar.css
@@ -45,6 +45,7 @@
 
 toolbox {
   background-color: #000000;
+  color: #FF9F00;
 }
 
 /* ::::: toolbar & menubar ::::: */
@@ -53,24 +54,27 @@ toolbar,
 menubar {
   border-bottom: 3px solid #000000;
   background-color: #000000;
+  color: #FF9F00;
   min-width: 1px;
 }
 
 /* toolbar-holder is the body of the main part of a toolbar */
-toolbar > .toolbar-holder {
+.toolbar-holder {
   background-color: #9C9CFF;
+  color: #000000;
 }
 
-menubar > .toolbar-holder,
-toolbar#toolbar-menubar > .toolbar-holder {
+menubar > .toolbar-box > .toolbar-holder,
+toolbar#toolbar-menubar > .toolbar-box > .toolbar-holder {
   background-color: #6000CF;
+  color: #FF9F00;
 }
 
 /* ::::: toolbargrippy, startcap (LCARStrek specific) ::::: */
 
 toolbargrippy,
-toolbar > .toolbar-startcap,
-menubar > .menubar-startcap {
+.toolbar-startcap,
+.menubar-startcap {
   -moz-border-radius: 8px 0px 0px 8px;
   -moz-box-orient: vertical;
   -moz-box-align: center;
@@ -78,7 +82,7 @@ menubar > .menubar-startcap {
   border: none;
   border-right: 3px solid black;
   width: 15px;
-  min-height: 16px;
+  /*min-height: 16px;*/
 }
 
 toolbargrippy:hover {
@@ -87,16 +91,8 @@ toolbargrippy:hover {
 
 /* ::::: endcap (LCARStrek specific) ::::: */
 
-toolbar > .toolbar-endcap {
-  -moz-border-radius: 0px 8px 8px 0px;
-  background-color: #FF9F00;
-  border: none;
-  border-left: 3px solid black;
-  width: 15px;
-  min-height: 16px;
-}
-
-menubar > .menubar-endcap {
+.toolbar-endcap,
+.menubar-endcap {
   -moz-border-radius: 0px 8px 8px 0px;
   background-color: #FF9F00;
   border: none;

diff --git a/LCARStrek/global/tree.css b/LCARStrek/global/tree.css
index 82fda3c561219e8af18785a1a53aa3203f7d3b4a..9c1715c7aaf72ffc6ecd2b19ed59ce8dd339f1c8 100644 (file)
--- a/LCARStrek/global/tree.css
+++ b/LCARStrek/global/tree.css
@@ -258,7 +258,16 @@ treecol {
   padding: 1px 4px;
 }
 
+treecol:first-child {
+  -moz-border-radius-topleft: 3px;
+}
+
+treecol:last-child {
+  -moz-border-radius-topright: 3px;
+}
+
 treecolpicker {
+  -moz-border-radius-topright: 3px;
   -moz-box-align: center;
   -moz-box-pack: center;
   border: 1px solid transparent;