From 4f6b53c1aa383c05fa3c356adb332fcc6dbf45e9 Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Sat, 19 May 2018 23:04:19 -0700
Subject: Update designs for Add Token screen

---
 ui/app/components/pages/unlock-page/index.scss     | 51 ++++++++++++++++++++++
 .../pages/unlock-page/unlock-page.component.js     |  3 +-
 .../components/pages/unlock-page/unlock-page.scss  | 51 ----------------------
 3 files changed, 53 insertions(+), 52 deletions(-)
 create mode 100644 ui/app/components/pages/unlock-page/index.scss
 delete mode 100644 ui/app/components/pages/unlock-page/unlock-page.scss

(limited to 'ui/app/components/pages/unlock-page')

diff --git a/ui/app/components/pages/unlock-page/index.scss b/ui/app/components/pages/unlock-page/index.scss
new file mode 100644
index 000000000..3d44bd037
--- /dev/null
+++ b/ui/app/components/pages/unlock-page/index.scss
@@ -0,0 +1,51 @@
+.unlock-page {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  width: 357px;
+  padding: 30px;
+  font-weight: 400;
+  color: $silver-chalice;
+
+  &__container {
+    background: $white;
+    display: flex;
+    align-self: stretch;
+    justify-content: center;
+    flex: 1 0 auto;
+  }
+
+  &__mascot-container {
+    margin-top: 24px;
+  }
+
+  &__title {
+    margin-top: 5px;
+    font-size: 2rem;
+    font-weight: 800;
+    color: $tundora;
+  }
+
+  &__form {
+    width: 100%;
+    margin: 56px 0 8px;
+  }
+
+  &__links {
+    margin-top: 25px;
+    width: 100%;
+  }
+
+  &__link {
+    cursor: pointer;
+
+    &--import {
+      color: $ecstasy;
+    }
+
+    &--use-classic {
+      margin-top: 10px;
+    }
+  }
+}
diff --git a/ui/app/components/pages/unlock-page/unlock-page.component.js b/ui/app/components/pages/unlock-page/unlock-page.component.js
index 0976d9506..a2f009d8f 100644
--- a/ui/app/components/pages/unlock-page/unlock-page.component.js
+++ b/ui/app/components/pages/unlock-page/unlock-page.component.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
-import Button from 'material-ui/Button'
+import Button from '@material-ui/core/Button'
 import TextField from '../../text-field'
 
 const { ENVIRONMENT_TYPE_POPUP } = require('../../../../../app/scripts/lib/enums')
@@ -129,6 +129,7 @@ class UnlockPage extends Component {
               error={error}
               autoFocus
               autoComplete="current-password"
+              material
               fullWidth
             />
           </form>
diff --git a/ui/app/components/pages/unlock-page/unlock-page.scss b/ui/app/components/pages/unlock-page/unlock-page.scss
deleted file mode 100644
index 3d44bd037..000000000
--- a/ui/app/components/pages/unlock-page/unlock-page.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-.unlock-page {
-  display: flex;
-  flex-direction: column;
-  justify-content: flex-start;
-  align-items: center;
-  width: 357px;
-  padding: 30px;
-  font-weight: 400;
-  color: $silver-chalice;
-
-  &__container {
-    background: $white;
-    display: flex;
-    align-self: stretch;
-    justify-content: center;
-    flex: 1 0 auto;
-  }
-
-  &__mascot-container {
-    margin-top: 24px;
-  }
-
-  &__title {
-    margin-top: 5px;
-    font-size: 2rem;
-    font-weight: 800;
-    color: $tundora;
-  }
-
-  &__form {
-    width: 100%;
-    margin: 56px 0 8px;
-  }
-
-  &__links {
-    margin-top: 25px;
-    width: 100%;
-  }
-
-  &__link {
-    cursor: pointer;
-
-    &--import {
-      color: $ecstasy;
-    }
-
-    &--use-classic {
-      margin-top: 10px;
-    }
-  }
-}
-- 
cgit