Backed out changeset 74568436ab02 (bug 980374) for failures in browser_toolbarbutton_menu_context.js
authorEd Morley <emorley@mozilla.com>
Mon, 10 Mar 2014 17:06:32 +0000
changeset 172825 403ef36f7d350022e2d613017e4f4b0f3c5a6379
parent 172824 cb89890bd6c72656c7ec889f9484dadadad8b823
child 172826 a996c3c2f00d220ee385db4502279c3cbff21772
push id26382
push userryanvm@gmail.com
push dateMon, 10 Mar 2014 21:09:54 +0000
treeherdermozilla-central@41d962d23e81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs980374
milestone30.0a1
backs out74568436ab029ead890581dd1da9e0434d502ccb
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
Backed out changeset 74568436ab02 (bug 980374) for failures in browser_toolbarbutton_menu_context.js
browser/themes/osx/browser.css
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -472,17 +472,17 @@ toolbar .toolbarbutton-1 > .toolbarbutto
   border: 1px solid transparent;
   border-radius: @toolbarbuttonCornerRadius@;
   transition-property: background, border-color;
   transition-duration: 250ms;
 }
 
 toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],#back-button,#forward-button)),
 #restore-button {
-  padding: 0 4px;
+  padding: 2px 6px;
 }
 
 toolbar .toolbarbutton-1:not(:-moz-any([type="menu-button"],[disabled],[open],#back-button,#forward-button)):hover,
 toolbar .toolbarbutton-1[type="menu-button"]:not(:-moz-any([disabled],[open])):hover > .toolbarbutton-menubutton-button,
 toolbar .toolbarbutton-1[type="menu-button"]:not(:-moz-any([disabled],[open])):hover > .toolbarbutton-menubutton-dropmarker,
 toolbar .toolbaritem-combined-buttons:hover > .toolbarbutton-combined,
 #restore-button:not([disabled]):hover {
   border-color: hsla(0,0%,0%,.2);
@@ -558,37 +558,37 @@ toolbar .toolbaritem-combined-buttons:ho
 }
 
 toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
   -moz-box-orient: horizontal;
 }
 
 toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
-  margin: 0 4px;
-}
-
-#nav-bar .toolbarbutton-1:not(#back-button):not(#forward-button) {
-  margin-top: 4px;
-  margin-bottom: 4px;
+  margin: 2px 6px;
 }
 
 #nav-bar #PanelUI-button {
   -moz-box-align: center;
 }
 
 #nav-bar #PanelUI-menu-button {
   margin-top: 0;
   margin-bottom: 0;
-  padding-top: 1px;
-  padding-bottom: 1px;
+  padding-top: 5px;
+  padding-bottom: 5px;
   -moz-margin-start: 9px;
   -moz-margin-end: 7px;
 }
 
+#nav-bar > .toolbarbutton-1 {
+  margin-top: 4px;
+  margin-bottom: 4px;
+}
+
 @media not all and (min-resolution: 2dppx) {
 %include ../shared/toolbarbuttons.inc.css
 %include ../shared/menupanel.inc.css
 
   #back-button:hover:active:not([disabled="true"]) {
     -moz-image-region: rect(18px, 36px, 36px, 18px);
   }
 
@@ -1212,17 +1212,18 @@ toolbar .toolbarbutton-1 > .toolbarbutto
 
 toolbar .toolbarbutton-1:not([type="menu-button"]),
 toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
 #restore-button {
   min-width: 28px;
 }
 
 /* Help 16px icons fit: */
-.toolbarbutton-1[cui-areatype="toolbar"]:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon {
+.toolbarbutton-1[cui-areatype="toolbar"]:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon,
+.toolbarbutton-1[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
   margin: 2px;
 }
 
 /* Help SDK icons fit: */
 toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon {
   width: 16px;
 }
 
@@ -1574,17 +1575,17 @@ toolbarbutton[sdk-button="true"][cui-are
 }
 
 #zoom-controls[cui-areatype="toolbar"]:not([overflowedItem=true]) > #zoom-reset-button {
   min-width: 0;
   margin: 0;
 }
 
 #zoom-controls[cui-areatype="toolbar"]:not([overflowedItem=true]) > #zoom-reset-button > .toolbarbutton-text {
-  padding-top: 4px;
+  padding-top: 6px;
   margin: 2px;
 }
 
 /* sync button */
 
 #sync-button[status="active"] {
   list-style-image: url("chrome://browser/skin/sync-throbber.png");
   -moz-image-region: rect(0, 20px, 20px, 0px);