From 5ca6443553f3e0b947b641f3e85189a4ada9d2af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Wed, 7 Jun 2017 15:03:08 +0200
Subject: [PATCH] Bug 1370503 - Remove leftover .toolbarbutton-1 >
 .toolbarbutton-menu-dropmarker styling. r=johannh

Since we hide the dropmarker arrow, there's no point styling it in the first place.

MozReview-Commit-ID: 9XN4rF2qwQ2

--HG--
extra : rebase_source : 4d7c8739e774cf656af300cff11eaf8d6c1fcc91
---
 browser/base/content/browser.css             | 10 ----------
 browser/themes/linux/browser.css             |  4 ----
 browser/themes/osx/browser.css               |  4 ----
 browser/themes/shared/tabs.inc.css           |  9 +++++++++
 browser/themes/shared/toolbarbuttons.inc.css |  8 ++------
 browser/themes/windows/browser.css           |  4 ----
 6 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 34aa49d0dea4f..6384202d58faa 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -138,16 +138,6 @@ tabbrowser {
   visibility: hidden; /* temporary space to keep a tab's close button under the cursor */
 }
 
-.tabs-newtab-button > .toolbarbutton-menu-dropmarker,
-#new-tab-button > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
-/* override drop marker image padding */
-.tabs-newtab-button > .toolbarbutton-icon {
-  margin-inline-end: 0;
-}
-
 .tabbrowser-tab {
   -moz-binding: url("chrome://browser/content/tabbrowser.xml#tabbrowser-tab");
 }
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 32f4f8b87b1b5..506fa7fcc61be 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1055,10 +1055,6 @@ html|span.ac-emphasize-text-url {
   list-style-image: url("chrome://browser/skin/tabbrowser/alltabs-inverted.png");
 }
 
-#alltabs-button > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 /* All tabs menupopup */
 .alltabs-item > .menu-iconic-left > .menu-iconic-icon {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index bd59efb5d0e0d..2324af24464f3 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -1786,10 +1786,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   }
 }
 
-#alltabs-button > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 /* All Tabs Menupopup */
 .alltabs-item > .menu-iconic-left > .menu-iconic-icon {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index a153e456df36b..684cc1a7dfdd8 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -526,6 +526,15 @@
   width: calc(36px + var(--tab-curve-width));
 }
 
+.tabs-newtab-button > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+.tabs-newtab-button > .toolbarbutton-icon {
+  /* override drop marker image padding */
+  margin-inline-end: 0;
+}
+
 @media (min-resolution: 1.1dppx) {
   /* image preloading hack from like lowdpi styles */
   #tabbrowser-tabs::before {
diff --git a/browser/themes/shared/toolbarbuttons.inc.css b/browser/themes/shared/toolbarbuttons.inc.css
index 5ce253064a4c9..2fb31bc9a35e5 100644
--- a/browser/themes/shared/toolbarbuttons.inc.css
+++ b/browser/themes/shared/toolbarbuttons.inc.css
@@ -61,19 +61,16 @@ toolbar[brighttext] {
 #nav-bar-overflow-button[disabled=true] > .toolbarbutton-icon,
 #PanelUI-menu-button[disabled=true] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon,
-#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker,
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker,
 #main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon,
 #main-window:not([customizing]) .toolbarbutton-1[disabled=true] > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon {
   opacity: 0.4;
 }
 
-.toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
 .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
 }
 
-toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
 toolbar[brighttext] .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
 }
@@ -209,6 +206,8 @@ toolbarbutton.bookmark-item:not(.subviewbutton),
   border-inline-end-style: none;
 }
 
+.bookmark-item > .toolbarbutton-menu-dropmarker,
+#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
 #nav-bar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
   display: none;
 }
@@ -464,6 +463,3 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
   margin-inline-end: 5px;
 }
 
-.bookmark-item > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 6d16792de54d1..69fd15480e7db 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1505,10 +1505,6 @@ treechildren.searchbar-treebody::-moz-tree-row(selected) {
   list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow-inverted.png");
 }
 
-#alltabs-button > .toolbarbutton-menu-dropmarker {
-  display: none;
-}
-
 /* All tabs menupopup */
 .alltabs-item > .menu-iconic-left > .menu-iconic-icon {
   list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.svg");
-- 
GitLab