Bug 601667 - Web Console toolbar styling, part 3; f=mihai.sucan,ddahl r=l10n,sdwilsh,dao,kdangoor, a=blocking2.0

toolkit/themes/winstripe/global/jar.mn

@@ -141,6 +141,7 @@ toolkit.jar:
         skin/classic/global/icons/warning-16.png                 (icons/warning-16.png)
         skin/classic/global/icons/warning-24.png                 (icons/warning-24.png)
         skin/classic/global/icons/warning-64.png                 (icons/warning-64.png)
+        skin/classic/global/icons/webconsole.png                 (icons/webconsole.png)
         skin/classic/global/icons/windowControls.png             (icons/windowControls.png)
         skin/classic/global/icons/wrap.png                       (icons/wrap.png)
         skin/classic/global/media/videocontrols.css              (media/videocontrols.css)
@@ -316,6 +317,7 @@ toolkit.jar:
         skin/classic/aero/global/icons/warning-16.png                    (icons/warning-16-aero.png)
         skin/classic/aero/global/icons/warning-24.png                    (icons/warning-24-aero.png)
         skin/classic/aero/global/icons/warning-64.png                    (icons/warning-64-aero.png)
+        skin/classic/aero/global/icons/webconsole.png                    (icons/webconsole.png)
         skin/classic/aero/global/icons/windowControls.png                (icons/windowControls-aero.png)
         skin/classic/aero/global/icons/wrap.png                          (icons/wrap-aero.png)
         skin/classic/aero/global/media/videocontrols.css                 (media/videocontrols.css)

toolkit/themes/winstripe/global/webConsole.css

@@ -116,12 +116,49 @@
   display: none;
 }
 
-.hud-filter-cat:-moz-system-metric(windows-default-theme) {
-  color: GrayText;
+.webconsole-clear-console-button > .toolbarbutton-icon {
+  display: none;
 }
 
-.hud-group:first-child > .hud-divider {
-  display: none;
+.webconsole-filter-button > .toolbarbutton-menubutton-button {
+  -moz-box-orient: horizontal;
+  list-style-image: url("chrome://global/skin/icons/webconsole.png");
+}
+
+/* Network button */
+.webconsole-filter-button[category="net"] {
+  -moz-image-region: rect(0, 40px, 10px, 30px);
+}
+
+/* CSS button */
+.webconsole-filter-button[category="css"] {
+  -moz-image-region: rect(10px, 40px, 20px, 30px);
+}
+
+/* JS button */
+.webconsole-filter-button[category="js"] {
+  -moz-image-region: rect(20px, 40px, 30px, 30px);
+}
+
+/* Web Developer button */
+.webconsole-filter-button[category="webdev"] {
+  -moz-image-region: rect(30px, 40px, 40px, 30px);
+}
+
+.webconsole-close-button {
+  border: none;
+  padding: 3px;
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+  -moz-appearance: none;
+}
+
+.webconsole-close-button:hover {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.webconsole-close-button:hover:active {
+  -moz-image-region: rect(0, 48px, 16px, 32px);
 }
 
 /* JSTerm Styles */
@@ -181,24 +218,3 @@
   border-top: none;
 }
 
-
-.jsterm-close-button {
-  background: none;
-  border: none;
-  list-style-image: url("chrome://global/skin/icons/close.png");
-  margin: 0px;
-  min-width: 0px;
-  padding: 1px 3px 1px 7px;
-  -moz-appearance: none;
-  -moz-image-region: rect(0, 16px, 16px, 0);
-  -moz-user-focus: ignore;
-}
-
-.jsterm-close-button:hover {
-  -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-.jsterm-close-button:hover:active {
-  -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-