Bug 870849 - Gap between the tab-strip and top of titlebar is too large when in restored mode, r=dao
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Thu, 23 May 2013 16:33:47 +0200
changeset 133964 ccd9c2be155c97ea8af0aad96f31bc9e279df7f3
parent 133963 e878799f7d5ac47d797c263a74e6eb8616a1cb37
child 134043 347bfa6318838c2405dff70a3ad00a957c962d80
push id108
push usergijskruitbosch@gmail.com
push dateMon, 03 Jun 2013 20:42:03 +0000
treeherderux@ccd9c2be155c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs870849
milestone24.0a1
Bug 870849 - Gap between the tab-strip and top of titlebar is too large when in restored mode, r=dao
browser/themes/windows/browser.css
toolkit/content/xul.css
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -21,25 +21,25 @@
 #menubar-items {
   -moz-box-orient: vertical; /* for flex hack */
 }
 
 #main-menubar {
   -moz-box-flex: 1; /* make menu items expand to fill toolbar height */
 }
 
-#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"]:not([customizing="true"]) {
-  visibility: hidden;
-}
-
-#main-window[sizemode="normal"] #toolbar-menubar,
 /* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the
-   toolbar-menu is displayed in either restored or maximized mode. */
-#main-window:not([sizemode="fullscreen"]) #toolbar-menubar:-moz-any(:not([autohide="true"]), :not([inactive="true"])) {
-  margin-bottom: 4px;
+   toolbar-menu is displayed, and a 16px gap when it is not. 1px is taken care
+   of by the (light) outer shadow of the tab, the remaining 3/15 are these margins. */
+#toolbar-menubar:not([inactive]) {
+  margin-bottom: 3px;
+}
+
+#main-window[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] {
+  margin-bottom: 15px;
 }
 
 #toolbar-menubar:not([autohide="true"]) {
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
 }
 
 #navigator-toolbox {
   -moz-appearance: none;
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -267,25 +267,30 @@ toolbar[customizing="true"][collapsed="t
 toolbar[customizing="true"][hidden="true"] {
   /* Some apps, e.g. SeaMonkey, use 'hidden' to hide toolbars.
      Override it while customizing. */
   display: -moz-box;
 }
 
 %ifdef XP_MACOSX
 toolbar[type="menubar"] {
-  visibility: collapse;
+  min-height: 0 !important;
+  border: 0 !important;
 }
 %else
 toolbar[type="menubar"][autohide="true"] {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-menubar-autohide");
+  overflow: hidden;
 }
 
 toolbar[type="menubar"][autohide="true"][inactive="true"]:not([customizing="true"]) {
-  visibility: collapse;
+  min-height: 0 !important;
+  height: 0 !important;
+  -moz-appearance: none !important;
+  border-style: none !important;
 }
 %endif
 
 toolbarseparator {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
 }
 
 toolbarspacer {