From 35f6185ea1fbed19044f140882e8a359545b1b34 Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Thu, 9 Jan 2014 16:22:10 +0000
Subject: [PATCH] Bug 941211 - use px sizes for Australis' panel/palette icons,
 and incorporate into height, r?jaws

--HG--
extra : rebase_source : 5b2253ada8f70032bc31f5416a8f94d45b07416c
---
 browser/base/content/browser.css                     |  9 +++++----
 .../shared/customizableui/panelUIOverlay.inc.css     | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 533d45fc69b..f63ab38ef91 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -937,8 +937,9 @@ toolbarpaletteitem[dragover] {
 }
 
 toolbarpaletteitem[place="palette"] {
-  width: 110px;
-  height: 94px;
+  width: 10em;
+  height: calc(40px + 2em);
+  margin-bottom: 5px;
   overflow: hidden;
   display: inline-block;
 }
@@ -950,8 +951,8 @@ toolbarpaletteitem[place="palette"][hidden] {
 #customization-palette .toolbarpaletteitem-box {
   -moz-box-pack: center;
   -moz-box-flex: 1;
-  width: 110px;
-  max-width: 110px;
+  width: 10em;
+  max-width: 10em;
 }
 
 /* UI Tour */
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index d6e2d4c6123..b0fda5f2352 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -126,8 +126,8 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton,
   -moz-box-orient: vertical;
   min-width: 7em;
   max-width: 7em;
-  height: 6em;
-  max-height: 6em;
+  height: calc(40px + 2.4em);
+  max-height: calc(40px + 2.4em);
 }
 
 .panel-customization-placeholder[expand],
@@ -155,7 +155,7 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-wi
 }
 
 toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"] > iframe {
-  margin: calc(5em / 12) auto;
+  margin: 4px auto;
 }
 
 toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) > .toolbarbutton-text {
@@ -169,9 +169,9 @@ toolbaritem[cui-areatype="menu-panel"] > toolbarbutton > .toolbarbutton-icon,
 toolbarpaletteitem[place="palette"] > #bookmarks-menu-button > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
 toolbarpaletteitem[place="palette"] > toolbarbutton > .toolbarbutton-icon,
 toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton > .toolbarbutton-icon {
-  min-width: calc(8em / 3);
-  min-height: calc(8em / 3);
-  margin: calc(5em / 12);
+  min-width: 32px;
+  min-height: 32px;
+  margin: 4px;
 }
 
 toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {