Merge pull request #3687 from bechi/bug/button

fix button on small device
bitpay · Dec 16, 2015 · c7bc2a1 · c7bc2a1
2 parents a3f76c8 + 2f2f0c8
commit c7bc2a1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html
@@ -1,32 +1,27 @@
-<div class="splash content text-center"
+<div class="splash extra-padding-bottom p20t content text-center"
   ng-controller="disclaimerController as disclaimer" ng-init="disclaimer.init()">
   <div class="row">
-    <div class="container-image large-2 medium-2 small-2 medium-centered small-centered large-centered columns">
-    <img src="img/icon-splash.png" alt="icon" width="100%">
-  </div>
-  <div class="row">
-    <div class="medium-centered small-centered large-centered columns">
-      <span class="text-bold size-16 text-white" translate>WELCOME TO COPAY</span>
-      <p class="text-gray size-14 m0 text-light" translate>A multisignature bitcoin wallet</p>
+    <div class="medium-centered small-centered large-centered columns size-14">
+      <span class="text-bold text-white" translate>WELCOME TO COPAY</span>
+      <p class="text-gray m0 text-light" translate>A multisignature bitcoin wallet</p>
     </div>
   </div>
   <div class="row">
     <div class="scrollArea">
       <p class="enable_text_select m0">
-        <div class="size-16 text-gray" translate>Terms of Use</div>
+        <div class="size-14 text-gray" translate>Terms of Use</div>
         <div ng-include="'views/includes/terms.html'"></div>
       </p>
     </div>
   </div>
-  </div>
 
   <div class="row">
     <p ng-show="disclaimer.lang != 'en'">
       <a class="center" ng-click="$root.openExternalLink('https://copay.io/disclaimer')" translate>Official English Disclaimer</a>
     </p>
   </div>
   <div>
-      <p class="text-gray columns" translate>I affirm that I have read, understood, and agree with these terms.</p>
+      <p class="text-gray columns size-12" translate>I affirm that I have read, understood, and agree with these terms.</p>
   </div>
   <div class="row">
 
@@ -42,8 +37,8 @@
         <span translate>Creating Wallet...</span>
       </div>
     </div>
-    <div class="start-button columns">
-      <button ng-disabled="creatingProfile" ng-click="index.acceptDisclaimer()" class="button black expand round size-12 text-spacing" translate>
+    <div class="start-button columns button-box">
+      <button ng-disabled="creatingProfile" ng-click="index.acceptDisclaimer()" class="button black expand round size-12 text-spacing m0" translate>
         I AGREE. GET STARTED
       </button>
     </div>

diff --git a/src/css/main.css b/src/css/main.css
@@ -396,16 +396,23 @@ ul.tx-copayers {
   border-bottom: none;
 }
 
-.backup .button-box {
-  background: #F1F3F5;
+.button-box {
   position: fixed;
   bottom: 0;
   left: 0;
   width: 100%;
-  padding: 0.5rem 1rem 1rem;
+  padding: 0.8rem;
   z-index: 9999;
 }
 
+.backup .button-box {
+  background: #F6F7F9;
+}
+
+.splash .button-box {
+  background: #2C3E50;
+}
+
 .backup input[type="text"] {
   border-bottom: 1px solid #CAD4DB;
 }
@@ -1223,16 +1230,18 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   background: #213140;
   border: 1px solid #4B6178;
   border-radius: 5px;
-  margin: 1.6rem;
+  margin: 1rem;
   color: #A5B2BF;
   line-height: 30px;
   padding: 0.5rem;
 }
 
 .scrollArea ul {
   font-size: 0.8rem;
-  text-align: justify;
+  text-align: left;
   margin-left: 0;
+  line-height: 1.4;
+  margin-bottom: 0;
 }
 
 .scrollArea li {