Backed out changeset ff935cad9804 (bug 942853)
authorMike Conley <mconley@mozilla.com>
Fri, 06 Dec 2013 17:13:35 -0500
changeset 174666 b552d214f8d048a306a21bcb0e71a5be2b977840
parent 174665 48d23dfefc7058e353ae3c9e8a63a3bac2abdcab
child 174667 7c6ea3d298524d144ea75036d6763540ecccd5f4
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs942853
milestone28.0a1
backs outff935cad980479be661e48a544d192df94402600
Backed out changeset ff935cad9804 (bug 942853)
browser/components/customizableui/src/CustomizableWidgets.jsm
browser/themes/osx/browser.css
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -43,17 +43,17 @@ function setAttributes(aNode, aAttrs) {
         value = CustomizableUI.getLocalizedProperty({id: aAttrs.id}, name);
       aNode.setAttribute(name, value);
     }
   }
 }
 
 function updateCombinedWidgetStyle(aNode, aArea, aModifyAutoclose) {
   let inPanel = (aArea == CustomizableUI.AREA_PANEL);
-  let cls = inPanel ? "panel-combined-button" : "toolbarbutton-1";
+  let cls = inPanel ? "panel-combined-button" : null;
   let attrs = {class: cls};
   if (aModifyAutoclose) {
     attrs.noautoclose = inPanel ? true : null;
   }
   for (let i = 0, l = aNode.childNodes.length; i < l; ++i) {
     if (aNode.childNodes[i].localName == "separator")
       continue;
     setAttributes(aNode.childNodes[i], attrs);
@@ -300,17 +300,17 @@ const CustomizableWidgets = [{
     id: "zoom-controls",
     type: "custom",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     onBuild: function(aDocument) {
       const kPanelId = "PanelUI-popup";
       let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
       let noautoclose = inPanel ? "true" : null;
-      let cls = inPanel ? "panel-combined-button" : "toolbarbutton-1";
+      let cls = inPanel ? "panel-combined-button" : null;
 
       if (!this.currentArea)
         cls = null;
 
       let buttons = [{
         id: "zoom-out-button",
         noautoclose: noautoclose,
         command: "cmd_fullZoomReduce",
@@ -444,17 +444,17 @@ const CustomizableWidgets = [{
     }
   }, {
     id: "edit-controls",
     type: "custom",
     removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     onBuild: function(aDocument) {
       let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
-      let cls = inPanel ? "panel-combined-button" : "toolbarbutton-1";
+      let cls = inPanel ? "panel-combined-button" : null;
 
       if (!this.currentArea)
         cls = null;
 
       let buttons = [{
         id: "cut-button",
         command: "cmd_cut",
         class: cls,
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -1427,18 +1427,18 @@ toolbar .toolbarbutton-1:not([type="menu
   border-bottom-left-radius: 0;
 }
 
 #zoom-controls[cui-areatype="toolbar"]:not(.overflowedItem) > #zoom-reset-button {
   min-width: 0;
   margin: 0;
 }
 
-#zoom-controls[cui-areatype="toolbar"]:not(.overflowedItem) > #zoom-reset-button > .toolbarbutton-text {
-  padding-top: 8px;
+#zoom-controls[cui-areatype="toolbar"] > #zoom-reset-button > .toolbarbutton-text {
+  padding-top: 2px;
   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);