start 2.5 development cycles

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

diff --git a/LCARStrek/global/toolbar.css b/LCARStrek/global/toolbar.css
index 21ccb067a43c22aba16a8d16ab63368198608a8c..04475a2cfd1dba1f7a19203dfe947bf1a68c88e5 100644 (file)
--- a/LCARStrek/global/toolbar.css
+++ b/LCARStrek/global/toolbar.css
@@ -66,7 +66,7 @@ menubar {
 }
 
 menubar > .toolbar-box > .toolbar-holder,
-toolbar#toolbar-menubar > .toolbar-box > .toolbar-holder {
+toolbar[type="menubar"] > .toolbar-box > .toolbar-holder {
   background-color: #6000CF;
   color: #FF9F00;
 }
@@ -76,7 +76,7 @@ toolbar#toolbar-menubar > .toolbar-box > .toolbar-holder {
 toolbargrippy,
 .toolbar-startcap,
 .menubar-startcap {
-  -moz-border-radius: 8px 0px 0px 8px;
+  border-radius: 8px 0px 0px 8px;
   -moz-box-orient: vertical;
   -moz-box-align: center;
   background-color: #FF9F00;
@@ -94,7 +94,7 @@ toolbargrippy:hover {
 
 .toolbar-endcap,
 .menubar-endcap {
-  -moz-border-radius: 0px 8px 8px 0px;
+  border-radius: 0px 8px 8px 0px;
   background-color: #FF9F00;
   border: none;
   border-left: 3px solid black;
@@ -106,7 +106,7 @@ toolbargrippy:hover {
 
 toolbargrippy[tbgrippy-collapsed="true"] {
   -moz-box-orient: horizontal;
-  -moz-border-radius: 4px 0px 0px 4px;
+  border-radius: 4px 0px 0px 4px;
   margin-bottom: 3px;
   width: 30px;
   /* height gets set to the width of the uncollapsed grippy by default
@@ -119,15 +119,16 @@ toolbargrippy[tbgrippy-collapsed="true"] {
   border-bottom: none;
 }
 
-
-/* in browser.xul, the menubar is inside a toolbar... */
-toolbaritem > menubar {
+/* in some cases, the menubar is inside a toolbar... */
+toolbaritem > menubar,
+toolbar > menubar {
   border-bottom-style: none;
   background-color: transparent;
 }
 
 /* ::::: lightweight theme ::::: */
 
+menubar:-moz-lwtheme,
 toolbox:-moz-lwtheme,
 toolbar:-moz-lwtheme {
   -moz-appearance: none;
@@ -169,7 +170,7 @@ toolbarpaletteitem {
 
 .toolbarpaletteitem-box[type="spacer"],
 .toolbarpaletteitem-box[type="spring"] {
-  -moz-border-radius: 5px;
+  border-radius: 5px;
   border: 1px solid #9C9CFF;
   background-color: #000000 !important;
 }