updates to both themes for 1.9.1 toolkit winstripe changes, suite classic changes...

[themes.git] / LCARStrek / global / toolbar.css

diff --git a/LCARStrek/global/toolbar.css b/LCARStrek/global/toolbar.css
index ea9bbcdd348703253726ddf5a91a9140e32f5295..a07e50337fbaaaa43b0aaadecc63597c1fcf73bd 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,28 @@ 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;
+  -moz-padding-end: 2px;
 }
 
-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;
@@ -87,16 +92,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;
@@ -109,10 +106,13 @@ menubar > .menubar-endcap {
 
 toolbargrippy[tbgrippy-collapsed="true"] {
   -moz-box-orient: horizontal;
-  -moz-border-radius: 5px 0px 0px 5px;
+  -moz-border-radius: 4px 0px 0px 4px;
   margin-bottom: 3px;
   width: 30px;
-  height: 10px;
+  /* height gets set to the width of the uncollapsed grippy by default
+     so use !important to force all to the same smaller height */
+  height: 10px !important;
+  min-height: 10px;
 }
 
 .collapsed-tray-spacer {
@@ -129,7 +129,8 @@ toolbaritem > menubar {
 /* ::::: toolbar decorations ::::: */
 
 toolbarseparator {
-  margin: 2px 0px 2px 2px;
+  margin: 2px;
+  -moz-margin-end: 0;
   border-right: 1px solid #000000;
   width: 1px;
 }
@@ -165,8 +166,8 @@ toolbarpaletteitem {
 }
 
 toolbarpaletteitem[place="toolbar"] {
-  margin-left: -2px;
-  margin-right: -2px;
+  -moz-margin-start: -2px;
+  -moz-margin-end: -2px;
   border-left: 2px solid transparent;
   border-right: 2px solid transparent;
 }