Bug 1005031 - Video controls are displayed in the middle of the video. r=wesj, a=lmandel
authorDanny Chen <dannychen210@gmail.com>
Thu, 19 Jun 2014 13:28:00 +0200
changeset 208169 5a6749df6a78
parent 208168 2339e39f5ff4
child 208170 4767a3451d00
push id3753
push userryanvm@gmail.com
push date2014-07-28 14:29 +0000
treeherdermozilla-beta@ecfc5bee1685 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswesj, lmandel
bugs1005031
milestone32.0
Bug 1005031 - Video controls are displayed in the middle of the video. r=wesj, a=lmandel
b2g/chrome/content/touchcontrols.css
mobile/android/themes/core/touchcontrols.css
--- a/b2g/chrome/content/touchcontrols.css
+++ b/b2g/chrome/content/touchcontrols.css
@@ -8,16 +8,22 @@
 .controlsOverlay {
   -moz-box-pack: center;
   -moz-box-align: end;
   padding: 20px;
   -moz-box-flex: 1;
   -moz-box-orient: horizontal;
 }
 
+.controlsOverlay[scaled] {
+  /* scaled attribute in videocontrols.css causes conflict
+     due to different -moz-box-orient values */
+  -moz-box-align: end;
+}
+
 .controlBar {
   -moz-box-flex: 1;
   font-size: 16pt;
   padding: 10px;
   background-color: rgba(50,50,50,0.8);
   border-radius: 8px;
   width: 100%;
 }
--- a/mobile/android/themes/core/touchcontrols.css
+++ b/mobile/android/themes/core/touchcontrols.css
@@ -8,16 +8,22 @@
 .controlsOverlay {
   -moz-box-pack: center;
   -moz-box-align: end;
   padding: 20px;
   -moz-box-flex: 1;
   -moz-box-orient: horizontal;
 }
 
+.controlsOverlay[scaled] {
+  /* scaled attribute in videocontrols.css causes conflict
+     due to different -moz-box-orient values */
+  -moz-box-align: end;
+}
+
 .controlBar {
   -moz-box-flex: 1;
   font-size: 16pt;
   padding: 10px;
   background-color: rgba(50,50,50,0.8);
   border-radius: 8px;
   width: 100%;
 }