Bug 583078 - Reduce padding and re-introduce separator lines between extension toolbars in the main browser window. r=dao, a=betaN
authorMarkus Stange <mstange@themasta.com>
Thu, 23 Dec 2010 18:41:51 +0100
changeset 59639 dcf9db112efd3c278bff3f63d8d6f180901dcc82
parent 59638 b97e1cef0e7d477b939cb389f8b0b3d9b4c73ae1
child 59640 95782553234c25a81fc40e5bd5ea2cbec746b19d
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersdao, betaN
bugs583078
milestone2.0b9pre
Bug 583078 - Reduce padding and re-introduce separator lines between extension toolbars in the main browser window. r=dao, a=betaN
browser/themes/pinstripe/browser/browser.css
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -74,39 +74,57 @@
 }
 
 #main-window[chromehidden~="toolbar"][chromehidden~="location"][chromehidden~="directories"] {
   border-top: 1px solid rgba(0,0,0,0.65);
 }
 
 #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
   -moz-box-align: center;
-  padding: 2px 4px 4px;
+  padding: 2px 4px;
 }
 
-#PersonalToolbar:not(:-moz-lwtheme),
-#navigator-toolbox[tabsontop="true"] > toolbar:not(#TabsToolbar):not(:-moz-lwtheme) {
+#nav-bar {
+  padding-bottom: 4px !important;
+}
+
+#PersonalToolbar {
   -moz-appearance: none;
   margin-top: -1px; /* overlay the bottom border of the toolbar above us */
+  padding-top: 0 !important;
   background-color: -moz-mac-chrome-active;
   border-bottom: 1px solid rgba(0, 0, 0, 0.57);
 }
 
-#PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive,
-#navigator-toolbox[tabsontop="true"] > toolbar:not(#TabsToolbar):not(:-moz-lwtheme):-moz-window-inactive {
-  background-color: -moz-mac-chrome-inactive;
-  border-bottom-color: rgba(0, 0, 0, 0.32);
-}
-
 #navigator-toolbox[tabsontop="true"] > #nav-bar,
 #navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar,
 #navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar {
-  margin-top: 0 !important; /* don't overlay the bottom border of the tabs toolbar */
+  -moz-appearance: none;
+  margin-top: 0; /* don't overlay the bottom border of the tabs toolbar */
   padding-top: 4px !important;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.57);
+  background-color: -moz-mac-chrome-active;
   background-image: -moz-linear-gradient(rgba(255,255,255,.43), rgba(255,255,255,0)) !important; /* override lwtheme style */
+  background-origin: border-box !important;
+}
+
+#PersonalToolbar:-moz-lwtheme,
+#navigator-toolbox[tabsontop="true"] > #nav-bar:-moz-lwtheme,
+#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar:-moz-lwtheme,
+#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar:-moz-lwtheme {
+  background-color: transparent;
+  border-bottom-color: transparent;
+}
+
+#PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive,
+#navigator-toolbox[tabsontop="true"] > #nav-bar:not(:-moz-lwtheme):-moz-window-inactive,
+#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar:not(:-moz-lwtheme):-moz-window-inactive,
+#navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive {
+  background-color: -moz-mac-chrome-inactive;
+  border-bottom-color: rgba(0, 0, 0, 0.32);
 }
 
 /* ----- BOOKMARK TOOLBAR ----- */
 
 #personal-bookmarks {
   min-height: 17px; /* 16px button height + 1px margin-bottom */
 }