Backout b420dcf17910 for bustage on some slaves. CLOSED TREE. r=me
authorBrian R. Bondy <netzen@gmail.com>
Thu, 28 Mar 2013 23:29:16 -0400
changeset 126676 088d73e55949ec3063b5da92ed3b76bcd25c6a34
parent 126675 85eedb253f255e287b80074668a8675435577529
child 126677 53b183fe1d6262fec8dde644b40423ff09b9568d
push idunknown
push userunknown
push dateunknown
reviewersme
milestone22.0a1
backs outb420dcf17910b4150402127de32281a46cca8490
Backout b420dcf17910 for bustage on some slaves. CLOSED TREE. r=me
browser/metro/theme/images/exitfullscreen-hdpi.png
browser/metro/theme/images/fullscreen-hdpi.png
browser/metro/theme/jar.mn
browser/metro/theme/touchcontrols.css
deleted file mode 100644
index 826e5340843246732f7001c836f4a3ec37681c86..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 980e787310a9a1391715ba8d3b9bd9bfbc2b5b5c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/metro/theme/jar.mn
+++ b/browser/metro/theme/jar.mn
@@ -72,13 +72,11 @@ chrome.jar:
   skin/images/identity-ev-hdpi.png          (images/identity-ev-hdpi.png)
   skin/images/unlocked-hdpi.png             (images/unlocked-hdpi.png)
   skin/images/locked-hdpi.png               (images/locked-hdpi.png)
   skin/images/search-glass-30.png           (images/search-glass-30.png)
   skin/images/play-hdpi.png                 (images/play-hdpi.png)
   skin/images/pause-hdpi.png                (images/pause-hdpi.png)
   skin/images/mute-hdpi.png                 (images/mute-hdpi.png)
   skin/images/unmute-hdpi.png               (images/unmute-hdpi.png)
-  skin/images/fullscreen-hdpi.png           (images/fullscreen-hdpi.png)
-  skin/images/exitfullscreen-hdpi.png       (images/exitfullscreen-hdpi.png)
   skin/images/scrubber-hdpi.png             (images/scrubber-hdpi.png)
   skin/images/selection-monocle.png         (images/selection-monocle.png)
   skin/images/appbar-icons.png              (images/appbar-icons.png)
--- a/browser/metro/theme/touchcontrols.css
+++ b/browser/metro/theme/touchcontrols.css
@@ -22,59 +22,46 @@
   width: 100%;
 }
 
 .controlsSpacer {
   display: none;
   -moz-box-flex: 0;
 }
 
-.fullscreenButton,
 .playButton,
 .muteButton {
   -moz-appearance: none;
   min-height: 42px;
   min-width: 42px;
   border: none !important;
 }
 
-.fullscreenButton {
-  background: url("chrome://browser/skin/images/fullscreen-hdpi.png") no-repeat center;
-}
-
-.fullscreenButton[fullscreened="true"] {
-  background: url("chrome://browser/skin/images/exitfullscreen-hdpi.png") no-repeat center;
-}
-
 .playButton {
+  transform: translateX(21px);
   background: url("chrome://browser/skin/images/pause-hdpi.png") no-repeat center;
 }
 
-/*
- * Normally the button bar has fullscreen spacer play spacer mute, but if
- * this is an audio control rather than a video control, the fullscreen button
- * is hidden by videocontrols.xml, and that alters the position of the
- * play button.  This workaround moves it back to center.
- */
-.controlBar.audio .playButton {
-  transform: translateX(28px);
-}
-
 .playButton[paused="true"] {
   background: url("chrome://browser/skin/images/play-hdpi.png") no-repeat center;
 }
 
 .muteButton {
   background: url("chrome://browser/skin/images/mute-hdpi.png") no-repeat center;
 }
 
 .muteButton[muted="true"] {
   background: url("chrome://browser/skin/images/unmute-hdpi.png") no-repeat center;
 }
 
+/* This button is hidden until bug 704229 is fixed. */
+.fullscreenButton {
+  display: none;
+}
+
 /* bars */
 .scrubberStack {
   width: 100%;
   min-height: 32px;
   max-height: 32px;
   padding: 0px 8px;
   margin: 0px;
 }