diff options
| author | kumavis <aaron@kumavis.me> | 2018-05-17 04:56:32 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2018-05-17 04:56:32 +0800 |
| commit | 44f31f9a7e212550914c7b354cdd8e69534990cb (patch) | |
| tree | f55cd86d2c123becb2392112c2da953550e559d6 /ui/app/css/itcss/components/pages | |
| parent | 8e1cad5ff60a67117bd6802dce15345d7b2542a4 (diff) | |
| parent | 76c8cb3d7b1cbd5b5a3e48fac4b08e44ad936850 (diff) | |
| download | tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar.gz tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.tar.zst tangerine-wallet-browser-44f31f9a7e212550914c7b354cdd8e69534990cb.zip | |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps
Diffstat (limited to 'ui/app/css/itcss/components/pages')
| -rw-r--r-- | ui/app/css/itcss/components/pages/index.scss | 4 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/pages/unlock.scss | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/ui/app/css/itcss/components/pages/index.scss b/ui/app/css/itcss/components/pages/index.scss index d0b59da53..195185fff 100644 --- a/ui/app/css/itcss/components/pages/index.scss +++ b/ui/app/css/itcss/components/pages/index.scss @@ -1,3 +1,3 @@ -@import './unlock.scss'; - @import './reveal-seed.scss'; + +@import '../../../../components/pages/unlock-page/unlock-page.scss'; diff --git a/ui/app/css/itcss/components/pages/unlock.scss b/ui/app/css/itcss/components/pages/unlock.scss deleted file mode 100644 index 5d438377b..000000000 --- a/ui/app/css/itcss/components/pages/unlock.scss +++ /dev/null @@ -1,9 +0,0 @@ -.unlock-page { - box-shadow: none; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - background: rgb(247, 247, 247); - width: 100%; -} |