Fixed bug #56: Toolbar icon wasn't displaying properly in Firefox+Lin…

…ux. (Still need to test on other platforms.)
adam-p · Mar 5, 2013 · 605cce2 · 605cce2
1 parent 6040594
commit 605cce2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/firefox/chrome/content/ff-overlay.xul b/src/firefox/chrome/content/ff-overlay.xul
@@ -31,7 +31,7 @@
 
   <toolbarpalette id="BrowserToolbarPalette">
     <toolbarbutton id="toolbarButton-markdown_here"
-                   class="toolbarButton-markdown_here toolbarbutton-1 chromeclass-toolbar-additional"
+                   class="toolbarbutton-1 chromeclass-toolbar-additional"
                    label="&markdown_hereButton.label;"
                    tooltiptext="&markdown_hereButton.tooltiptext;"
                    oncommand="markdown_here.onToolbarButtonCommand(event)" />

diff --git a/src/firefox/chrome/content/tb-overlay.xul b/src/firefox/chrome/content/tb-overlay.xul
@@ -23,15 +23,15 @@
 
   <toolbarpalette id="MsgComposeToolbarPalette">
     <toolbarbutton id="composeToolbarButton-markdown_here"
-                   class="toolbarButton-markdown_here toolbarbutton-1 chromeclass-toolbar-additional"
+                   class="toolbarbutton-1 chromeclass-toolbar-additional"
                    label="&markdown_hereButton.label;"
                    tooltiptext="&markdown_hereButton.tooltiptext;"
                    oncommand="markdown_here.onToolbarButtonCommand(event)" />
   </toolbarpalette>
 
   <toolbar class="chromeclass-toolbar" id="FormatToolbar">
     <toolbarbutton id="formatToolbarButton-markdown_here"
-                   class="toolbarButton-markdown_here formatting-button toolbarbutton-1 chromeclass-toolbar-additional"
+                   class="formatting-button toolbarbutton-1 chromeclass-toolbar-additional"
                    insertbefore="smileButtonMenu"
                    label="&markdown_hereButton.label;"
                    tooltiptext="&markdown_hereButton.tooltiptext;"

diff --git a/src/firefox/chrome/skin/toolbar.css b/src/firefox/chrome/skin/toolbar.css
@@ -1,7 +1,9 @@
-.toolbarButton-markdown_here {
+#toolbarButton-markdown_here, #composeToolbarButton-markdown_here, #formatToolbarButton-markdown_here {
   list-style-image: url("resource://markdown_here_common/images/icon24.png");
 }
 
-toolbar[iconsize="small"] .toolbarButton-markdown_here {
+toolbar[iconsize="small"] #toolbarButton-markdown_here,
+toolbar[iconsize="small"] #composeToolbarButton-markdown_here,
+toolbar[iconsize="small"] #formatToolbarButton-markdown_here {
   list-style-image: url("resource://markdown_here_common/images/icon16.png");
 }