Merge pull request #18186 from pivanov/bug-994745

Bug 994745 - [VDR][Wallpaper] Apply Buttons and Input areas [BB]
mozilla-b2g · Apr 17, 2014 · 341bb57 · 341bb57
2 parents 70d327a + 6ab2164
commit 341bb57
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/apps/wallpaper/share.html b/apps/wallpaper/share.html
@@ -5,7 +5,7 @@
     <meta charset="utf-8" />
     <title>Wallpaper</title>
     <link rel="stylesheet" type="text/css" href="style/wallpaper.css"/>
-    <link rel="stylesheet" type="text/css" href="shared/style/buttons.css"/>
+    <link rel="stylesheet" type="text/css" href="shared/style_unstable/buttons.css"/>
     <!-- Localization -->
     <link rel="resource" type="application/l10n" href="locales/locales.ini" />
     <!-- Shared code -->
@@ -21,7 +21,7 @@
     </div>
     <div id="buttons">
       <button id="cancel" data-l10n-id="cancel"></button>
-      <button id="set-wallpaper" data-l10n-id="setaswallpaper"></button>
+      <button id="set-wallpaper" class="recommend" data-l10n-id="setaswallpaper"></button>
     </div>
   </body>
 </html>
diff --git a/apps/wallpaper/style/wallpaper.css b/apps/wallpaper/style/wallpaper.css
@@ -40,23 +40,19 @@ html, body {
 }
 
 #buttons {
+  -moz-box-sizing: border-box;
   position: absolute;
+  bottom: 0;
   left: 0;
   width: 100%;
-  bottom: 0;
-  height: 5rem;
+  height: 7rem;
+  padding: 1.5rem 1rem;
+  font-size: 0;
+  white-space: nowrap;
 }
 
-#buttons > #set-wallpaper {
-  position: absolute;
-  left: 50%;
-  width: 50%;
-  height: 100%;
+#buttons button {
+  width: calc((100% - 2rem) / 2);
+  margin: 0 0.5rem;
 }
 
-#buttons > #cancel {
-  position: absolute;
-  left: 0;
-  width: 50%;
-  height: 100%;
-}