Fix CSS scroll

adshares · Jan 16, 2019 · 0fa62a2 · 0fa62a2
1 parent eebae41
commit 0fa62a2
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 16 deletions.
diff --git a/app/components/Page/Page.css b/app/components/Page/Page.css
@@ -55,20 +55,19 @@
 }
 
 .contentWrapper {
-    padding: 15px;
     text-align: left;
-    overflow: auto;
     position: relative;
     z-index: 99;
-}
-
-.withScroll {
     margin: 15px;
-    padding: 0;
+    margin-right: 5px;
     padding-right: 10px;
     overflow-x: hidden;
+    overflow-y: auto;
+    max-height: 460px;
+}
+
+.withScroll {
     overflow-y: scroll;
-    height: 460px;
 }
 
 .footer {

diff --git a/app/containers/Settings/SettingsPage.css b/app/containers/Settings/SettingsPage.css
@@ -45,7 +45,6 @@
 .accountLabel {
     display: inline-block;
     vertical-align: bottom;
-    width: 226px;
 }
 
 .accountLabel * {

diff --git a/app/containers/Settings/SettingsPage.js b/app/containers/Settings/SettingsPage.js
@@ -100,7 +100,7 @@ class SettingsPage extends FormComponent {
         {this.props.vault.accounts.length > 0 &&
           <ul className={style.accounts}>
             {this.props.vault.accounts.map((account, index) =>
-              <li key={index}>{this.renderAccountRow(account)}</li>
+              <li className={style.list} key={index}>{this.renderAccountRow(account)}</li>
             )}
           </ul>
         }

diff --git a/app/utils/vaultcrypt.js b/app/utils/vaultcrypt.js
@@ -44,7 +44,7 @@ function encrypt(vault, password) {
         }
       )),
   });
-  return CryptoJS.AES.encrypt(data, password).toString();;
+  return CryptoJS.AES.encrypt(data, password).toString();
 }
 
 function decrypt(encryptedVault, password) {

diff --git a/chrome/views/popup.pug b/chrome/views/popup.pug
@@ -10,9 +10,8 @@ html
         padding: 0;
       }
       body {
-        width: 400px;
+        width: 420px;
         min-height: 300px;
-        max-height: 580px;
       }
       @keyframes rotate {
         to {

diff --git a/chrome/views/window.pug b/chrome/views/window.pug
@@ -10,7 +10,7 @@ html
         padding: 0;
       }
       body {
-        width: 400px;
+        width: 420px;
         min-height: 300px;
         border: 1px solid #ccc;
         box-shadow: 3px 3px 15px rgba(126,126,126,.25);

diff --git a/dev/popup.html b/dev/popup.html
@@ -3,9 +3,8 @@
   padding: 0;
 }
 body {
-  width: 400px;
+  width: 420px;
   min-height: 300px;
-  max-height: 580px;
 }
 @keyframes rotate {
   to {

diff --git a/dev/window.html b/dev/window.html
@@ -3,7 +3,7 @@
   padding: 0;
 }
 body {
-  width: 400px;
+  width: 420px;
   min-height: 300px;
   border: 1px solid #ccc;
   box-shadow: 3px 3px 15px rgba(126,126,126,.25);
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ function encrypt(vault, password) { @@
             }
           )),
       });
-      return CryptoJS.AES.encrypt(data, password).toString();;
+      return CryptoJS.AES.encrypt(data, password).toString();
     }
     function decrypt(encryptedVault, password) {
@@ Expand Down @@