Bug 1515685 - Part 1: Remove menulist style overrides for button[type="menu"] r=dao
authorMark Striemer <mstriemer@mozilla.com>
Fri, 18 Jan 2019 10:44:50 +0000
changeset 514405 1a6794b81d48aedc53efab7d9dd40a1bc468413d
parent 514404 92c56dcf69b8dadf31af02054dcbfda5802000d1
child 514406 0eae1c157b3e3642b4cabe1424923d761675c39b
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1515685
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1515685 - Part 1: Remove menulist style overrides for button[type="menu"] r=dao Differential Revision: https://phabricator.services.mozilla.com/D16751
toolkit/themes/osx/global/in-content/common.css
toolkit/themes/shared/in-content/common.inc.css
--- a/toolkit/themes/osx/global/in-content/common.css
+++ b/toolkit/themes/osx/global/in-content/common.css
@@ -28,19 +28,17 @@ xul|menulist > xul|menupopup > xul|menui
 
 xul|*.menulist-dropmarker {
   display: -moz-box;
   margin-top: 1px;
   margin-bottom: 1px;
 }
 
 xul|menulist > xul|menupopup xul|menu,
-xul|menulist > xul|menupopup xul|menuitem,
-xul|button[type="menu"] > xul|menupopup xul|menu,
-xul|button[type="menu"] > xul|menupopup xul|menuitem {
+xul|menulist > xul|menupopup xul|menuitem {
   padding-inline-end: 34px;
 }
 
 xul|*.help-button > xul|*.button-box > xul|*.button-icon {
   margin-inline-start: 0;
 }
 
 xul|*.checkbox-icon {
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -266,30 +266,16 @@ html|input[type="color"] {
   padding: 6px;
   width: 50px;
 }
 
 xul|menulist > xul|*.menulist-label-box > xul|*.menulist-icon[src] {
   margin-inline-end: 5px;
 }
 
-xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
-  -moz-appearance: none;
-  margin: 1px 0;
-  margin-inline-start: 10px;
-  padding: 0;
-  width: 10px;
-  height: 16px;
-  border: none;
-  background-color: transparent;
-  list-style-image: url("chrome://global/skin/in-content/dropdown.svg");
-  -moz-context-properties: fill;
-  fill: -moz-DialogText;
-}
-
 xul|*.close-icon > xul|*.button-box {
   padding-top: 0;
   padding-bottom: 0;
   padding-right: 0 !important;
   padding-left: 0 !important;
 }
 
 xul|*.menulist-dropmarker {
@@ -307,65 +293,55 @@ xul|*.menulist-dropmarker > xul|*.dropma
   width: 18px;
   height: 18px;
 }
 
 xul|menulist[disabled="true"] > xul|*.menulist-dropmarker {
   fill: GrayText;
 }
 
-xul|menulist > xul|menupopup,
-xul|button[type="menu"] > xul|menupopup {
+xul|menulist > xul|menupopup {
   -moz-appearance: none;
   border: 1px solid var(--in-content-box-border-color);
   border-radius: 2px;
   background-color: var(--in-content-box-background);
 }
 
 xul|menulist > xul|menupopup xul|menu,
-xul|menulist > xul|menupopup xul|menuitem,
-xul|button[type="menu"] > xul|menupopup xul|menu,
-xul|button[type="menu"] > xul|menupopup xul|menuitem {
+xul|menulist > xul|menupopup xul|menuitem {
   -moz-appearance: none;
   font-size: 1em;
   color: var(--in-content-text-color);
   padding-top: 0.2em;
   padding-bottom: 0.2em;
   padding-inline-start: 10px;
   padding-inline-end: 30px;
 }
 
 xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
-xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] {
+xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] {
   color: var(--in-content-text-color);
   background-color: var(--in-content-item-hover);
 }
 
 xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
-xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menu:not([disabled="true"])[selected="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] {
+xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[selected="true"] {
   color: var(--in-content-selected-text);
   background-color: var(--in-content-item-selected);
 }
 
 xul|menulist > xul|menupopup > xul|menu[disabled="true"],
-xul|menulist > xul|menupopup > xul|menuitem[disabled="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menu[disabled="true"],
-xul|button[type="menu"] > xul|menupopup > xul|menuitem[disabled="true"] {
+xul|menulist > xul|menupopup > xul|menuitem[disabled="true"] {
   color: #999;
   /* override the [_moz-menuactive="true"] background color from
      global/menu.css */
   background-color: transparent;
 }
 
-xul|menulist > xul|menupopup xul|menuseparator,
-xul|button[type="menu"] > xul|menupopup xul|menuseparator {
+xul|menulist > xul|menupopup xul|menuseparator {
   -moz-appearance: none;
   margin: 0;
   padding: 0;
   border-top: 1px solid var(--in-content-box-border-color);
   border-bottom: none;
 }
 
 /* textboxes */