diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-12-08 01:54:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 01:54:37 +0800 |
| commit | 41d281a52714ad432b115d94a272156d51cd7bad (patch) | |
| tree | 36c1a9ad91600f48496157b45c9fa3019206467d /ui/app/css | |
| parent | 7dba114feb428f7f2f78fee5611377b04bff5be6 (diff) | |
| parent | e0d0e19c925224bddf56a4088fb9c402d995d79f (diff) | |
| download | tangerine-wallet-browser-41d281a52714ad432b115d94a272156d51cd7bad.tar tangerine-wallet-browser-41d281a52714ad432b115d94a272156d51cd7bad.tar.gz tangerine-wallet-browser-41d281a52714ad432b115d94a272156d51cd7bad.tar.bz2 tangerine-wallet-browser-41d281a52714ad432b115d94a272156d51cd7bad.tar.lz tangerine-wallet-browser-41d281a52714ad432b115d94a272156d51cd7bad.tar.xz tangerine-wallet-browser-41d281a52714ad432b115d94a272156d51cd7bad.tar.zst tangerine-wallet-browser-41d281a52714ad432b115d94a272156d51cd7bad.zip | |
Merge branch 'NewUI-flat' into cb-372
Diffstat (limited to 'ui/app/css')
| -rw-r--r-- | ui/app/css/index.scss | 1 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/menu.scss | 2 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/modal.scss | 36 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/settings.scss | 5 |
4 files changed, 43 insertions, 1 deletions
diff --git a/ui/app/css/index.scss b/ui/app/css/index.scss index 01899ccad..445c819ff 100644 --- a/ui/app/css/index.scss +++ b/ui/app/css/index.scss @@ -4,6 +4,7 @@ http://www.creativebloq.com/web-design/manage-large-css-projects-itcss-101517528 https://www.xfive.co/blog/itcss-scalable-maintainable-css-architecture/ */ + @import './itcss/settings/index.scss'; @import './itcss/tools/index.scss'; @import './itcss/generic/index.scss'; diff --git a/ui/app/css/itcss/components/menu.scss b/ui/app/css/itcss/components/menu.scss index 7953834ee..eb92a1b70 100644 --- a/ui/app/css/itcss/components/menu.scss +++ b/ui/app/css/itcss/components/menu.scss @@ -11,8 +11,8 @@ flex-flow: row nowrap; align-items: center; position: relative; - z-index: 200; font-weight: 300; + z-index: 201; @media screen and (max-width: 575px) { padding: 14px; diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss index b69bd5c7e..9b64564d6 100644 --- a/ui/app/css/itcss/components/modal.scss +++ b/ui/app/css/itcss/components/modal.scss @@ -563,3 +563,39 @@ } } } + +//Notification Modal + +.notification-modal-wrapper { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + position: relative; + border: 1px solid $alto; + box-shadow: 0 0 2px 2px $alto; + font-family: Roboto; +} + +.notification-modal-header { + background: $wild-sand; + width: 100%; + display: flex; + justify-content: center; + padding: 30px; + font-size: 22px; + color: $nile-blue; + height: 79px; +} + +.notification-modal-message { + padding: 20px; +} + +.notification-modal-message { + width: 100%; + display: flex; + justify-content: center; + font-size: 17px; + color: $nile-blue; +}
\ No newline at end of file diff --git a/ui/app/css/itcss/components/settings.scss b/ui/app/css/itcss/components/settings.scss index 2f29d8017..d60ebd934 100644 --- a/ui/app/css/itcss/components/settings.scss +++ b/ui/app/css/itcss/components/settings.scss @@ -145,6 +145,11 @@ color: $monzo; } +.settings__clear-button--orange { + border: 1px solid rgba(247, 134, 28, 1); + color: rgba(247, 134, 28, 1); +} + .settings__info-logo-wrapper { height: 80px; margin-bottom: 20px; |