Bug 994758 - Rename tabHeight define to tabMinHeight, which is more accurate. r=dao, a=sledru.
authorMike Conley <mconley@mozilla.com>
Thu, 10 Apr 2014 13:34:49 -0400
changeset 183723 9eca66ee5b10f3f3fcfb360013b9bbb30901135f
parent 183722 163d2250a03e9b801e225b554dea96b7dc4ac50f
child 183724 f1c211a4714dc22540c70f2e51d85999b1890096
push id3458
push usermconley@mozilla.com
push dateSat, 12 Apr 2014 18:03:04 +0000
treeherdermozilla-beta@f1c211a4714d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao, sledru
bugs994758
milestone29.0
Bug 994758 - Rename tabHeight define to tabMinHeight, which is more accurate. r=dao, a=sledru.
browser/themes/osx/browser.css
browser/themes/shared/browser.inc
browser/themes/shared/tabs.inc.css
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -79,17 +79,17 @@
   display: none;
 }
 
 /**
  * For tabs in titlebar on OS X, we stretch the titlebar down so that the
  * tabstrip can overlap it.
  */
 #main-window[tabsintitlebar] > #titlebar {
-  min-height: calc(@tabHeight@ + @spaceAboveTabbar@ - @tabToolbarNavbarOverlap@);
+  min-height: calc(@tabMinHeight@ + @spaceAboveTabbar@ - @tabToolbarNavbarOverlap@);
 }
 
 /**
  * We also vertically center the window buttons.
  */
 #main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-buttonbox-container,
 #main-window[tabsintitlebar] > #titlebar > #titlebar-content > #titlebar-fullscreen-button {
   margin-top: @windowButtonMarginTop@;
@@ -2780,18 +2780,18 @@ toolbarbutton.chevron > .toolbarbutton-m
  *
  * Because of Bug 941309, we make sure this pseudoelement always exists,
  * but we only make it visible when we need it.
  */
 #navigator-toolbox::before {
   content: '';
   display: block;
   -moz-appearance: toolbar;
-  height: @tabHeight@;
-  margin-bottom: -@tabHeight@;
+  height: @tabMinHeight@;
+  margin-bottom: -@tabMinHeight@;
   visibility: hidden;
 }
 
 #main-window:not(:-moz-any([privatebrowsingmode=temporary],[customizing])) #navigator-toolbox[inFullscreen]:not(:-moz-lwtheme)::before,
 #main-window:not(:-moz-any([privatebrowsingmode=temporary],[customizing],[tabsintitlebar])) #navigator-toolbox:not(:-moz-lwtheme)::before {
   visibility: visible;
 }
 
@@ -3896,17 +3896,17 @@ toolbarbutton.chevron > .toolbarbutton-m
 
 /* Lion Fullscreen window styling */
 @media (-moz-mac-lion-theme) {
   #navigator-toolbox[inFullscreen]::before {
     /* Adjust by the full element height of #titlebar, since that element is
      * not displayed in native full-screen.
      * Also add the height of the tabs, since we're calculating the
      * total height of this pseudo-element, not just the top-padding. */
-    height: calc(@tabHeight@ + @spaceAboveTabbar@) !important;
+    height: calc(@tabMinHeight@ + @spaceAboveTabbar@) !important;
   }
   #main-window[inFullscreen][privatebrowsingmode=temporary] {
     /* Adjust by the full element height of #titlebar, since that element is
      * not displayed in native full-screen. */
     padding-top: @spaceAboveTabbar@;
   }
 }
 
--- a/browser/themes/shared/browser.inc
+++ b/browser/themes/shared/browser.inc
@@ -7,9 +7,9 @@
 %ifdef XP_MACOSX
 % Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button to exit fullscreen
 % and want it to behave like other toolbar buttons.
 %define primaryToolbarButtons @primaryToolbarButtons@, #restore-button
 %endif
 
 %define inAnyPanel :-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])
 %define tabToolbarNavbarOverlap 1px
-%define tabHeight 31px
\ No newline at end of file
+%define tabMinHeight 31px
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -15,17 +15,17 @@
   display: block;
   background-image:
     url(chrome://browser/skin/tabbrowser/tab-background-end.png),
     url(chrome://browser/skin/tabbrowser/tab-background-middle.png),
     url(chrome://browser/skin/tabbrowser/tab-background-start.png);
 }
 
 #tabbrowser-tabs {
-  min-height: @tabHeight@;
+  min-height: @tabMinHeight@;
 }
 
 .tabbrowser-tab,
 .tabs-newtab-button {
   -moz-appearance: none;
   background-color: transparent;
   border-radius: 0;
   border-width: 0;
@@ -113,17 +113,17 @@
 }
 
 .tab-background-start[selected=true]::after,
 .tab-background-start[selected=true]::before,
 .tab-background-start,
 .tab-background-end,
 .tab-background-end[selected=true]::after,
 .tab-background-end[selected=true]::before {
-  min-height: @tabHeight@;
+  min-height: @tabMinHeight@;
   width: @tabCurveWidth@;
 }
 
 .tabbrowser-tab:not([selected=true]),
 .tabbrowser-tab:-moz-lwtheme {
   color: inherit;
 }