From 2e14f5e5241539dc8e9253215270936165555623 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pwalton@mozilla.com>
Date: Thu, 2 Dec 2010 06:50:29 -0400
Subject: [PATCH] Bug 601667 - Web Console toolbar styling, part 3;
 f=mihai.sucan,ddahl r=l10n,sdwilsh,dao,kdangoor, a=blocking2.0

---
 .../winstripe/global/icons/webconsole.png     | Bin 0 -> 1000 bytes
 toolkit/themes/winstripe/global/jar.mn        |   2 +
 .../themes/winstripe/global/webConsole.css    |  66 +++++++++++-------
 3 files changed, 43 insertions(+), 25 deletions(-)
 create mode 100644 toolkit/themes/winstripe/global/icons/webconsole.png

diff --git a/toolkit/themes/winstripe/global/icons/webconsole.png b/toolkit/themes/winstripe/global/icons/webconsole.png
new file mode 100644
index 0000000000000000000000000000000000000000..48fdc9ba4f10f93f4a071f3917e16d8dc02f09d2
GIT binary patch
literal 1000
zcmV<E0~h>>P)<h;3K|Lk000e1NJLTq001ul001Zm1^@s6ZX%-;000B8Nkl<ZSi`-T
zv1{8v6vp*O1cC`vQ<jX$luVgRG-fJfHOZ7Ilt7W7n?vwqNCuZoh8ju+r=?&QixSes
z6iN&2&>@q-Taz^DV1s&3@tLQm_s%Cv@xg~L_ayXtpT3ib9OrR_jy$AVcPweRN>!yu
zX)vC<PR6mkyu76pG1}5_aDi*)-0N|TYakkn8y>1td0F72D0;THx7Weo@HecRAWcpA
z2*zg|pTGt|5Q{Y6GA2;r2G(^0WAJq@9=d_h;J9PD5Q>UP)hzJ10S=rtU;_6UN3r_@
z>N?~60CTynn~)So6SytB6o(YNAvP0u3XU4E9wp1z_y#DSi;VzZEeamMdxi}gTI3VE
zpJ~J9g)b}hm0E@v1>^}MLHR{LDs3B(MqueW&3+*-si|Z2@;1y`Tf4mLf~4~fem=Nf
z?{C%l@F!Ym-wa?5YsG`B3oL!QNxh8XHC1C9Q0uXnvHRn}o79QoT9Jc;G&QyT_1@Po
z@tioG0DkfEQD`l32ZSbPx&!cw=j_3T3+bqs6dzM0JZ``QK5-p6irt5Nr(7q_$H!p!
zv+qeg6}%V+4qk{&0-l0v*^a|s|4KHo!C9wJ+Wk~)82ChN^1uW5%IDjjv|$qsOv&<0
z8#WL8&bRyWV&|s6adp>{Vx(LR60QqS+WomcDxm?X2H;k%lkCssB?V*nb~Vge8#dRv
zAnCl()qy*D?^TC2CmPll1~7-U!olMUoGqnZMz9vwm<HnY8vjqjDBSgQoeFBjHo!od
zni_rF_9rlEP94Xvubw|D(Ez#wQj@dY0r*98_E^J(CQ&g6jwuvA(SQM5yN(^j?nAz*
z>(qHT2E+e;oz#=TOL5@frPyG23a(`hJ^FH3vWX4OI)&2i)7Y??N3qETAA>hmdg6w~
zYg4j3%ZAMd-`Ob--z@fr?>1UejFhVZc3p(h?$7g42@Qxf1#aUy&Hh|oQZP<VPQt9U
z)6>%~NII|GZo7>}qY7UbDwWCr=CD>cI9%ZP_&D`4f;Fgd4WLgSsc~^};o(nxSWqjp
z0S?mCRI}OiH4MzD;}~{xb2AoR!*@Vxa;7@~zj)4m$T3_<N5v#Krcij?fC*f?jvdAB
zL%yl&)Ok1t!|(6!C-h|SQXDvVDK;3Mf@@hrcRHPtO>A)1DU^1f#)gB(vB?Dw;I&$<
zCv8}~HZ9AuY}j1z=jZ3;qobpKy<TrgF;cDu*mVg?yFb@QB{U$_0NloPn*Djar2YdN
WZRqPD%vOH@0000<MNUMnLSTa8Al#Aw

literal 0
HcmV?d00001

diff --git a/toolkit/themes/winstripe/global/jar.mn b/toolkit/themes/winstripe/global/jar.mn
index 6819610159f9..345f6f4489f7 100644
--- a/toolkit/themes/winstripe/global/jar.mn
+++ b/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)
diff --git a/toolkit/themes/winstripe/global/webConsole.css b/toolkit/themes/winstripe/global/webConsole.css
index 8a9e576dc316..c140dacccb4a 100644
--- a/toolkit/themes/winstripe/global/webConsole.css
+++ b/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);
-}
-