Merge pull request #759 from e-maximus/fix/wallets-mobile-layout

Fix/wallets mobile layout
Chrono-Tech · Aug 21, 2018 · e41e0f5 · e41e0f5
2 parents b7e19f4 + c67f454
commit e41e0f5
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 20 deletions.
diff --git a/src/components/wallet/TokensListWidget/TokensListWidget.scss b/src/components/wallet/TokensListWidget/TokensListWidget.scss
@@ -3,12 +3,14 @@
  * Licensed under the AGPL Version 3 license.
  */
 @import '~styles/partials/variables';
+@import '~styles/partials/mixins';
 
 .root {
   width: 100%;
   background: $color-white;
   box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.15);
   border-radius: 2px;
+
   .header {
     font-weight: 500;
     padding: 25px 30px;
@@ -18,85 +20,130 @@
 
   .tokens-list {
     display: flex;
+
     .tokens-list-table {
       width: 100%;
-      display: grid;
+      display: table;
       border-bottom: 1px solid $button-color-3;
+
       .tokens-list-table-tr {
-        display: grid;
-        grid-template-columns: 160px 1fr 1fr;
+        display: table-row;
         border-top: 1px solid $button-color-3;
+        border-bottom: 1px solid $button-color-3;
         font-weight: 500;
+
         .tokens-list-table-cell-icon {
           padding: 15px 30px;
-          display: flex;
-          align-items: center;
+          display: table-cell;
+          text-align: center;
           vertical-align: middle;
+          border-right: 1px solid $button-color-3;
+          border-top: 1px solid $button-color-3;
+
+          @include sm-only {
+            padding: 5px 15px;
+          }
+
           .table-image {
-            width: 40px;
+            width: auto;
             height: 40px;
             background-size: contain;
             background-repeat: no-repeat;
             background-position: center center;
-            margin-right: 20px;
+            text-align: center;
+
+            @include sm-only {
+              width: auto;
+              height: 40px;
+              margin-right: 0;
+            }
           }
         }
+
         .tokens-list-table-cell-amount {
           padding: 15px 30px;
-          display: flex;
-          align-items: center;
+          display: table-cell;
+          vertical-align: middle;
           font-size: 14px;
           line-height: 17px;
           color: $color-primary-3;
+          border-right: 1px solid $button-color-3;
+          border-top: 1px solid $button-color-3;
+
+          @include sm-only {
+            padding: 5px 15px;
+          }
         }
+
         .tokens-list-table-cell-usd {
           padding: 15px 30px;
-          display: flex;
-          align-items: center;
+          display: table-cell;
+          vertical-align: middle;
           color: $color-primary-3;
           font-size: 14px;
-          line-height: 17px
+          line-height: 17px;
+          border-right: 1px solid $button-color-3;
+          border-top: 1px solid $button-color-3;
+
+          @include sm-only {
+            padding: 5px 15px;
+          }
         }
+
         .tokens-list-table-cell-sort-token {
           cursor: pointer;
           padding: 10px 30px;
-          display: flex;
-          align-items: center;
+          display: table-cell;
           vertical-align: middle;
+          text-align: center;
+
+          @include sm-only {
+           padding: 5px 15px;
+          }
+
           &:hover {
             padding-top: 10px;
             background-color: $color-grey-3;
             padding-bottom: 10px;
           }
+
           .table-image {
             width: 40px;
             height: 40px;
             background-size: contain;
             background-repeat: no-repeat;
             background-position: center center;
+
+            @include sm-only {
+              width: auto;
+              height: 40px;
+            }
           }
         }
+
         .tokens-list-table-cell-sort-amount {
           cursor: pointer;
           padding: 10px 30px;
-          display: flex;
-          align-items: center;
+          display: table-cell;
+          vertical-align: middle;
           font-size: 14px;
           line-height: 17px;
           color: $color-primary-3;
           border-right: 1px solid $button-color-3;
           border-left: 1px solid $button-color-3;
+
           &:hover {
             padding-top: 10px;
             background-color: $color-grey-3;
             padding-bottom: 10px;
           }
         }
+
         .tokens-list-table-cell-sort-usd {
           cursor: pointer;
           padding: 10px 30px;
-          display: flex;
-          align-items: center;
+          display: table-cell;
+          vertical-align: middle;
           color: $color-primary-3;
           font-size: 14px;
           line-height: 17px;

diff --git a/src/components/wallet/WalletWidgetDetail/WalletWidgetDetail.scss b/src/components/wallet/WalletWidgetDetail/WalletWidgetDetail.scss
@@ -154,6 +154,7 @@
 
 .actions-container {
   display: flex;
+  flex: 3
 }
 
 .action {
@@ -350,13 +351,15 @@
 }
 
 .footer {
-  display: grid;
-  grid-template-columns: 180px 1fr;
+  display: flex;
   margin-bottom: 40px;
+
   .pendingOperations {
     display: flex;
     justify-content: center;
     align-items: flex-start;
+    flex: 2;
+
     .pendingOperationsCount {
       padding: 0 30px;
       background: $color-red-2;
@@ -371,6 +374,12 @@
       justify-content: center;
     }
   }
+
+  .actions-container {
+    display: flex;
+    flex: 3;
+    justify-content: flex-end;
+  }
 }
 
 .unlockDateWrapper {