Backed out changeset a4fc441d0663 (bug 1406478) for failing browser-chrome's browser/base/content/test/general/browser_tabReorder.js. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 09 Oct 2017 19:10:18 +0200
changeset 427805 ea295817d104eda10909e6155369019cb7e0887a
parent 427804 bf80be6c221064ab3ea802e09768be223019443a
child 427806 ffcb85a1cbe9e614fa4bc24b89183b22bbc735ad
push id97
push userfmarier@mozilla.com
push dateSat, 14 Oct 2017 01:12:59 +0000
reviewersbackout
bugs1406478
milestone58.0a1
backs outa4fc441d0663d647e0f734420bc1c1eff7951434
Backed out changeset a4fc441d0663 (bug 1406478) for failing browser-chrome's browser/base/content/test/general/browser_tabReorder.js. r=backout
browser/app/profile/firefox.js
browser/base/content/browser.css
browser/themes/shared/tabs.inc.css
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -454,17 +454,16 @@ pref("browser.tabs.warnOnCloseOtherTabs"
 pref("browser.tabs.warnOnOpen", true);
 pref("browser.tabs.maxOpenBeforeWarn", 15);
 pref("browser.tabs.loadInBackground", true);
 pref("browser.tabs.opentabfor.middleclick", true);
 pref("browser.tabs.loadDivertedInBackground", false);
 pref("browser.tabs.loadBookmarksInBackground", false);
 pref("browser.tabs.loadBookmarksInTabs", false);
 pref("browser.tabs.tabClipWidth", 140);
-pref("browser.tabs.tabMinWidth", 76);
 #ifdef UNIX_BUT_NOT_MAC
 pref("browser.tabs.drawInTitlebar", false);
 #else
 pref("browser.tabs.drawInTitlebar", true);
 #endif
 
 // Offer additional drag space to the user. The drag space
 // will only be shown if browser.tabs.drawInTitlebar is true.
@@ -483,16 +482,19 @@ pref("browser.tabs.restorebutton", 0);
 // true   return to the tab that opened this tab (its owner)
 // false  return to the adjacent tab (old default)
 pref("browser.tabs.selectOwnerOnClose", true);
 
 pref("browser.tabs.showAudioPlayingIcon", true);
 // This should match Chromium's audio indicator delay.
 pref("browser.tabs.delayHidingAudioPlayingIconMS", 3000);
 
+// The minimum tab width in pixels
+pref("browser.tabs.tabMinWidth", 50);
+
 pref("browser.ctrlTab.previews", false);
 
 // By default, do not export HTML at shutdown.
 // If true, at shutdown the bookmarks in your menu and toolbar will
 // be exported as HTML to the bookmarks.html file.
 pref("browser.bookmarks.autoExportHTML",          false);
 
 // The maximum number of daily bookmark backups to
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -5,16 +5,17 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 :root {
   --panelui-subview-transition-duration: 150ms;
   --lwt-additional-images: none;
   --lwt-background-alignment: right top;
   --lwt-background-tiling: no-repeat;
+  --tab-min-width: 50px;
 }
 
 :root:-moz-lwtheme {
   color: var(--lwt-text-color) !important;
 }
 
 :root:-moz-lwtheme {
   background-color: var(--lwt-accent-color) !important;
@@ -124,16 +125,31 @@ tabbrowser {
 #tabbrowser-tabs:not([overflow="true"])[using-closing-tabs-spacer] ~ #alltabs-button {
   visibility: hidden; /* temporary space to keep a tab's close button under the cursor */
 }
 
 .tabbrowser-tab {
   -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser-tab");
 }
 
+.tabbrowser-tab:not([pinned]) {
+  -moz-box-flex: 100;
+  max-width: 225px;
+  min-width: var(--tab-min-width);
+  width: 0;
+  transition: min-width 100ms ease-out,
+              max-width 100ms ease-out;
+}
+
+.tabbrowser-tab:not([pinned]):not([fadein]) {
+  max-width: 0.1px;
+  min-width: 0.1px;
+  visibility: hidden;
+}
+
 .tab-close-button,
 .tab-background {
   /* Explicitly set the visibility to override the value (collapsed)
    * we inherit from #TabsToolbar[collapsed] upon opening a browser window. */
   visibility: visible;
 }
 
 .tab-close-button[fadein],
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -5,17 +5,16 @@
 %endif
 %filter substitution
 %define horizontalTabPadding 9px
 
 :root {
   --tabs-top-border-width: 0px;
   --tab-toolbar-navbar-overlap: 1px;
   --tab-min-height: 33px;
-  --tab-min-width: 76px;
   --tab-loading-fill: #0A84FF;
 }
 
 :root[uidensity=compact] {
   --tab-min-height: 29px;
 }
 
 :root[uidensity=touch] {
@@ -48,37 +47,20 @@ tabbrowser {
 
 .tabbrowser-tab {
   -moz-appearance: none;
   background-color: transparent;
   border-radius: 0;
   border-width: 0;
   margin: 0;
   padding: 0;
-  -moz-box-align: stretch;
 }
 
-.tabbrowser-tab:not([pinned]) {
-  -moz-box-flex: 100;
-  max-width: 225px;
-  min-width: var(--tab-min-width);
-  width: 0;
-  transition: min-width 100ms ease-out,
-              max-width 100ms ease-out;
-}
-
-:root[uidensity=touch] .tabbrowser-tab:not([pinned]) {
-  /* Touch mode needs additional space for the close button. */
-  min-width: calc(var(--tab-min-width) + 10px);
-}
-
-.tabbrowser-tab:not([pinned]):not([fadein]) {
-  max-width: 0.1px;
-  min-width: 0.1px;
-  visibility: hidden;
+.tabbrowser-tab {
+  -moz-box-align: stretch;
 }
 
 /* The selected tab should appear above the border between the tabs toolbar and
    the navigation toolbar. */
 .tabbrowser-tab[visuallyselected=true] {
   position: relative;
   z-index: 2;
 }