Bug 964217 - search item is broken in Australis' customize code, r=mikedeboer
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 28 Jan 2014 15:53:45 +0000
changeset 165731 849724d4081e38dbf64621b3b8f51aeb549a2168
parent 165730 35f758e7ac6ae4070a733d0fca8f63afa1ebef6d
child 165732 612b27bab639f9431128f3bb3ee78cf736af15b6
push id4649
push usergijskruitbosch@gmail.com
push dateWed, 29 Jan 2014 16:40:30 +0000
treeherderfx-team@849724d4081e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmikedeboer
bugs964217
milestone29.0a1
Bug 964217 - search item is broken in Australis' customize code, r=mikedeboer
browser/components/customizableui/src/CustomizeMode.jsm
browser/themes/shared/customizableui/customizeMode.inc.css
browser/themes/shared/customizableui/panelUIOverlay.inc.css
--- a/browser/components/customizableui/src/CustomizeMode.jsm
+++ b/browser/components/customizableui/src/CustomizeMode.jsm
@@ -628,19 +628,16 @@ CustomizeMode.prototype = {
     if (aNode.hasAttribute("title")) {
       wrapper.setAttribute("title", aNode.getAttribute("title"));
     } else if (aNode.hasAttribute("label")) {
       wrapper.setAttribute("title", aNode.getAttribute("label"));
     }
 
     if (aNode.hasAttribute("flex")) {
       wrapper.setAttribute("flex", aNode.getAttribute("flex"));
-      if (aPlace == "palette") {
-        aNode.removeAttribute("flex");
-      }
     }
 
 
     const kPanelItemContextMenu = "customizationPanelItemContextMenu";
     const kPaletteItemContextMenu = "customizationPaletteItemContextMenu";
     let contextMenuAttrName = aNode.getAttribute("context") ? "context" :
                                 aNode.getAttribute("contextmenu") ? "contextmenu" : "";
     let currentContextMenu = aNode.getAttribute(contextMenuAttrName);
@@ -697,20 +694,16 @@ CustomizeMode.prototype = {
     if (aWrapper.hasAttribute("itemobserves")) {
       toolbarItem.setAttribute("observes", aWrapper.getAttribute("itemobserves"));
     }
 
     if (aWrapper.hasAttribute("itemchecked")) {
       toolbarItem.checked = true;
     }
 
-    if (aWrapper.hasAttribute("flex") && !toolbarItem.hasAttribute("flex")) {
-      toolbarItem.setAttribute("flex", aWrapper.getAttribute("flex"));
-    }
-
     if (aWrapper.hasAttribute("itemcommand")) {
       let commandID = aWrapper.getAttribute("itemcommand");
       toolbarItem.setAttribute("command", commandID);
 
       //XXX Bug 309953 - toolbarbuttons aren't in sync with their commands after customizing
       let command = this.document.getElementById(commandID);
       if (command && command.hasAttribute("disabled")) {
         toolbarItem.setAttribute("disabled", command.getAttribute("disabled"));
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -132,13 +132,17 @@ toolbarpaletteitem[place="toolbar"] {
   opacity: 1; /* To ensure these buttons always look enabled in customize mode */
 }
 
 #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button,
 #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button + separator {
   display: none;
 }
 
+#wrapper-personal-bookmarks:not([place="toolbar"]) > #personal-bookmarks {
+  -moz-box-pack: center;
+}
+
 #customization-palette > toolbarpaletteitem > label {
   text-align: center;
   margin-left: 0;
   margin-right: 0;
 }
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -207,16 +207,18 @@ toolbaritem[cui-areatype="menu-panel"][s
 toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) > .toolbarbutton-text {
   text-align: center;
 }
 
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 .panelUI-grid .toolbarbutton-1 > .toolbarbutton-icon,
 .customization-palette .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 .customization-palette .toolbarbutton-1 > .toolbarbutton-icon,
+.panelUI-grid #bookmarks-toolbar-placeholder > .toolbarbutton-icon,
+.customization-palette #bookmarks-toolbar-placeholder > .toolbarbutton-icon,
 .panel-customization-placeholder-child > .toolbarbutton-icon {
   min-width: 32px;
   min-height: 32px;
   margin: 4px;
 }
 
 toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
   -moz-box-flex: 1;
@@ -527,18 +529,18 @@ toolbarpaletteitem[place="palette"] > #b
   display: none;
 }
 
 #search-container[cui-areatype="menu-panel"] {
   width: @menuPanelWidth@;
 }
 
 toolbarpaletteitem[place="palette"] > #search-container {
-  min-width: calc(@menuPanelWidth@ / 3);
-  width: calc(@menuPanelWidth@ / 3);
+  min-width: 7em;
+  width: 7em;
 }
 
 #edit-controls@inAnyPanel@,
 #zoom-controls@inAnyPanel@ {
   background-color: hsla(210,4%,10%,0);
   border-radius: 2px;
   border: 1px solid;
   border-color: hsla(210,4%,10%,0);