diff options
author | kumavis <kumavis@users.noreply.github.com> | 2018-05-01 02:04:53 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-01 02:04:53 +0800 |
commit | 5f3f8c85fcc5bd378ef1a886434a3e98546fee7f (patch) | |
tree | f4665fdeae73f010a676da4ec3df563e31ff01bd /ui/app/css | |
parent | 9b1c07c75045f4a7124e4f0fcd416535f88182ae (diff) | |
parent | 61b8c3efff3b12e117c80db80c237dcfce0c0f49 (diff) | |
download | tangerine-wallet-browser-5f3f8c85fcc5bd378ef1a886434a3e98546fee7f.tar tangerine-wallet-browser-5f3f8c85fcc5bd378ef1a886434a3e98546fee7f.tar.gz tangerine-wallet-browser-5f3f8c85fcc5bd378ef1a886434a3e98546fee7f.tar.bz2 tangerine-wallet-browser-5f3f8c85fcc5bd378ef1a886434a3e98546fee7f.tar.lz tangerine-wallet-browser-5f3f8c85fcc5bd378ef1a886434a3e98546fee7f.tar.xz tangerine-wallet-browser-5f3f8c85fcc5bd378ef1a886434a3e98546fee7f.tar.zst tangerine-wallet-browser-5f3f8c85fcc5bd378ef1a886434a3e98546fee7f.zip |
Merge pull request #4059 from MetaMask/i-4033-seed-words
Use new design for Reveal Seed screen. Persist seed words only in the first time flow.
Diffstat (limited to 'ui/app/css')
-rw-r--r-- | ui/app/css/itcss/components/index.scss | 2 | ||||
-rw-r--r-- | ui/app/css/itcss/components/pages/index.scss | 2 | ||||
-rw-r--r-- | ui/app/css/itcss/components/pages/reveal-seed.scss | 17 | ||||
-rw-r--r-- | ui/app/css/itcss/generic/index.scss | 67 | ||||
-rw-r--r-- | ui/app/css/itcss/settings/variables.scss | 1 |
5 files changed, 89 insertions, 0 deletions
diff --git a/ui/app/css/itcss/components/index.scss b/ui/app/css/itcss/components/index.scss index 959eb9d15..1c544e162 100644 --- a/ui/app/css/itcss/components/index.scss +++ b/ui/app/css/itcss/components/index.scss @@ -61,3 +61,5 @@ @import './welcome-screen.scss'; @import './sender-to-recipient.scss'; + +@import '../../../components/export-text-container/export-text-container.scss'; diff --git a/ui/app/css/itcss/components/pages/index.scss b/ui/app/css/itcss/components/pages/index.scss index 82446fd7a..d0b59da53 100644 --- a/ui/app/css/itcss/components/pages/index.scss +++ b/ui/app/css/itcss/components/pages/index.scss @@ -1 +1,3 @@ @import './unlock.scss'; + +@import './reveal-seed.scss'; diff --git a/ui/app/css/itcss/components/pages/reveal-seed.scss b/ui/app/css/itcss/components/pages/reveal-seed.scss new file mode 100644 index 000000000..b8f13af4a --- /dev/null +++ b/ui/app/css/itcss/components/pages/reveal-seed.scss @@ -0,0 +1,17 @@ +.reveal-seed { + &__content { + padding: 20px; + } + + &__label { + padding-bottom: 10px; + font-weight: 400; + display: inline-block; + } + + &__error { + color: $crimson; + font-size: 14px; + padding-top: 5px; + } +} diff --git a/ui/app/css/itcss/generic/index.scss b/ui/app/css/itcss/generic/index.scss index 92321394b..7a64810c4 100644 --- a/ui/app/css/itcss/generic/index.scss +++ b/ui/app/css/itcss/generic/index.scss @@ -207,6 +207,27 @@ input.large-input { &__content { height: 100%; overflow-y: auto; + min-height: 250px; + max-height: 400px; + } + + &__warning-container { + background: $linen; + padding: 20px; + display: flex; + align-items: start; + } + + &__warning-message { + padding-left: 15px; + } + + &__warning-title { + font-weight: 500; + } + + &__warning-icon { + padding-top: 5px; } } @@ -237,3 +258,49 @@ input.large-input { border-radius: 0; } } + +@media screen and (min-width: 576px) { + .page-container { + height: 600px; + flex: 0 0 auto; + } +} + +.input-label { + padding-bottom: 10px; + font-weight: 400; + display: inline-block; +} + +input.form-control { + padding-left: 10px; + font-size: 14px; + height: 40px; + border: 1px solid $alto; + border-radius: 3px; + width: 100%; + + &::-webkit-input-placeholder { + font-weight: 100; + color: $dusty-gray; + } + + &::-moz-placeholder { + font-weight: 100; + color: $dusty-gray; + } + + &:-ms-input-placeholder { + font-weight: 100; + color: $dusty-gray; + } + + &:-moz-placeholder { + font-weight: 100; + color: $dusty-gray; + } + + &--error { + border: 1px solid $monzo; + } +} diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss index 51548306f..814d7a382 100644 --- a/ui/app/css/itcss/settings/variables.scss +++ b/ui/app/css/itcss/settings/variables.scss @@ -54,6 +54,7 @@ $saffron: #f6c343; $dodger-blue: #3099f2; $zumthor: #edf7ff; $ecstasy: #f7861c; +$linen: #fdf4f4; /* Z-Indicies |