Fix issue 215 by changing some negative margins, inheriting wrap, and fixing the horizontal orientation to only apply in toolbars

gijsk · diracdeltas · commit f3e896cf8ba3 · 2014-04-17T15:39:41.000-07:00
diff --git a/src/chrome/content/toolbar_button_binding.xml b/src/chrome/content/toolbar_button_binding.xml
@@ -24,7 +24,7 @@ See: https://developer.mozilla.org/en-US/docs/XBL
           class="https-everywhere-button toolbarbutton-1 chromeclass-toolbar-additional"
           flex="1" 
           allowevents="true"
-          xbl:inherits="type,crop,image,label,accesskey,command,align,dir,pack,orient">
+          xbl:inherits="type,crop,image,label,accesskey,command,align,dir,pack,orient,wrap">
 
         <children includes="menupopup" />
       </xul:toolbarbutton>
diff --git a/src/chrome/skin/https-everywhere.css b/src/chrome/skin/https-everywhere.css
@@ -1,15 +1,17 @@
 #https-everywhere-button {
   -moz-binding: url("chrome://https-everywhere/content/toolbar_button_binding.xml#https-everywhere-binding");
-  -moz-box-orient: horizontal;
 }
 
 #https-everywhere-button > .https-everywhere-button {
   list-style-image: url("chrome://https-everywhere/skin/https-everywhere-24.png");
-  -moz-box-orient: horizontal;
 }
 
 toolbar[iconsize="small"] #https-everywhere-button > .https-everywhere-button {
   list-style-image: url("chrome://https-everywhere/skin/https-everywhere-16.png");
+}
+
+#https-everywhere-button[cui-areatype=toolbar],
+#https-everywhere-button[cui-areatype=toolbar] > .https-everywhere-button {
   -moz-box-orient: horizontal;
 }
 
@@ -29,6 +31,12 @@ toolbar[iconsize="small"] #https-everywhere-button[status="disabled"] > .https-e
   -moz-box-sizing: border-box;
 }
 
+/* increase negative margins in the palette and panel so the button isn't too wide. */
+#wrapper-https-everywhere-button[place="palette"] > #https-everywhere-button > #rscounter,
+#https-everywhere-button[cui-areatype="menu-panel"] > #rscounter {
+  margin: 3px -16px 0 -8px;
+}
+
 /* rulesets applied label */
 #rsapplied {
   -moz-box-sizing: border-box;
