Bug 601667 - Web Console toolbar styling, part 2; f=mihai.sucan,ddahl r=l10n,sdwilsh,dao,kdangoor, a=blocking2.0
authorPatrick Walton <pwalton@mozilla.com>
Thu, 02 Dec 2010 06:50:29 -0400
changeset 58465 841893070e47c0078dc1d46cf9d07b2d8190c403
parent 58464 d48937dcda74b37ace70e85309a7c6d9f57ab0ec
child 58466 5a61fc1bd8f035221a0623bca94ae8ba96201b1e
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersl10n, sdwilsh, dao, kdangoor, blocking2
bugs601667
milestone2.0b8pre
Bug 601667 - Web Console toolbar styling, part 2; f=mihai.sucan,ddahl r=l10n,sdwilsh,dao,kdangoor, a=blocking2.0
toolkit/themes/pinstripe/global/icons/console-close.png
toolkit/themes/pinstripe/global/icons/webconsole.png
toolkit/themes/pinstripe/global/jar.mn
toolkit/themes/pinstripe/global/webConsole.css
deleted file mode 100644
index 15bad242c61b2a4e35d1b5ce2d32f1db3a093c7a..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..48fdc9ba4f10f93f4a071f3917e16d8dc02f09d2
GIT binary patch
literal 1000
zc$@*~0~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
--- a/toolkit/themes/pinstripe/global/jar.mn
+++ b/toolkit/themes/pinstripe/global/jar.mn
@@ -90,17 +90,16 @@ toolkit.jar:
   skin/classic/global/icons/blacklist_favicon.png                    (icons/blacklist_favicon.png)
   skin/classic/global/icons/blacklist_64.png                         (icons/blacklist_64.png)
   skin/classic/global/icons/chevron.png                              (icons/chevron.png)
   skin/classic/global/icons/checkbox.png                             (icons/checkbox.png)
   skin/classic/global/icons/closetab-active.png                      (icons/closetab-active.png)
   skin/classic/global/icons/closetab-hover.png                       (icons/closetab-hover.png)
   skin/classic/global/icons/closetab.png                             (icons/closetab.png)
   skin/classic/global/icons/commandline.png                          (icons/commandline.png)
-  skin/classic/global/icons/console-close.png                        (icons/console-close.png)
   skin/classic/global/icons/information-16.png                       (icons/information-16.png)
   skin/classic/global/icons/information-24.png                       (icons/information-24.png)
   skin/classic/global/icons/information-32.png                       (icons/information-32.png)
   skin/classic/global/icons/information-64.png                       (icons/information-64.png)
   skin/classic/global/icons/information-large.png                    (icons/information-large.png)
   skin/classic/global/icons/information-tabmodal-64.png              (icons/information-tabmodal-64.png)
   skin/classic/global/icons/loading_16.png                           (icons/loading_16.png)
   skin/classic/global/icons/menulist-dropmarker.png                  (icons/menulist-dropmarker.png)
@@ -126,16 +125,17 @@ toolkit.jar:
   skin/classic/global/icons/Error.png                                (icons/Error.png)
   skin/classic/global/icons/question-16.png                          (icons/question-16.png)
   skin/classic/global/icons/question-24.png                          (icons/question-24.png)
   skin/classic/global/icons/question-32.png                          (icons/question-32.png)
   skin/classic/global/icons/question-64.png                          (icons/question-64.png)
   skin/classic/global/icons/question-large.png                       (icons/question-large.png)
   skin/classic/global/icons/question-tabmodal-64.png                 (icons/question-tabmodal-64.png)
   skin/classic/global/icons/sslWarning.png                           (icons/sslWarning.png)
+  skin/classic/global/icons/webconsole.png                           (icons/webconsole.png)
   skin/classic/global/notification/critical-bar-background.png       (notification/critical-bar-background.png)
   skin/classic/global/notification/error-icon.png                    (notification/error-icon.png)
   skin/classic/global/notification/info-bar-background.png           (notification/info-bar-background.png)
   skin/classic/global/notification/info-icon.png                     (notification/info-icon.png)
   skin/classic/global/notification/warning-bar-background.png        (notification/warning-bar-background.png)
   skin/classic/global/notification/warning-icon.png                  (notification/warning-icon.png)
   skin/classic/global/media/videocontrols.css                        (media/videocontrols.css)
   skin/classic/global/media/pauseButton.png                          (media/pauseButton.png)
--- a/toolkit/themes/pinstripe/global/webConsole.css
+++ b/toolkit/themes/pinstripe/global/webConsole.css
@@ -113,23 +113,113 @@
   width: 100%;
 }
 
 .hud-filtered-by-type,
 .hud-filtered-by-string {
   display: none;
 }
 
-.hud-group:first-child > .hud-divider {
-  display: none;
+.webconsole-filter-button,
+.webconsole-clear-console-button {
+  -moz-appearance: none;
+  border: @roundButtonBorder@;
+  background: @roundButtonBackground@;
+  box-shadow: @roundButtonShadow@;
+  color: buttontext;
+  margin: 1px 0;
+  padding: 0;
+}
+
+.webconsole-filter-button {
+  border-radius: 10000px;
+  -moz-margin-start: 6px;
+  -moz-box-orient: horizontal;
+}
+
+.webconsole-clear-console-button {
+  border-radius: 3px;
+  -moz-margin-end: 6px;
+  -moz-margin-start: 4px;
+  padding: 1px 6px;
+}
+
+.webconsole-filter-button[checked="true"] {
+  box-shadow: @roundButtonPressedShadow@;
+  background: #d0d0d0;
+}
+
+.webconsole-filter-button > .toolbarbutton-menubutton-button {
+  -moz-appearance: none;
+  margin: 0;
+  padding: 1px 0;
+  list-style-image: url("chrome://global/skin/icons/webconsole.png");
+  -moz-box-orient: horizontal;
+}
+
+.webconsole-filter-button:hover:active,
+.webconsole-clear-console-button:hover:active {
+  text-shadow: @loweredShadow@;
+  box-shadow: @roundButtonPressedShadow@;
+  background: @roundButtonPressedBackground@;
+}
+
+.webconsole-clear-console-button > .toolbarbutton-text {
+  margin: 0;
 }
 
-.hud-filter-cat {
-  color: #6b6b6b;
-  font-weight: bold;
+.webconsole-filter-button > .toolbarbutton-menubutton-button > .toolbarbutton-text {
+  margin: 0 3px;
+}
+
+.webconsole-filter-button > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+  -moz-margin-start: 3px;
+}
+
+.webconsole-filter-button > .toolbarbutton-menubutton-dropmarker {
+  padding: 6px 3px 2px;
+  -moz-border-start: dotted #aaaaaa 1px;
+}
+
+/* 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 {
+  list-style-image: url("chrome://global/skin/icons/closetab.png");
+  margin-top: 0;
+  margin-bottom: 0;
+  -moz-margin-start: 3px;
+  -moz-margin-end: -14px;
+  min-width: 0;
+  -moz-appearance: none;
+}
+
+.webconsole-close-button:hover {
+  list-style-image: url("chrome://global/skin/icons/closetab-hover.png");
+}
+
+.webconsole-close-button:hover:active {
+  list-style-image: url("chrome://global/skin/icons/closetab-active.png");
 }
 
 /* JSTerm Styles */
 
 .jsterm-wrapper-node {
   font-family: monospace;
   font-size: 1em;
   background-color: #000;
@@ -183,20 +273,8 @@
   -moz-appearance: none;
   -moz-box-align: center;
 }
 
 .hud-console-filter-toolbar:-moz-lwtheme {
   border-top: @scopeBarSeparatorBorder@;
 }
 
-.jsterm-close-button {
-  list-style-image: url("chrome://global/skin/icons/console-close.png");
-  margin: 0px;
-  min-width: 0px;
-  padding: 1px 3px 1px 7px;
-  -moz-appearance: none;
-}
-
-.jsterm-close-button:active {
-  background-color: rgb(175, 175, 175);
-}
-