Merge pull request #807 from mrfelton/fix/login-button-styles

fix(ui): improve login button style
LN-Zap · Sep 20, 2018 · 77fb024 · 77fb024
2 parents 04ffdb1 + a7fc62d
commit 77fb024
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 42 deletions.
diff --git a/app/components/Onboarding/Login/Login.js b/app/components/Onboarding/Login/Login.js
@@ -32,15 +32,17 @@ const Login = ({
 
     <section className={styles.buttons}>
       <div>
-        <span
-          className={`${!unlockingWallet ? styles.active : undefined} ${styles.button}`}
-          onClick={() => unlockWallet(password)}
-        >
-          {unlockingWallet ? (
-            <i className={styles.spinner} />
-          ) : (
-            <FormattedMessage {...messages.unlock} />
-          )}
+        <span className={styles.button}>
+          <span
+            className={`${!unlockingWallet ? styles.active : undefined} ${styles.button}`}
+            onClick={() => unlockWallet(password)}
+          >
+            {unlockingWallet ? (
+              <i className={styles.spinner} />
+            ) : (
+              <FormattedMessage {...messages.unlock} />
+            )}
+          </span>
         </span>
       </div>
     </section>

diff --git a/app/components/Onboarding/Login/Login.scss b/app/components/Onboarding/Login/Login.scss
@@ -43,42 +43,27 @@
 
   div {
     color: var(--primaryText);
-
-    &:nth-child(1) {
-      text-align: center;
-      margin-bottom: 40px;
-
-      span {
-        padding: 15px 35px;
-        background: var(--lightningOrange);
-        font-size: 14px;
-        opacity: 0.5;
-        transition: all 0.25s;
-        border-radius: 5px;
-
-        &.button {
-          position: relative;
-        }
-
-        &.active {
-          opacity: 1;
-          cursor: pointer;
-
-          &:hover {
-            opacity: 0.5;
-          }
-        }
+    text-align: center;
+    margin-bottom: 40px;
+
+    .button {
+      padding: 15px 35px;
+      background: var(--lightningOrange);
+      font-size: 14px;
+      transition: all 0.25s;
+      border-radius: 5px;
+
+      &.button {
+        position: relative;
       }
-    }
 
-    &:nth-child(2),
-    &:nth-child(3) {
-      font-size: 12px;
-      cursor: pointer;
-      margin: 10px 0;
+      &.active {
+        opacity: 1;
+        cursor: pointer;
 
-      &:hover {
-        text-decoration: underline;
+        &:hover {
+          opacity: 0.5;
+        }
       }
     }
   }