Bug 684561 - Improve styling of Web Console on Windows r=dao

browser/devtools/webconsole/HUDService.jsm

@@ -3615,7 +3615,9 @@ HeadsUpDisplay.prototype = {
     toolbar.setAttribute("class", "hud-console-filter-toolbar");
     toolbar.setAttribute("mode", "full");
 
+#ifdef XP_MAC
     this.makeCloseButton(toolbar);
+#endif
 
     for (let i = 0; i < BUTTONS.length; i++) {
       this.makeFilterButton(toolbar, BUTTONS[i]);
@@ -3629,6 +3631,10 @@ HeadsUpDisplay.prototype = {
     toolbar.appendChild(this.filterBox);
     this.makeClearConsoleButton(toolbar);
 
+#ifndef XP_MAC
+    this.makeCloseButton(toolbar);
+#endif
+
     return toolbar;
   },
 

browser/devtools/webconsole/Makefile.in

@@ -45,13 +45,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_JS_MODULES = \
-		HUDService.jsm \
 		PropertyPanel.jsm \
 		NetworkHelper.jsm \
 		AutocompletePopup.jsm \
 		gcli.jsm \
 		$(NULL)
 
+EXTRA_PP_JS_MODULES = \
+		HUDService.jsm \
+		$(NULL)
+
 ifdef ENABLE_TESTS
 ifneq (mobile,$(MOZ_BUILD_APP))
 	DIRS += test

toolkit/themes/winstripe/global/webConsole.css

@@ -159,6 +159,17 @@
   list-style-image: url("chrome://global/skin/icons/webconsole.png");
 }
 
+.webconsole-filter-button > .toolbarbutton-menubutton-button,
+.webconsole-filter-button > .toolbarbutton-menubutton-button:hover:active {
+  -moz-padding-start: 6px;
+  -moz-padding-end: 3px;
+}
+
+.webconsole-filter-button {
+  -moz-margin-start: 3px;
+  -moz-margin-end: 3px;
+}
+
 /* Network styles */
 .webconsole-filter-button[category="net"] {
   -moz-image-region: rect(0, 8px, 8px, 0);
@@ -314,7 +325,7 @@
 }
 
 .hud-console-filter-toolbar {
-  padding: 1px 0px;
+  padding: 1px 2px;
   -moz-box-align: center;
   -moz-appearance: none;
   background-color: -moz-dialog;