Aero style: Remove commented-out code + fix typoes, also apply transition effects to dark accented caption buttons.

1 files changed, 28 insertions, 81 deletions

diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index 4b1162913..68bb59a9c 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -175,14 +175,6 @@
 
   @media (-moz-os-version: windows-win10) {
     /* Draw XUL caption buttons Win10 in lwthemes */
-    /*
-	@media (-moz-windows-default-theme) {
-      #main-window {
-        /* Bleach it a little less than bright white, thanks.
-        background-color: hsl(0, 0%, 90%);
-      }
-    } 
-	*/
 
     #titlebar-buttonbox,
     .titlebar-button {
@@ -213,24 +205,6 @@
       margin-top: -4px;
     }
 
-	/*
-    #titlebar-min {
-      list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize);
-    }
-
-    #titlebar-max {
-      list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize);
-    }
-
-    #main-window[sizemode="maximized"] #titlebar-max {
-      list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore);
-    }
-
-    #titlebar-close {
-      list-style-image: url(chrome://browser/skin/caption-buttons.svg#close);
-    }
-	*/
-	
 	#main-window[sizemode="maximized"] #titlebar-close {
       padding-right: 19px;
     }
@@ -324,68 +298,41 @@
       }
     }
 
-    /*@media (-moz-windows-default-theme) {*/
-      .titlebar-button:hover {
-        background-color: hsla(0, 0%, 0%, .12);
-        transition: background-color linear 100ms;
-      }
+    .titlebar-button:hover {
+      background-color: hsla(0, 0%, 0%, .12);
+      transition: background-color linear 100ms;
+    }
 
-      .titlebar-button:hover:active {
-        background-color: hsla(0, 0%, 0%, .22);
-        transition: none;
-      }
+    .titlebar-button:hover:active {
+      background-color: hsla(0, 0%, 0%, .22);
+      transition: none;
+    }
 
-      .titlebar-button:not(:hover) > .toolbarbutton-icon:-moz-window-inactive {
-        opacity: 0.5;
-      }
+    .titlebar-button:not(:hover) > .toolbarbutton-icon:-moz-window-inactive {
+      opacity: 0.5;
+    }
 
-      #titlebar-close:hover {
-        background-color: hsl(355, 86%, 49%);
-      }
+    #titlebar-close:hover {
+      background-color: hsl(355, 86%, 49%);
+    }
 
-      #titlebar-close:hover:active {
-        background-color: hsl(355, 82%, 69%);
-      }
+    #titlebar-close:hover:active {
+      background-color: hsl(355, 82%, 69%);
+    }
           
-      /* dark persona/titlebar */
-      .titlebar-button:-moz-lwtheme-brighttext:hover,
-      #main-window[darkwindowframe="true"] .titlebar-button:hover {
-        background-color: hsla(0, 0%, 255%, .22);
-      }
-
-      .titlebar-button:-moz-lwtheme-brighttext:hover:active,
-      #main-window[darkwindowframe="true"] .titlebar-button:hover:active	{
-        background-color: hsla(0, 0%, 255%, .32);
-      }
-    /*}*/
-      
-    /*  
-    @media not all and (-moz-windows-default-theme) {
-      .titlebar-button {
-        background-color: -moz-field;
-      }
-      .titlebar-button:hover {
-        background-color: Highlight;
-      }
-
-      #titlebar-min:hover {
-        list-style-image: url(chrome://browser/skin/caption-buttons.svg#minimize-highlight);
-      }
-
-      #titlebar-max:hover {
-        list-style-image: url(chrome://browser/skin/caption-buttons.svg#maximize-highlight);
-      }
-
-      #main-window[sizemode="maximized"] #titlebar-max:hover {
-        list-style-image: url(chrome://browser/skin/caption-buttons.svg#restore-highlight);
-      }
+    /* dark persona/titlebar */
+    .titlebar-button:-moz-lwtheme-brighttext:hover,
+    #main-window[darkwindowframe="true"] .titlebar-button:hover {
+      background-color: hsla(0, 0%, 100%, .22);
+      transition: background-color linear 100ms;
+    }
 
-      #titlebar-close:hover {
-        list-style-image: url(chrome://browser/skin/caption-buttons.svg#close-highlight);
-      }
+    .titlebar-button:-moz-lwtheme-brighttext:hover:active,
+    #main-window[darkwindowframe="true"] .titlebar-button:hover:active	{
+      background-color: hsla(0, 0%, 100%, .32);
+      transition: none;
     }
-	*/
-        
+      
     #appmenu-button {
       margin-top: -1px;
       margin-bottom: 5px;