diff options
| author | Bruno <brunobar79@gmail.com> | 2018-05-17 10:38:51 +0800 |
|---|---|---|
| committer | Bruno <brunobar79@gmail.com> | 2018-05-17 10:38:51 +0800 |
| commit | 3dd58463caef98c2cc1f068931624795a43912db (patch) | |
| tree | b49a2e4feffd33e3b96d43ec29f2ca1071912e67 /ui/app/css/itcss/components/pages | |
| parent | 3180b69b974f8ffc0d6546a647725d1bf8539483 (diff) | |
| parent | 708422432c634ffbd4c73388f980c43f766b3355 (diff) | |
| download | tangerine-wallet-browser-3dd58463caef98c2cc1f068931624795a43912db.tar.gz tangerine-wallet-browser-3dd58463caef98c2cc1f068931624795a43912db.tar.zst tangerine-wallet-browser-3dd58463caef98c2cc1f068931624795a43912db.zip | |
Merge remote-tracking branch 'upstream/develop' into develop
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%; -} |