Backed out changeset 99ae0e6a6fec (bug 885242)

browser/metro/base/content/browser.xul

@@ -282,14 +282,10 @@
                      completeselectedindex="true"
                      placeholder="&urlbar.emptytext;"/>
 
-            <toolbarbutton id="go-button" class="urlbar-button"
-                           command="cmd_go"/>
-            <toolbarbutton id="reload-button" class="urlbar-button"
-                           oncommand="CommandUpdater.doCommand(
-                                        event.shiftKey ? 'cmd_forceReload'
-                                                       : 'cmd_reload');"/>
-            <toolbarbutton id="stop-button" class="urlbar-button"
-                           command="cmd_stop"/>
+            <toolbarbutton id="reload-button" oncommand="
+              CommandUpdater.doCommand(event.shiftKey ? 'cmd_forceReload'
+                                                      : 'cmd_reload');"/>
+            <toolbarbutton id="stop-button" command="cmd_stop"/>
           </hbox>
 
           <toolbarbutton id="download-button" class="appbar-secondary"

browser/metro/theme/browser.css

@@ -570,108 +570,20 @@ documenttab[selected] .documenttab-selection {
 }
 
 /* Combined stop-reload button */
-.urlbar-button {
-  -moz-image-region: rect(0px, 30px, 30px, 0px);
-}
-
-.urlbar-button:hover:not(:active) {
-  -moz-image-region: rect(0px, 60px, 30px, 30px);
-  background-color: #dedfdf;
-}
-
-.urlbar-button:active {
-  -moz-image-region: rect(0px, 90px, 30px, 60px);
-  background-color: #6d7073;
-}
-
-.urlbar-button  > .toolbarbutton-icon {
-  width: 30px;
-  height: 30px;
-}
-
-#go-button {
-  list-style-image: url(chrome://browser/skin/images/urlbar-go.png)
-}
-
 #reload-button {
-  list-style-image: url(chrome://browser/skin/images/urlbar-reload.png);
+  list-style-image: url(chrome://browser/skin/images/appbar-reload.png);
 }
 
 #stop-button {
-  list-style-image: url(chrome://browser/skin/images/urlbar-stop.png);
+  list-style-image: url(chrome://browser/skin/images/appbar-stop.png);
 }
 
-@media (min-resolution: @min_res_140pc@) {
-  .urlbar-button {
-    -moz-image-region: rect(0px, 42px, 42px, 0px);
-  }
-
-  .urlbar-button:hover:not(:active) {
-    -moz-image-region: rect(0px, 84px, 42px, 42px);
-  }
-
-  .urlbar-button:active {
-    -moz-image-region: rect(0px, 126px, 42px, 84px);
-  }
-
-  #go-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-go@1.4x.png)
-  }
-
-  #reload-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-reload@1.4x.png);
-  }
-
-  #stop-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-stop@1.4x.png);
-  }
-}
-
-@media (min-resolution: @min_res_180pc@) {
-  .urlbar-button {
-    -moz-image-region: rect(0px, 54px, 54px, 0px);
-  }
-
-  .urlbar-button:hover:not(:active) {
-    -moz-image-region: rect(0px, 108px, 54px, 54px);
-  }
-
-  .urlbar-button:active {
-    -moz-image-region: rect(0px, 162px, 54px, 108px);
-  }
-
-  #go-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-go@1.8x.png)
-  }
-
-  #reload-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-reload@1.8x.png);
-  }
-
-  #stop-button {
-    list-style-image: url(chrome://browser/skin/images/urlbar-stop@1.8x.png);
-  }
-}
-
-#urlbar:-moz-any([mode="loading"], [mode="view"]) > #go-button,
-#urlbar:-moz-any([mode="edit"], [mode="loading"]) > #reload-button,
+#urlbar[mode="loading"] > #reload-button,
 #urlbar:-moz-any([mode="edit"], [mode="view"]) > #stop-button,
 #toolbar[viewstate="snapped"] > #urlbar ~ toolbarbutton {
   visibility: collapse;
 }
 
-/* Application-Specific */
-
-#download-button {
-  -moz-image-region: rect(0px, 40px, 40px, 0px) !important;
-}
-#download-button:hover {
-  -moz-image-region: rect(40px, 40px, 80px, 0px) !important;
-}
-#download-button:active {
-  -moz-image-region: rect(80px, 40px, 120px, 0px) !important;
-}
-
 /* Page-Specific */
 
 #pin-button {
@@ -714,6 +626,18 @@ documenttab[selected] .documenttab-selection {
   }
 }
 
+/* Application-Specific */
+
+#download-button {
+  -moz-image-region: rect(0px, 40px, 40px, 0px) !important;
+}
+#download-button:hover {
+  -moz-image-region: rect(40px, 40px, 80px, 0px) !important;
+}
+#download-button:active {
+  -moz-image-region: rect(80px, 40px, 120px, 0px) !important;
+}
+
 /* Panel UI ================================================================ */
 
 #panel-container {

browser/metro/theme/jar.mn

@@ -37,15 +37,8 @@ chrome.jar:
   skin/images/navbar-menu.png               (images/navbar-menu.png)
   skin/images/navbar-menu@1.4x.png          (images/navbar-menu@1.4x.png)
   skin/images/navbar-menu@1.8x.png          (images/navbar-menu@1.8x.png)
-  skin/images/urlbar-go.png                 (images/urlbar-go.png)
-  skin/images/urlbar-go@1.4x.png            (images/urlbar-go@1.4x.png)
-  skin/images/urlbar-go@1.8x.png            (images/urlbar-go@1.8x.png)
-  skin/images/urlbar-reload.png             (images/urlbar-reload.png)
-  skin/images/urlbar-reload@1.4x.png        (images/urlbar-reload@1.4x.png)
-  skin/images/urlbar-reload@1.8x.png        (images/urlbar-reload@1.8x.png)
-  skin/images/urlbar-stop.png               (images/urlbar-stop.png)
-  skin/images/urlbar-stop@1.4x.png          (images/urlbar-stop@1.4x.png)
-  skin/images/urlbar-stop@1.8x.png          (images/urlbar-stop@1.8x.png)
+  skin/images/appbar-reload.png             (images/appbar-reload.png)
+  skin/images/appbar-stop.png               (images/appbar-stop.png)
   skin/images/newtab-default.png            (images/newtab-default.png)
   skin/images/closetab-default.png          (images/closetab-default.png)
   skin/images/tab-arrows.png                (images/tab-arrows.png)