--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1024,76 +1024,145 @@ toolbar[brighttext] .toolbarbutton-1 > .
* padding (2 * 2px) + border (2 * 1px), but as a minimum because otherwise
* increase in text sizes would break things...
*/
min-height: 24px;
}
/* ::::: fullscreen window controls ::::: */
-#window-controls {
- margin-inline-start: 4px;
-}
-
-#minimize-button,
-#restore-button,
-#close-button {
- list-style-image: url("chrome://global/skin/icons/windowControls.png");
- padding: 0;
-}
+ #minimize-button,
+ #restore-button,
+ #close-button {
+ -moz-appearance: none;
+ border: none;
+ margin: 0 !important;
+ padding: 6px 12px;
+ }
#minimize-button {
- -moz-image-region: rect(0, 16px, 16px, 0);
-}
-#minimize-button:hover {
- -moz-image-region: rect(16px, 16px, 32px, 0);
-}
-#minimize-button:hover:active {
- -moz-image-region: rect(32px, 16px, 48px, 0);
-}
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize);
+ }
+
#restore-button {
- -moz-image-region: rect(0, 32px, 16px, 16px);
-}
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore);
+ }
+
+#minimize-button:hover,
#restore-button:hover {
- -moz-image-region: rect(16px, 32px, 32px, 16px);
-}
+ background-color: hsla(0, 0%, 0%, .12);
+}
+
+#minimize-button:hover:active,
#restore-button:hover:active {
- -moz-image-region: rect(32px, 32px, 48px, 16px);
-}
+ background-color: hsla(0, 0%, 0%, .22);
+}
+
#close-button {
- -moz-image-region: rect(0, 48px, 16px, 32px);
- -moz-appearance: none;
- border-style: none;
- margin: 2px;
-}
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#close);
+ }
+
#close-button:hover {
- -moz-image-region: rect(16px, 48px, 32px, 32px);
-}
+ background-color: hsl(355, 86%, 49%);
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white);
+}
+
#close-button:hover:active {
- -moz-image-region: rect(32px, 48px, 48px, 32px);
-}
-
-@media not all and (-moz-os-version: windows-xp) {
+ background-color: hsl(355, 82%, 69%);
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white);
+}
+
+toolbar[brighttext] #minimize-button {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-white);
+}
+
+toolbar[brighttext] #restore-button {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-white);
+}
+
+toolbar[brighttext] #close-button {
+ list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-white);
+}
+
+@media (-moz-os-version: windows-xp),
+ (-moz-os-version: windows-vista),
+ (-moz-os-version: windows-win7) {
+ #window-controls {
+ margin-inline-start: 4px;
+ }
+
+ #minimize-button,
+ #restore-button,
+ #close-button {
+ list-style-image: url("chrome://global/skin/icons/windowControls.png");
+ padding: 0;
+ }
+
+ #minimize-button {
+ -moz-image-region: rect(0, 16px, 16px, 0);
+ }
+
+ #minimize-button:hover {
+ -moz-image-region: rect(16px, 16px, 32px, 0);
+ }
+
+ #minimize-button:hover:active {
+ -moz-image-region: rect(32px, 16px, 48px, 0);
+ }
+
+ #restore-button {
+ -moz-image-region: rect(0, 32px, 16px, 16px);
+ }
+
+ #restore-button:hover {
+ -moz-image-region: rect(16px, 32px, 32px, 16px);
+ }
+
+ #restore-button:hover:active {
+ -moz-image-region: rect(32px, 32px, 48px, 16px);
+ }
+
+ #close-button {
+ -moz-image-region: rect(0, 48px, 16px, 32px);
+ -moz-appearance: none;
+ border-style: none;
+ margin: 2px;
+ }
+
+ #close-button:hover {
+ -moz-image-region: rect(16px, 48px, 32px, 32px);
+ }
+
+ #close-button:hover:active {
+ -moz-image-region: rect(32px, 48px, 48px, 32px);
+ }
+}
+
+@media (-moz-os-version: windows-vista),
+ (-moz-os-version: windows-win7) {
#window-controls {
-moz-box-align: start;
}
#minimize-button,
#restore-button,
#close-button {
-moz-appearance: none;
border-style: none;
margin: 0;
}
+
#close-button {
-moz-image-region: rect(0, 49px, 16px, 32px);
}
+
#close-button:hover {
-moz-image-region: rect(16px, 49px, 32px, 32px);
}
+
#close-button:hover:active {
-moz-image-region: rect(32px, 49px, 48px, 32px);
}
#minimize-button:-moz-locale-dir(rtl),
#restore-button:-moz-locale-dir(rtl),
#close-button:-moz-locale-dir(rtl) {
transform: scaleX(-1);