Bug 1512159 - Fix hiding of minimize and restore buttons in tablet mode. r=mconley

Differential Revision: https://phabricator.services.mozilla.com/D13800

--HG--
extra : moz-landing-system : lando

browser/base/content/browser.css

@@ -351,17 +351,6 @@ toolbarpaletteitem {
 }
 %endif
 
-%ifdef XP_WIN
-:root[sizemode="maximized"] #titlebar-buttonbox {
-  -moz-appearance: -moz-window-button-box-maximized;
-}
-
-:root[tabletmode] #titlebar-min,
-:root[tabletmode] #titlebar-max {
-  display: none !important;
-}
-%endif
-
 :root[inDOMFullscreen] #navigator-toolbox,
 :root[inDOMFullscreen] #fullscr-toggler,
 :root[inDOMFullscreen] #sidebar-box,

browser/themes/windows/browser.css

@@ -350,7 +350,7 @@
   }
 }
 
-/* titlebar command buttons */
+/* window control buttons */
 
 .titlebar-min {
   -moz-appearance: -moz-window-button-minimize;
@@ -360,7 +360,7 @@
   -moz-appearance: -moz-window-button-maximize;
 }
 
-#main-window[sizemode="maximized"] .titlebar-max {
+:root[sizemode="maximized"] .titlebar-max {
   -moz-appearance: -moz-window-button-restore;
 }
 
@@ -374,6 +374,11 @@
   }
 }
 
+:root[tabletmode] .titlebar-min,
+:root[tabletmode] .titlebar-max {
+  display: none;
+}
+
 /* ::::: bookmark menus ::::: */
 
 menu.bookmark-item,