Merge pull request #18186 from pivanov/bug-994745
authorPavel Ivanov <pivanov@mozilla.com>
Thu, 17 Apr 2014 22:23:15 +0300
changeset 30334 b0252a5e2c49
parent 30332 b26483c91cf6 (current diff)
parent 30333 bb11cee9514c (diff)
child 30336 26614c51b294
push id6681
push uservcs-sync@mozilla.com
push date2014-04-17 19:31 +0000
bugs18186, 994745
Merge pull request #18186 from pivanov/bug-994745

Bug 994745 - [VDR][Wallpaper] Apply Buttons and Input areas [BB]
--- a/apps/wallpaper/share.html
+++ b/apps/wallpaper/share.html
@@ -1,27 +1,27 @@
 <!DOCTYPE html>
 <html>
   <head>
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
     <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 -->
     <script type="text/javascript" src="shared/js/l10n.js"></script>
     <script defer src="shared/js/gesture_detector.js"></script>
     <!-- Specific code -->
     <script type="text/javascript" defer src="js/share.js"></script>
   </head>
 
   <body>
     <div id="preview">
       <img id="previewImage" />
     </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>
--- a/apps/wallpaper/style/wallpaper.css
+++ b/apps/wallpaper/style/wallpaper.css
@@ -35,28 +35,24 @@ html, body {
   left: 0;
   top: 0;
   width: 100%;
   height: 100%;
   overflow:hidden;
 }
 
 #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%;
-}