Skip to content

Commit

Permalink
fix toolbar icons for linux & darwin
Browse files Browse the repository at this point in the history
  • Loading branch information
JustOff committed Nov 1, 2016
1 parent 8d9830e commit 4e5b356
Show file tree
Hide file tree
Showing 10 changed files with 121 additions and 69 deletions.
Empty file added .gitignore
Empty file.
5 changes: 4 additions & 1 deletion src/chrome.manifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ content econsole2 content/
locale econsole2 en-US locale/en-US/

skin econsole2 classic/1.0 skin/
skin econsole2-os classic/1.0 skin/winnt/ os=WINNT
skin econsole2-os classic/1.0 skin/darwin/ os=Darwin
skin econsole2-os classic/1.0 skin/unix/ os=Linux

overlay chrome://browser/content/browser.xul chrome://econsole2/content/overlay.xul
override chrome://global/content/console.xul chrome://econsole2/content/console2.xul

style chrome://global/content/customizeToolbar.xul chrome://econsole2/skin/console-toolbar.css
style chrome://global/content/customizeToolbar.xul chrome://econsole2-os/skin/console-toolbar.css
style chrome://global/content/customizeToolbar.xul chrome://econsole2/skin/toolbar.css
2 changes: 1 addition & 1 deletion src/content/console2.xul
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://econsole2/skin/console2.css" type="text/css"?>
<?xml-stylesheet href="chrome://econsole2/skin/console-toolbar.css" type="text/css"?>
<?xml-stylesheet href="chrome://econsole2-os/skin/console-toolbar.css" type="text/css"?>
<?xml-stylesheet href="chrome://econsole2/content/console2.css" type="text/css"?>

<!DOCTYPE window [
Expand Down
2 changes: 1 addition & 1 deletion src/install.rdf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.mozilla.org/2004/em-rdf#">
<RDF:Description about="urn:mozilla:install-manifest">
<id>ErrorConsole2@Off.JustOff</id>
<version>1.0.3</version>
<version>1.0.4</version>
<type>2</type>
<name>Error Console²</name>
<description>Extended Error Console for Pale Moon</description>
Expand Down
67 changes: 1 addition & 66 deletions src/skin/console-toolbar.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* :::::::: toolbar icons ::::::::::::::: */
/* :::::::: toolbar buttons ::::::::::::::: */

toolbar toolbarbutton:not([type="menu"]):not([class~="textonly"]) .toolbarbutton-text {
-moz-margin-start: 4px !important;
Expand All @@ -19,71 +19,6 @@ toolbar[mode="icons"] toolbarpaletteitem > .textonly > .toolbarbutton-text {
display: -moz-box;
}

#item_modeAll,
#item_modeErrors,
#item_modeWarnings,
#item_modeMessages,
#item_clearConsole {
list-style-image: url("chrome://global/skin/console/console-toolbar.png");
}

#item_modeAll {
-moz-image-region: rect(0px 24px 24px 0px);
}
#item_modeAll:hover {
-moz-image-region: rect(24px 24px 48px 0px);
}

#item_modeErrors {
-moz-image-region: rect(0px 96px 24px 72px);
}
#item_modeErrors:hover,
#item_modeErrors[checked="true"] {
-moz-image-region: rect(24px 96px 48px 72px);
}

#item_modeWarnings {
-moz-image-region: rect(0px 72px 24px 48px);
}
#item_modeWarnings:hover,
#item_modeWarnings[checked="true"] {
-moz-image-region: rect(24px 72px 48px 48px);
}

#item_modeMessages {
-moz-image-region: rect(0px 48px 24px 24px);
}
#item_modeMessages:hover,
#item_modeMessages[checked="true"] {
-moz-image-region: rect(24px 48px 48px 24px);
}

#item_clearConsole {
-moz-image-region: rect(0px 120px 24px 96px);
}
#item_clearConsole:hover {
-moz-image-region: rect(24px 120px 48px 96px);
}

toolbar[iconsize="small"] toolbarbutton[id="item_modeAll"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeAll"]:hover .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeAll"][checked="true"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeErrors"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeErrors"]:hover .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeErrors"][checked="true"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeWarnings"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeWarnings"]:hover .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeWarnings"][checked="true"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeMessages"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeMessages"]:hover .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeMessages"][checked="true"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_clearConsole"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_clearConsole"]:hover .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_clearConsole"][checked="true"] .toolbarbutton-icon {
height:16px;
width:16px;
}

#item_modeLangCSS {
background: url("chrome://econsole2/skin/css.png") no-repeat 15% 25%;
}
Expand Down
Binary file added src/skin/darwin/clear.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions src/skin/darwin/console-toolbar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@import url(chrome://econsole2/skin/console-toolbar.css);

/* :::::::: toolbar icons osx ::::::::::::::: */

#item_modeAll {
list-style-image: url("chrome://econsole2/skin/darwin/console.png");
}

#item_modeErrors {
list-style-image: url("chrome://global/skin/icons/error-16.png");
}

#item_modeWarnings {
list-style-image: url("chrome://global/skin/icons/warning-16.png");
}

#item_modeMessages {
list-style-image: url("chrome://global/skin/icons/information-16.png");
}

#item_clearConsole {
list-style-image: url("chrome://econsole2/skin/darwin/clear.png");
}
Binary file added src/skin/darwin/console.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions src/skin/unix/console-toolbar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@import url(chrome://econsole2/skin/console-toolbar.css);

/* :::::::: toolbar icons unix ::::::::::::::: */

#item_modeAll {
list-style-image: url("chrome://global/skin/console/console-toolbar.png");
}

#item_modeErrors {
list-style-image: url("moz-icon://stock/gtk-dialog-error?size=toolbar");
}

#item_modeWarnings {
list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=toolbar");
}

#item_modeMessages {
list-style-image: url("moz-icon://stock/gtk-dialog-info?size=toolbar");
}

#item_clearConsole {
list-style-image: url("moz-icon://stock/gtk-clear?size=toolbar");
}
68 changes: 68 additions & 0 deletions src/skin/winnt/console-toolbar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
@import url(chrome://econsole2/skin/console-toolbar.css);

/* :::::::: toolbar icons winnt ::::::::::::::: */

#item_modeAll,
#item_modeErrors,
#item_modeWarnings,
#item_modeMessages,
#item_clearConsole {
list-style-image: url("chrome://global/skin/console/console-toolbar.png");
}

#item_modeAll {
-moz-image-region: rect(0px 24px 24px 0px);
}
#item_modeAll:hover {
-moz-image-region: rect(24px 24px 48px 0px);
}

#item_modeErrors {
-moz-image-region: rect(0px 96px 24px 72px);
}
#item_modeErrors:hover,
#item_modeErrors[checked="true"] {
-moz-image-region: rect(24px 96px 48px 72px);
}

#item_modeWarnings {
-moz-image-region: rect(0px 72px 24px 48px);
}
#item_modeWarnings:hover,
#item_modeWarnings[checked="true"] {
-moz-image-region: rect(24px 72px 48px 48px);
}

#item_modeMessages {
-moz-image-region: rect(0px 48px 24px 24px);
}
#item_modeMessages:hover,
#item_modeMessages[checked="true"] {
-moz-image-region: rect(24px 48px 48px 24px);
}

#item_clearConsole {
-moz-image-region: rect(0px 120px 24px 96px);
}
#item_clearConsole:hover {
-moz-image-region: rect(24px 120px 48px 96px);
}

toolbar[iconsize="small"] toolbarbutton[id="item_modeAll"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeAll"]:hover .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeAll"][checked="true"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeErrors"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeErrors"]:hover .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeErrors"][checked="true"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeWarnings"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeWarnings"]:hover .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeWarnings"][checked="true"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeMessages"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeMessages"]:hover .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_modeMessages"][checked="true"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_clearConsole"] .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_clearConsole"]:hover .toolbarbutton-icon,
toolbar[iconsize="small"] toolbarbutton[id="item_clearConsole"][checked="true"] .toolbarbutton-icon {
height:16px;
width:16px;
}

0 comments on commit 4e5b356

Please sign in to comment.