remaining styling fixes

pbca26 · Jun 24, 2018 · bef974d · bef974d
1 parent cfc39eb
commit bef974d
Show file tree

Hide file tree

Showing 13 changed files with 189 additions and 143 deletions.
diff --git a/client/main.html b/client/main.html
@@ -1,5 +1,6 @@
 <head>
   <title>Agama Wallet Mobile</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>
 
 <body id="body">

diff --git a/client/styles/main.scss b/client/styles/main.scss
@@ -20,6 +20,7 @@ body {
   right: 13px;
   z-index: 10;
   font-size: 20px;
+  display: none;
 }
 
 .text-center {
@@ -108,5 +109,5 @@ button:disabled {
 .sz350 {
   width: 100%;
   margin: 0 auto;
-  max-width: 330px;
+  max-width: 320px;
 }
diff --git a/client/styles/overview.scss b/client/styles/overview.scss
@@ -3,7 +3,7 @@
   padding: 0 10px;
 
   .home-inner {
-    width: 375px;
+    max-width: 375px;
     height: 100%;
     position:relative;
     margin: auto;
@@ -41,7 +41,7 @@
     background-color: rgba(255, 255, 255, 0.0);
     top: 34px;
     height: 220px;
-    width: 347px;
+    width: 340px;
     position: absolute;
     margin: 0;
     left: 0;
@@ -61,7 +61,7 @@
     background-color: rgba(255, 255, 255, 0.0);
     top: 0;
     height: 150px;
-    width: 345px;
+    width: 340px;
     position: absolute;
     margin: 0;
     left: 1px
@@ -71,7 +71,7 @@
     background-color: rgba(255, 255, 255, 0.0);
     top: 0;
     height: 150px;
-    width: 345px;
+    width: 340px;
     position: relative;
     margin: 0;
     left: 0;
@@ -416,14 +416,14 @@
   /* coin */
   .home {
     .overview-coins {
-      width: 347px;
+      width: 340px;
       margin: 0;
 
       .overview-coin {
         height: 80px;
 
         .div1 {
-          width: 347px;
+          width: 340px;
         }
 
         &:last-child {
@@ -465,7 +465,7 @@
     width: 10px;
     position: absolute;
     margin: 0;
-    left: 345px
+    left: 340px
   }
 
   .home .btc {

diff --git a/client/styles/receive.scss b/client/styles/receive.scss
@@ -3,8 +3,7 @@
   left: 0;
   top: 60px;
   background:#4c4f69;
-  width: 100%;
-  height: 100vh;
+  width: 345px;
   padding-top: 15px;
   text-align: center;
 

diff --git a/client/styles/send.scss b/client/styles/send.scss
@@ -1,8 +1,8 @@
 .form.send {
   .edit {
     font-size: 14px;
-    width: 100%;
-    max-width: 100%;
+    width: inherit;
+    max-width: inherit;
     padding: 15px 10px 10px 10px;
 
     input {
@@ -105,7 +105,8 @@
   }
   .btn-inner {
     &.pull-left {
-      margin-left: 20px;
+      margin-left: 10px;
+      padding: 0 10px;
 
       .group2 {
         float: left;
@@ -114,7 +115,7 @@
       .btn {
         float: right;
         position: relative;
-        left: 48px;
+        left: 40px;
         top: 1px;
         padding-right: 50px;
       }
@@ -124,7 +125,14 @@
       }
     }
     &.pull-right {
-      margin-right: 20px;
+      margin-right: 10px;
+      padding: 0 10px;
+
+      .btn {
+        position: relative;
+        left: 8px;
+        top: 0;
+      }
     }
   }
 }
diff --git a/client/styles/transactions.scss b/client/styles/transactions.scss
@@ -1,12 +1,18 @@
+@media only screen and (max-width : 370px) {
+  .app-main .transactions-ui {
+    padding-left: 7px;
+    padding-right: 0;
+  }
+}
+
 .transactions-ui {
   min-height: 100vh;
   padding: 0 10px;
   padding-top: 30px;
 
   .individualportfolio-inner {
-    width: 375px;
-    height: 100%;
-    position:relative;
+    width: 375px;    
+    position: relative;
     margin: auto;
     min-height: 100vh;
   }
@@ -15,16 +21,16 @@
     width: 100%;
     min-height: 100vh;
     position: relative;
-    overflow: hidden;
+    overflow-x: hidden;
     margin: 0;
   }
 
   a {
-    text-decoration: none
+    text-decoration: none;
   }
 
   div {
-    -webkit-text-size-adjust: none
+    -webkit-text-size-adjust: none;
   }
 
   .individualportfolio .lasttransactions {
@@ -34,7 +40,7 @@
     width: auto;
     position: absolute;
     margin: 0;
-    left: 0;
+    left: 3px;
     font-family: 'AppleSystemUIFont', Helvetica, Arial, serif;
     font-size: 18.0px;
     color: rgba(255, 255, 255, 1.0);
@@ -46,7 +52,7 @@
   .cryptocardbtc-block {
     border-radius: 4px;
     max-width: 345px;
-    width: calc(100vw - 20px);
+    width: calc(100vw - 12px);
     height: 145px;
     background: url('/images/template/transactions/gradient.png') no-repeat;  
   }
@@ -55,7 +61,7 @@
     background-color: rgba(255, 255, 255, 0.0);
     height: 145px;
     max-width: 347px;
-    width: calc(100vw - 20px);
+    width: calc(100vw - 12px);
     position: absolute;
     margin: 0;
     left: 0;
@@ -123,18 +129,18 @@
     background-color: rgba(255, 255, 255, 0.0);
     padding-top: 53px;
     height: 1px;
-    width: 375px;
+    width: 357px;
     position: absolute;
     margin: 0;
     left: -14px;
     opacity: .1
   }
 
   .individualportfolio .transactions-list {
-    top: 292px;
-    position: absolute;
-    left: 0;
-  
+    margin-top: 145px;
+    position: relative;
+    left: 4px;
+
     .item {
       height: 88px;
       width: 335px;
@@ -268,16 +274,16 @@
 
 .send-receive-block {
   position: absolute;
-  top: 232px;
-  width: 100%;
-  text-align: center;
+  top: 168px;
+  max-width: 345px;
+  width: calc(100vw - 12px);
   z-index: 10;
 
   .send-receive-block-inner {
+    text-align: center;
     display: inline-block;
-    text-align: left;
     margin: 0 auto;
-    width: 278px;
+    width: 345px;
 
     button {
       background-color: rgba(255, 255, 255, 0);
@@ -314,14 +320,15 @@
     }
   }
   &.three-btn {
-    padding: 0 10px;
+    width: inherit;
+    max-width: inherit;
 
     .send-receive-block-inner {
-      text-align: left;
-      width: 393px;
+      max-width: 345px;
+      width: calc(100vw - 12px);
 
       button {
-        width: 101px;
+        width: calc(345px/3 - 16px);
       }
     }
   }

diff --git a/imports/ui/actions/listtransactions.js b/imports/ui/actions/listtransactions.js
@@ -35,7 +35,7 @@ export const listtransactions = (proxyServer, electrumServer, address, network,
             proto: electrumServer.proto,
             address,
             raw: true,
-            maxlength: 2,
+            // maxlength: 2,
           },
         }, (error, result) => {
           result = JSON.parse(result.content);

diff --git a/imports/ui/components/Balance.js b/imports/ui/components/Balance.js
diff --git a/imports/ui/components/CreateSeed.js b/imports/ui/components/CreateSeed.js
@@ -167,7 +167,9 @@ class CreateSeed extends React.Component {
               <div className="btn">Sign In</div>
               <div className="group2">
                 <div className="rectangle8copy"></div>
-                <img className="path6" src="/images/template/login/reset-password-path-6.png" />
+                <img
+                  className="path6"
+                  src="/images/template/login/reset-password-path-6.png" />
               </div>
             </div>
           </div>

diff --git a/imports/ui/components/Login.js b/imports/ui/components/Login.js
@@ -310,7 +310,9 @@ class Login extends React.Component {
                   <div className="btn">Sign In</div>
                   <div className="group2">
                     <div className="rectangle8copy"></div>
-                    <img className="path6" src="/images/template/login/reset-password-path-6.png" />
+                    <img
+                      className="path6"
+                      src="/images/template/login/reset-password-path-6.png" />
                   </div>
                 </div>
               </div>

diff --git a/imports/ui/components/SendCoin.js b/imports/ui/components/SendCoin.js
@@ -179,7 +179,6 @@ class SendCoin extends React.Component {
   }
 
   changeSendCoinStep(step, back) {
-    console.warn(step);
     if (back) {
       this.setState({
         sendCurrentStep: step,