Bug 1385554 - Share the scrollbox- and alltabs-arrow. r=aceman,jorgk
authorRichard Marti <richard.marti@gmail.com>
Fri, 28 Jul 2017 18:57:00 +0200
changeset 28515 53323cee68047e1772683932e18718042c1d8f2e
parent 28514 01edc8b38d622e6e35c1b1fc715ca26b97a919ca
child 28516 b3f58fc9335a2c70167b08ab0e91463db529f745
push id1986
push userclokep@gmail.com
push dateWed, 02 Aug 2017 14:43:31 +0000
treeherdercomm-beta@b51c9adf2c9e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaceman, jorgk
bugs1385554
Bug 1385554 - Share the scrollbox- and alltabs-arrow. r=aceman,jorgk
mail/base/content/messenger.xul
mail/themes/linux/jar.mn
mail/themes/linux/mail/icons/dropmarker-hover.svg
mail/themes/linux/mail/tabmail.css
mail/themes/linux/mail/tabs/arrow-left-inverted.png
mail/themes/linux/mail/tabs/arrow-left.png
mail/themes/osx/jar.mn
mail/themes/osx/mail/messenger.css
mail/themes/osx/mail/tabmail.css
mail/themes/osx/mail/tabs/alltabs-box-bkgnd-icon.png
mail/themes/osx/mail/tabs/alltabs-box-bkgnd-icon@2x.png
mail/themes/osx/mail/tabs/arrow.png
mail/themes/osx/mail/tabs/arrow@2x.png
mail/themes/osx/mail/tabs/newtab.png
mail/themes/shared/mail/icons/arrow-dropdown.svg
mail/themes/shared/mail/icons/arrow-left.svg
mail/themes/shared/mail/tabmail.css
mail/themes/windows/jar.mn
mail/themes/windows/mail/tabmail.css
mail/themes/windows/mail/tabs/arrow-left-inverted.svg
mail/themes/windows/mail/tabs/arrow-left.svg
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -263,17 +263,17 @@
 
       <toolbar id="tabbar-toolbar" toolboxid="mail-toolbox"
                context="toolbar-context-menu"
                customizable="true"
                mode="icons" defaultmode="icons" lockmode="true"
                iconsize="small" defaulticonsize="small" lockiconsize="true"
                defaultset=""/>
 
-      <toolbarbutton class="tabs-alltabs-button"
+      <toolbarbutton class="toolbarbutton-1 tabs-alltabs-button"
                      id="alltabs-button"
                      type="menu"
                      hidden="true"
                      tooltiptext="&listAllTabs.label;">
         <menupopup class="tabs-alltabs-popup"
                    id="alltabs-popup" position="after_end"
                    tabcontainer="tabcontainer"/>
       </toolbarbutton>
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -144,16 +144,18 @@ classic.jar:
   skin/classic/messenger/icons/empty-search-results.png       (mail/icons/empty-search-results.png)
   skin/classic/messenger/icons/secure.png                     (mail/icons/secure.png)
   skin/classic/messenger/icons/update.png                     (mail/icons/update.png)
   skin/classic/messenger/icons/insecure.png                   (mail/icons/insecure.png)
   skin/classic/messenger/icons/identity.png                   (mail/icons/identity.png)
   skin/classic/messenger/icons/tick.png                       (mail/icons/tick.png)
   skin/classic/messenger/icons/error.png                      (mail/icons/error.png)
   skin/classic/messenger/icons/cancel.png                     (mail/icons/cancel.png)
+  skin/classic/messenger/icons/arrow-dropdown.svg             (../shared/mail/icons/arrow-dropdown.svg)
+  skin/classic/messenger/icons/arrow-left.svg                 (../shared/mail/icons/arrow-left.svg)
   skin/classic/messenger/icons/blacklist.svg                  (../shared/mail/icons/blacklist.svg)
   skin/classic/messenger/icons/cert-error.svg                 (../shared/mail/icons/cert-error.svg)
   skin/classic/messenger/icons/correspondents.svg             (../shared/mail/icons/correspondents.svg)
   skin/classic/messenger/icons/extensionGeneric.svg           (../shared/mail/icons/extensionGeneric.svg)
   skin/classic/messenger/icons/mail-toolbar.svg               (../shared/mail/icons/mail-toolbar.svg)
   skin/classic/messenger/icons/search-close.svg               (../shared/mail/icons/search-close.svg)
   skin/classic/messenger/icons/search-glass.svg               (../shared/mail/icons/search-glass.svg)
   skin/classic/messenger/icons/folder-pane.png                (mail/icons/folder-pane.png)
@@ -182,25 +184,22 @@ classic.jar:
   skin/classic/messenger/icons/junk.png                       (mail/icons/junk.png)
   skin/classic/messenger/icons/check.gif                      (mail/icons/check.gif)
   skin/classic/messenger/icons/notchecked.gif                 (mail/icons/notchecked.gif)
   skin/classic/messenger/icons/online.png                     (mail/icons/online.png)
   skin/classic/messenger/icons/offline.png                    (mail/icons/offline.png)
   skin/classic/messenger/icons/row.png                        (mail/icons/row.png)
   skin/classic/messenger/icons/black_pin.png                  (mail/icons/black_pin.png)
   skin/classic/messenger/icons/dropmarker.svg                 (mail/icons/dropmarker.svg)
-  skin/classic/messenger/icons/dropmarker-hover.svg           (mail/icons/dropmarker-hover.svg)
   skin/classic/messenger/icons/filterbar.png                  (mail/icons/filterbar.png)
   skin/classic/messenger/icons/red_pin.png                    (mail/icons/red_pin.png)
   skin/classic/messenger/icons/toolbarbutton-arrow.png        (../shared/mail/icons/toolbarbutton-arrow.png)
   skin/classic/messenger/icons/toolbarbutton-arrow-inverted.png (../shared/mail/icons/toolbarbutton-arrow-inverted.png)
   skin/classic/messenger/tabs/active-middle.png               (mail/tabs/active-middle.png)
   skin/classic/messenger/tabs/active-middle@2x.png            (mail/tabs/active-middle@2x.png)
-  skin/classic/messenger/tabs/arrow-left.png                  (mail/tabs/arrow-left.png)
-  skin/classic/messenger/tabs/arrow-left-inverted.png         (mail/tabs/arrow-left-inverted.png)
   skin/classic/messenger/tabs/background-end.png              (mail/tabs/background-end.png)
   skin/classic/messenger/tabs/background-end@2x.png           (mail/tabs/background-end@2x.png)
   skin/classic/messenger/tabs/background-middle.png           (mail/tabs/background-middle.png)
   skin/classic/messenger/tabs/background-middle@2x.png        (mail/tabs/background-middle@2x.png)
   skin/classic/messenger/tabs/background-start.png            (mail/tabs/background-start.png)
   skin/classic/messenger/tabs/background-start@2x.png         (mail/tabs/background-start@2x.png)
   skin/classic/messenger/tabs/selected-end.svg                (mail/tabs/selected-end.svg)
   skin/classic/messenger/tabs/selected-start.svg              (mail/tabs/selected-start.svg)
deleted file mode 100644
--- a/mail/themes/linux/mail/icons/dropmarker-hover.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<svg xmlns="http://www.w3.org/2000/svg"
-  width="8"
-  height="8">
-  <polygon fill="ButtonText" points="8,2 4,8 0,2"/>
-</svg>
--- a/mail/themes/linux/mail/tabmail.css
+++ b/mail/themes/linux/mail/tabmail.css
@@ -83,74 +83,51 @@ tabpanels {
 .tab-close-button:not([selected]):not(:hover):-moz-lwtheme-darktext {
   background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 96, 16, 80);
 }
 
 /**
  * Tab Scrollbox Arrow Buttons
  */
 
+.tabmail-arrowscrollbox > .scrollbutton-up,
+.tabmail-arrowscrollbox > stack > .scrollbutton-down,
 .tabmail-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon,
 .tabmail-arrowscrollbox > stack > .scrollbutton-down > .toolbarbutton-icon {
   -moz-appearance: none;
 }
 
-.tabmail-arrowscrollbox > .scrollbutton-up,
-.tabmail-arrowscrollbox > stack > .scrollbutton-down {
-  -moz-appearance: none;
-  list-style-image: url(tabs/arrow-left.png);
-}
-
-#tabs-toolbar[brighttext] .tabmail-arrowscrollbox > .scrollbutton-up,
-#tabs-toolbar[brighttext] .tabmail-arrowscrollbox > stack > .scrollbutton-down {
-  list-style-image: url(tabs/arrow-left-inverted.png);
+.tabmail-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
+.tabmail-arrowscrollbox > stack > .scrollbutton-down:not([disabled]):hover {
+  background: var(--toolbarbutton-active-background);
 }
 
 .tabmail-arrowscrollbox > .scrollbutton-up[disabled],
 .tabmail-arrowscrollbox > stack > .scrollbutton-down[disabled] {
   opacity: .4;
 }
 
-.tabmail-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon:-moz-locale-dir(rtl),
-.tabmail-arrowscrollbox > stack > .scrollbutton-down > .toolbarbutton-icon:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
-}
-
-.tabmail-arrowscrollbox > .scrollbutton-down {
-  transition: 1s background-color ease-out;
-}
-
 .tabs-alltabs-box-animate {
   background-color: Highlight;
   opacity: 0;
 }
 
 /**
  * All Tabs Menupopup
  */
 
 .alltabs-item {
   list-style-image: url("moz-icon://stock/gtk-file?size=menu");
 }
 
 .tabs-alltabs-button {
-  margin-bottom: 1px;
-}
-
-.tabs-alltabs-button > .toolbarbutton-menu-dropmarker {
-  -moz-appearance: none !important;
-  margin-bottom: -1px;
-  padding-inline-start: 0 !important;
-  list-style-image: url("chrome://messenger/skin/icons/dropmarker.svg");
-}
-
-.tabs-alltabs-button:hover > .toolbarbutton-menu-dropmarker {
-  list-style-image: url("chrome://messenger/skin/icons/dropmarker-hover.svg");
+  min-width: 24px;
+  padding-right: 1px;
+  padding-left: 1px;
 }
 
 .tabs-alltabs-button > .toolbarbutton-icon {
-  display: none;
   margin-inline-end: 0;
 }
 
 .alltabs-item > .menu-iconic-left {
   visibility: visible !important;
 }
deleted file mode 100644
index 0f4c8278a526fda00abd1a1daa1608ad59fd429b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index df8c301cef9369b3828aa72bf011ad9aefaa5e4f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -145,16 +145,18 @@ classic.jar:
   skin/classic/messenger/smime/icons/sbCryptoOk.png              (mail/smime/sbCryptoOk.png)
   skin/classic/messenger/smime/icons/sbCryptoNotOk.png           (mail/smime/sbCryptoNotOk.png)
   skin/classic/messenger/smime/icons/hdrSignOk.png               (mail/smime/hdrSignOk.png)
   skin/classic/messenger/smime/icons/hdrSignUnknown.png          (mail/smime/hdrSignUnknown.png)
   skin/classic/messenger/smime/icons/hdrSignNotOk.png            (mail/smime/hdrSignNotOk.png)
   skin/classic/messenger/smime/icons/hdrCryptoOk.png             (mail/smime/hdrCryptoOk.png)
   skin/classic/messenger/smime/icons/hdrCryptoNotOk.png          (mail/smime/hdrCryptoNotOk.png)
   skin/classic/messenger/icons/twisty-open.gif                   (mail/icons/twisty-open.gif)
+  skin/classic/messenger/icons/arrow-dropdown.svg                (../shared/mail/icons/arrow-dropdown.svg)
+  skin/classic/messenger/icons/arrow-left.svg                    (../shared/mail/icons/arrow-left.svg)
   skin/classic/messenger/icons/appmenu-icons.png                 (mail/icons/appmenu-icons.png)
   skin/classic/messenger/icons/appmenu-icons-active.png          (mail/icons/appmenu-icons-active.png)
   skin/classic/messenger/icons/appmenu-icons@2x.png              (mail/icons/appmenu-icons@2x.png)
   skin/classic/messenger/icons/appmenu-icons-active@2x.png       (mail/icons/appmenu-icons-active@2x.png)
   skin/classic/messenger/icons/attachment-deleted.png            (mail/icons/attachment-deleted.png)
   skin/classic/messenger/icons/attachment-deleted-large.png      (mail/icons/attachment-deleted-large.png)
   skin/classic/messenger/icons/attachment-col.png                (mail/icons/attachment-col.png)
   skin/classic/messenger/icons/attachment-selected.png           (mail/icons/attachment-selected.png)
@@ -238,22 +240,17 @@ classic.jar:
   skin/classic/messenger/icons/status-small.png                  (mail/icons/status-small.png)
   skin/classic/messenger/icons/status-small@2x.png               (mail/icons/status-small@2x.png)
   skin/classic/messenger/icons/connecting.png                    (mail/icons/connecting.png)
   skin/classic/messenger/icons/notloading.png                    (mail/icons/notloading.png)
   skin/classic/messenger/icons/notloading@2x.png                 (mail/icons/notloading@2x.png)
   skin/classic/messenger/icons/junk.png                          (mail/icons/junk.png)
   skin/classic/messenger/icons/phishing.png                      (mail/icons/phishing.png)
   skin/classic/messenger/icons/remote-blocked.png                (mail/icons/remote-blocked.png)
-  skin/classic/messenger/tabs/alltabs-box-bkgnd-icon.png         (mail/tabs/alltabs-box-bkgnd-icon.png)
-  skin/classic/messenger/tabs/alltabs-box-bkgnd-icon@2x.png      (mail/tabs/alltabs-box-bkgnd-icon@2x.png)
-  skin/classic/messenger/tabs/newtab.png                         (mail/tabs/newtab.png)
   skin/classic/messenger/tabs/dragIndicator.png                  (mail/tabs/dragIndicator.png)
-  skin/classic/messenger/tabs/arrow.png                          (mail/tabs/arrow.png)
-  skin/classic/messenger/tabs/arrow@2x.png                       (mail/tabs/arrow@2x.png)
   skin/classic/messenger/tabs/active-middle.png                  (mail/tabs/active-middle.png)
   skin/classic/messenger/tabs/active-middle@2x.png               (mail/tabs/active-middle@2x.png)
   skin/classic/messenger/tabs/background-end.png                 (mail/tabs/background-end.png)
   skin/classic/messenger/tabs/background-end@2x.png              (mail/tabs/background-end@2x.png)
   skin/classic/messenger/tabs/background-middle.png              (mail/tabs/background-middle.png)
   skin/classic/messenger/tabs/background-middle@2x.png           (mail/tabs/background-middle@2x.png)
   skin/classic/messenger/tabs/background-start.png               (mail/tabs/background-start.png)
   skin/classic/messenger/tabs/background-start@2x.png            (mail/tabs/background-start@2x.png)
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -436,33 +436,16 @@ notification[type="critical"] .messageCl
 }
 
 /* ::::: Tabs in Titlebar :::::: */
 
 #messengerWindow[tabsintitlebar="true"]:not(:-moz-lwtheme) > #titlebar {
   -moz-appearance: -moz-window-titlebar;
 }
 
-/* We modify the .tabs-alltabs-button to make it seem like a titlebar button */
-#messengerWindow[tabsintitlebar="true"]:not([sizemode="fullscreen"]) >
-  #navigation-toolbox > #tabs-toolbar  > .tabs-alltabs-button {
-  margin-bottom: 8px;
-  opacity: .8;
-}
-
-#messengerWindow[tabsintitlebar="true"]:not([sizemode="fullscreen"]) >
-  #navigation-toolbox > #tabs-toolbar  > .tabs-alltabs-button:hover {
-  opacity: 1;
-}
-
-#messengerWindow[tabsintitlebar="true"]:not([sizemode="fullscreen"]):-moz-window-inactive >
-  #navigation-toolbox > #tabs-toolbar  > .tabs-alltabs-button {
-  opacity: .5;
-}
-
 #messengerWindow:not([tabsintitlebar]) #titlebar-buttonbox-container {
   margin-top: 3px;
   margin-inline-start: 7px;
 }
 
 #messengerWindow[tabsintitlebar="true"] #titlebar-buttonbox-container,
 #messengerWindow[tabsintitlebar="true"] #titlebar-fullscreen-button {
   position: relative;
--- a/mail/themes/osx/mail/tabmail.css
+++ b/mail/themes/osx/mail/tabmail.css
@@ -245,144 +245,78 @@ tabmail > tabbox > tabpanels {
   }
 }
 
 /**
  * Tab Scrollbox Arrow Buttons
  */
 
 .tabmail-arrowscrollbox > .scrollbutton-up,
-.tabmail-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down {
+.tabmail-arrowscrollbox > stack > .scrollbutton-down {
   border: 0;
   border-right: 2px solid;
   -moz-border-right-colors: rgba(0,0,0,0.25) rgba(255,255,255,0.15);
-  list-style-image: url(tabs/arrow.png);
-  -moz-image-region: rect(0, 13px, 20px, 0);
   padding: 0 4px;
-  width: 16px;
   margin: 0 0 1px;
 }
 
-.tabmail-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
-.tabmail-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
-}
-
-.tabmail-arrowscrollbox > .scrollbutton-up:hover,
-.tabmail-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down:hover {
-  -moz-image-region: rect(0, 26px, 20px, 13px);
+.tabmail-arrowscrollbox >
+  .scrollbutton-up:not([disabled="true"]):hover,
+.tabmail-arrowscrollbox > stack >
+  .scrollbutton-down:not([disabled="true"]):hover {
   background-image: linear-gradient(transparent, rgba(0,0,0,0.15));
 }
 
-.tabmail-arrowscrollbox > .scrollbutton-up:hover:active,
-.tabmail-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down:hover:active {
-  -moz-image-region: rect(0, 39px, 20px, 26px);
+.tabmail-arrowscrollbox >
+  .scrollbutton-up:not([disabled="true"]):hover:active,
+.tabmail-arrowscrollbox > stack >
+  .scrollbutton-down:not([disabled="true"]):hover:active {
   background-image: linear-gradient(transparent, rgba(0,0,0,0.3));
 }
 
+#tabs-toolbar[brighttext] .tabmail-arrowscrollbox >
+  .scrollbutton-up:not([disabled="true"]):hover,
+#tabs-toolbar[brighttext] .tabmail-arrowscrollbox > stack >
+  .scrollbutton-down:not([disabled="true"]):hover {
+  background-image: linear-gradient(rgba(255,255,255,0.25), rgba(255,255,255,0.25));
+}
+
+#tabs-toolbar[brighttext] .tabmail-arrowscrollbox >
+  .scrollbutton-up:not([disabled="true"]):hover:active,
+#tabs-toolbar[brighttext] .tabmail-arrowscrollbox > stack >
+  .scrollbutton-down:not([disabled="true"]):hover:active {
+  background-image: linear-gradient(rgba(255,255,255,0.35), rgba(255,255,255,0.35));
+}
+
 .tabmail-arrowscrollbox > .scrollbutton-up[disabled="true"],
-.tabmail-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down[disabled="true"] {
-  -moz-image-region: rect(0, 13px, 20px, 0) !important;
+.tabmail-arrowscrollbox > stack > .scrollbutton-down[disabled="true"] {
   opacity: .5;
-  background-image: none !important;
-}
-
-@media (min-resolution: 1.1dppx) {
-  .tabmail-arrowscrollbox > .scrollbutton-up,
-  .tabmail-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down {
-    list-style-image: url(tabs/arrow@2x.png);
-    -moz-image-region: rect(0, 26px, 40px, 0);
-  }
-
-  .tabmail-arrowscrollbox > .scrollbutton-up:hover,
-  .tabmail-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down:hover {
-    -moz-image-region: rect(0, 52px, 40px, 26px);
-  }
-
-  .tabmail-arrowscrollbox > .scrollbutton-up:hover:active,
-  .tabmail-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down:hover:active {
-    -moz-image-region: rect(0, 78px, 40px, 52px);
-  }
-
-  .tabmail-arrowscrollbox > .scrollbutton-up[disabled="true"],
-  .tabmail-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down[disabled="true"] {
-    -moz-image-region: rect(0, 26px, 40px, 0) !important;
-  }
-
-  .tabmail-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon,
-  .tabmail-arrowscrollbox > .scrollbutton-down-stack > .scrollbutton-down > .toolbarbutton-icon {
-    width: 13px;
-    height: 20px;
-  }
+  background-image: none;
 }
 
 /**
- * New Tab & All Tabs Buttons
+ * All Tabs Buttons
  */
 
 .tabs-alltabs-box {
   margin: 0;
 }
 
-.tabs-newtab-button,
-.tabs-alltabs-button {
-  margin: 0;
-  padding: 0 4px;
-}
-
-.tabs-newtab-button {
-  list-style-image: url(chrome://messenger/skin/tabs/newtab.png);
-}
-
-.tabs-alltabs-button {
-  padding-top: 2px;
-  list-style-image: url(chrome://messenger/skin/tabs/alltabs-box-bkgnd-icon.png);
-  -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-.tabs-alltabs-button[open] {
-  -moz-image-region: rect(16px, 16px, 32px, 0);
-}
-
-.tabs-newtab-button > .toolbarbutton-text,
-.tabs-alltabs-button > .toolbarbutton-menu-dropmarker,
-.tabs-alltabs-button > .toolbarbutton-text {
-  display: none;
-}
-
-.tabs-alltabs-button > .toolbarbutton-icon {
-  margin-inline-end: 2px;
-}
-
 .tabs-alltabs-box-animate {
   margin: 1px 0px 0px;
   width: 25px;
   background-color: #669CFF;
   opacity: 0.0;
 }
 
 /**
  * All Tabs Menupopup
  */
 
 .alltabs-item {
   list-style-image: url("chrome://messenger/skin/icons/item.png");
 }
 
 @media (min-resolution: 1.1dppx) {
-  .tabs-alltabs-button {
-    list-style-image: url(chrome://messenger/skin/tabs/alltabs-box-bkgnd-icon@2x.png);
-    -moz-image-region: rect(0, 32px, 32px, 0);
-  }
-
-  .tabs-alltabs-button[open] {
-    -moz-image-region: rect(32px, 32px, 64px, 0);
-  }
-
-  .tabs-alltabs-button > .toolbarbutton-icon {
-    width: 16px;
-    height: 16px;
-  }
-
   alltabs-item[busy] {
     list-style-image: url("chrome://global/skin/icons/loading@2x.png") !important;
   }
 }
deleted file mode 100644
index 0f4e3bae8f7b40e82cd72bb5a8120976dd1ccee0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 46966717ff58b0143dcf8b16eb47aef9695b4fb7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 61ad41ae9a01660261253aed82c21fb0bd5e10c3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 20bf78db21347a968e519564dc6aa39f4cc5fa78..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 52300d11fadbe7b341a26595186d6e3fa52a3ca0..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/arrow-dropdown.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" d="M8 12a1 1 0 0 1-.707-.293l-5-5a1 1 0 0 1 1.414-1.414L8 9.586l4.293-4.293a1 1 0 0 1 1.414 1.414l-5 5A1 1 0 0 1 8 12z"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/arrow-left.svg
@@ -0,0 +1,6 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+  <path fill="context-fill" d="M6.414 8l4.293-4.293a1 1 0 0 0-1.414-1.414l-5 5a1 1 0 0 0 0 1.414l5 5a1 1 0 0 0 1.414-1.414z"/>
+</svg>
--- a/mail/themes/shared/mail/tabmail.css
+++ b/mail/themes/shared/mail/tabmail.css
@@ -310,16 +310,32 @@
 }
 
 .tabmail-tab:not([selected]):not(:hover) +
 .tabmail-tab:not([selected]):not(:hover)::before {
   opacity: var(--tab-separator-opacity);
   transition: opacity 100ms ease;
 }
 
+/**
+ * Tab Scrollbox Arrow Buttons
+ */
+
+.tabmail-arrowscrollbox > .scrollbutton-up,
+.tabmail-arrowscrollbox > stack > .scrollbutton-down {
+  list-style-image: url("chrome://messenger/skin/icons/arrow-left.svg");
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
+.tabmail-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
+.tabmail-arrowscrollbox > stack > .scrollbutton-down:-moz-locale-dir(ltr) {
+  transform: scaleX(-1);
+}
+
 /* Tab Overflow */
 .tabmail-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]),
 .tabmail-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) {
   background-image: url("chrome://messenger/skin/tabs/overflow-indicator.png");
   background-size: 100% 100%;
   width: 19px;
   margin-bottom: 1px;
   pointer-events: none;
@@ -347,27 +363,55 @@
   opacity: 0;
 }
 
 .tabmail-arrowscrollbox > .arrowscrollbox-overflow-start-indicator,
 .tabmail-arrowscrollbox > .arrowscrollbox-overflow-end-indicator {
   transition: opacity 150ms ease;
 }
 
+/**
+ * All Tabs Button
+ */
+
+#alltabs-button {
+  list-style-image: url("chrome://messenger/skin/icons/arrow-dropdown.svg");
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
+#alltabs-button .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
+#alltabs-button > .toolbarbutton-text,
+#alltabs-button > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
 /* All Tabs Menupopup */
 
 .alltabs-item[selected] {
   font-weight: bold;
 }
 
 .alltabs-item[busy] {
   list-style-image: url("chrome://global/skin/icons/loading.png") !important;
   -moz-image-region: auto !important;
 }
 
+.alltabs-item > .menu-iconic-left {
+  fill: MenuText;
+}
+
+.alltabs-item[_moz-menuactive="true"] > .menu-iconic-left {
+  fill: -moz-menuhovertext;
+}
+
 /* Content Tabs */
 .contentTabToolbox {
   height: 0px;
 }
 
 .contentTabInstance[disablechrome] .contentTabToolbox {
   display: none;
 }
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -151,16 +151,18 @@ classic.jar:
   skin/classic/messenger/smime/icons/sbCryptoNotOk.png        (mail/smime/sbCryptoNotOk.png)
   skin/classic/messenger/smime/icons/sbCryptoOk.png           (mail/smime/sbCryptoOk.png)
   skin/classic/messenger/smime/icons/sbSignNotOk.png          (mail/smime/sbSignNotOk.png)
   skin/classic/messenger/smime/icons/sbSignOk.png             (mail/smime/sbSignOk.png)
   skin/classic/messenger/smime/icons/sbSignUnknown.png     (mail/smime/sbSignUnknown.png)
   skin/classic/messenger/icons/zoomout.png                    (mail/icons/zoomout.png)
   skin/classic/messenger/icons/zoomout-hover.png              (mail/icons/zoomout-hover.png)
   skin/classic/messenger/icons/readmail.png                   (mail/icons/readmail.png)
+  skin/classic/messenger/icons/arrow-dropdown.svg             (../shared/mail/icons/arrow-dropdown.svg)
+  skin/classic/messenger/icons/arrow-left.svg                 (../shared/mail/icons/arrow-left.svg)
   skin/classic/messenger/icons/blacklist.svg                  (../shared/mail/icons/blacklist.svg)
   skin/classic/messenger/icons/cert-error.svg                 (../shared/mail/icons/cert-error.svg)
   skin/classic/messenger/icons/correspondents.svg             (../shared/mail/icons/correspondents.svg)
   skin/classic/messenger/icons/extensionGeneric.svg           (../shared/mail/icons/extensionGeneric.svg)
   skin/classic/messenger/icons/mail-toolbar.svg               (../shared/mail/icons/mail-toolbar.svg)
   skin/classic/messenger/icons/search-close.svg               (../shared/mail/icons/search-close.svg)
   skin/classic/messenger/icons/search-glass.svg               (../shared/mail/icons/search-glass.svg)
   skin/classic/messenger/icons/folder.png                     (mail/icons/folder.png)
@@ -200,18 +202,16 @@ classic.jar:
   skin/classic/messenger/icons/row.png                        (mail/icons/row.png)
   skin/classic/messenger/icons/secure.png                     (mail/icons/secure.png)
   skin/classic/messenger/icons/update.png                     (mail/icons/update.png)
   skin/classic/messenger/icons/insecure.png                   (mail/icons/insecure.png)
   skin/classic/messenger/icons/identity.png                   (mail/icons/identity.png)
   skin/classic/messenger/icons/tick.png                       (mail/icons/tick.png)
   skin/classic/messenger/icons/error.png                      (mail/icons/error.png)
   skin/classic/messenger/icons/cancel.png                     (mail/icons/cancel.png)
-  skin/classic/messenger/tabs/arrow-left.svg                  (mail/tabs/arrow-left.svg)
-  skin/classic/messenger/tabs/arrow-left-inverted.svg         (mail/tabs/arrow-left-inverted.svg)
   skin/classic/messenger/icons/mainwindow-dropdown-arrow.png  (mail/icons/mainwindow-dropdown-arrow.png)
   skin/classic/messenger/icons/mainwindow-dropdown-arrow-inverted.png (mail/icons/mainwindow-dropdown-arrow-inverted.png)
   skin/classic/messenger/icons/toolbarbutton-arrow.png         (../shared/mail/icons/toolbarbutton-arrow.png)
   skin/classic/messenger/icons/toolbarbutton-arrow@2x.png      (../shared/mail/icons/toolbarbutton-arrow@2x.png)
   skin/classic/messenger/icons/toolbarbutton-arrow-inverted.png (../shared/mail/icons/toolbarbutton-arrow-inverted.png)
   skin/classic/messenger/icons/toolbarbutton-arrow-inverted@2x.png (../shared/mail/icons/toolbarbutton-arrow-inverted@2x.png)
   skin/classic/messenger/tabs/dragIndicator.png               (mail/tabs/dragIndicator.png)
   skin/classic/messenger/tabs/active-middle.png               (mail/tabs/active-middle.png)
--- a/mail/themes/windows/mail/tabmail.css
+++ b/mail/themes/windows/mail/tabmail.css
@@ -108,107 +108,88 @@ tabpanels {
 }
 
 /**
  * Tab Scrollbox Arrow Buttons
  */
 
 .tabmail-arrowscrollbox > .scrollbutton-up,
 .tabmail-arrowscrollbox > stack > .scrollbutton-down {
-  list-style-image: url(tabs/arrow-left.svg);
+  -moz-appearance: none;
+  border-style: none;
+  padding: 0 3px;
   margin: 0;
   margin-inline-end: 1px;
-  border-radius: 0;
-}
-
-#tabs-toolbar[brighttext] .tabmail-arrowscrollbox > .scrollbutton-up,
-#tabs-toolbar[brighttext] .tabmail-arrowscrollbox > stack > .scrollbutton-down {
-  list-style-image: url(tabs/arrow-left-inverted.svg);
 }
 
 .tabmail-arrowscrollbox > .scrollbutton-up[disabled],
 .tabmail-arrowscrollbox > stack > .scrollbutton-down[disabled] {
   opacity: .4;
 }
 
 .tabmail-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl),
 .tabmail-arrowscrollbox > stack > .scrollbutton-down:-moz-locale-dir(ltr) {
-  transform: scaleX(-1);
   margin-inline-start: 1px;
   margin-inline-end: 0;
 }
 
 /**
  * All Tabs Button
  */
 
-.tabs-alltabs-button,
-.tabmail-tabs toolbarbutton {
-  -moz-appearance: none;
-  border-style: none;
-  padding: 0 3px;
-}
-
-.tabs-alltabs-button:hover,
-.tabs-alltabs-button[open],
-.tabs-alltabs-button:hover:active,
 .tabmail-arrowscrollbox > .scrollbutton-up:not([disabled]):hover,
 .tabmail-arrowscrollbox > stack > .scrollbutton-down:not([disabled]):hover {
   background: var(--toolbarbutton-active-background);
 }
 
 @media (-moz-windows-glass) {
-  .tabs-alltabs-button:not(:-moz-lwtheme):hover,
-  .tabs-alltabs-button:not(:-moz-lwtheme)[open],
-  .tabs-alltabs-button:not(:-moz-lwtheme):hover:active,
+  #alltabs-button:not(:-moz-lwtheme):not([disabled]) {
+    border-color: transparent;
+    margin-top: 0;
+    margin-bottom: -1px;
+  }
+
+  #alltabs-button:not(:-moz-lwtheme):not([disabled]):hover,
   .tabmail-arrowscrollbox >
     .scrollbutton-up:not(:-moz-lwtheme):not([disabled]):hover,
   .tabmail-arrowscrollbox > stack >
     .scrollbutton-down:not(:-moz-lwtheme):not([disabled]):hover {
     background-color: transparent;
     background-image: linear-gradient(rgba(255, 255, 255, 0),
                       rgba(255, 255, 255, .5)),
                       linear-gradient(transparent, rgba(0, 0, 0, .25) 30%),
                       linear-gradient(transparent, rgba(0, 0, 0, .25) 30%);
     background-position: 1px -1px, 0 -1px, 100% -1px;
     background-size: calc(100% - 2px) 100%, 1px 100%, 1px 100%;
     background-repeat: no-repeat;
   }
-}
 
-.tabs-alltabs-button {
-  margin-bottom: -1px;
-  width: 18px;
-  list-style-image: url(icons/dropmarker.svg#win);
+  #tabs-toolbar[brighttext] .tabmail-arrowscrollbox >
+    .scrollbutton-up:not(:-moz-lwtheme):not([disabled]):hover,
+  #tabs-toolbar[brighttext] .tabmail-arrowscrollbox > stack >
+    .scrollbutton-down:not(:-moz-lwtheme):not([disabled]):hover {
+    background-image: linear-gradient(rgba(255, 255, 255, 0),
+                      rgba(255, 255, 255, .5)),
+                      linear-gradient(transparent, rgba(255, 255, 355, .25) 30%),
+                      linear-gradient(transparent, rgba(255, 255, 255, .25) 30%);
+  }
 }
 
-#tabs-toolbar[brighttext] .tabs-alltabs-button {
-  list-style-image: url(icons/dropmarker.svg#win-inverted);
+#alltabs-button {
+  margin-bottom: 0;
+  padding-right: 3px !important;
+  padding-left: 3px !important;
 }
 
-.tabs-alltabs-button > .toolbarbutton-icon {
-  width: 9px;
-  height: 7px;
-  margin: 3px 0;
-}
-
-.tabs-alltabs-button > .toolbarbutton-menu-dropmarker {
+.tabs-alltabs-button > hbox > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
 @media (-moz-os-version: windows-win8),
        (-moz-os-version: windows-win10) {
-  .tabs-alltabs-button {
-    list-style-image: url(icons/dropmarker.svg#win8);
-  }
-
-  #tabs-toolbar[brighttext] .tabs-alltabs-button {
-    list-style-image: url(icons/dropmarker.svg#win8-inverted);
-  }
-
   .tabs-closebutton > .toolbarbutton-icon,
   .tab-close-button > .toolbarbutton-icon {
     width: 20px;
   }
 }
 
 @media (-moz-os-version: windows-win10) and (-moz-windows-default-theme) {
   .tab-label:-moz-window-inactive {
@@ -220,30 +201,16 @@ tabpanels {
 
 @media (-moz-os-version: windows-win8) and (-moz-windows-default-theme) {
   #messengerWindow[darkwindowframe="true"]
   #tabs-toolbar:not(:-moz-lwtheme):not(:-moz-window-inactive),
   #messengerWindow[darkwindowframe="true"]
   .tabmail-tab:not([selected="true"]):not(:-moz-lwtheme):not(:-moz-window-inactive) {
     color: white;
   }
-
-  #messengerWindow[darkwindowframe="true"]
-  .tabs-alltabs-button:not(:-moz-lwtheme):-moz-window-inactive {
-    padding-inline-start: 5px;
-    padding-inline-end: 5px;
-  }
-
-  .tabs-alltabs-button > .toolbarbutton-icon {
-    margin: 4px 0 0;
-  }
-}
-
-.tabs-alltabs-button > .toolbarbutton-text {
-  display: none;
 }
 
 /**
  * All Tabs Menupopup
  */
 
 .alltabs-item {
   list-style-image: url("chrome://global/skin/icons/folder-item.png");
deleted file mode 100644
--- a/mail/themes/windows/mail/tabs/arrow-left-inverted.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg width="15" height="17" xmlns="http://www.w3.org/2000/svg">
-  <path fill="#666" stroke-width="1.5" stroke="#666" d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z"/>
-  <path fill="#fff" d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z"/>
-</svg>
deleted file mode 100644
--- a/mail/themes/windows/mail/tabs/arrow-left.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg width="15" height="17" xmlns="http://www.w3.org/2000/svg">
-  <path d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z" fill="#4c4c4c"/>
-</svg>