From ac93974640cfae5a5c2700b1ee012c7555583c1e Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 21 Sep 2016 14:07:01 -0400 Subject: [PATCH 1/2] updated settings list design to match comps --- public/views/tab-settings.html | 2 +- src/sass/main.scss | 1 + src/sass/views/tab-settings.scss | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 src/sass/views/tab-settings.scss diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html index 43827c659..050614edc 100644 --- a/public/views/tab-settings.html +++ b/public/views/tab-settings.html @@ -1,4 +1,4 @@ - + {{'Global Settings' | translate}} diff --git a/src/sass/main.scss b/src/sass/main.scss index 3dff22f78..2ab69af12 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -990,6 +990,7 @@ input[type=number] { @import "views/tab-home"; @import "views/tab-receive"; @import "views/tab-send"; +@import "views/tab-settings"; @import "views/walletDetails"; @import "views/bitpayCard"; @import "views/wallet-backup-phrase"; diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss new file mode 100644 index 000000000..e2e478f72 --- /dev/null +++ b/src/sass/views/tab-settings.scss @@ -0,0 +1,30 @@ +#tab-settings { + .list { + .item { + color: #444; + border-top: none; + padding-top: 1.5rem; + padding-bottom: 1.5rem; + &:before { + display: block; + position: absolute; + width: 100%; + height: 1px; + background: rgba(221, 221, 221, 0.3); + top: 0; + right: 0; + content: ''; + } + &.item-heading { + &:before { + top: 99% + } + } + &:nth-child(2) { + &:before { + width: 0; + } + } + } + } +} From 793a963b42afbf4a8854cf4e2a6090aa3c9aa393 Mon Sep 17 00:00:00 2001 From: Jamal Jackson Date: Wed, 21 Sep 2016 14:28:52 -0400 Subject: [PATCH 2/2] updated settings color --- src/sass/views/tab-settings.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/sass/views/tab-settings.scss b/src/sass/views/tab-settings.scss index e2e478f72..79e4aed0f 100644 --- a/src/sass/views/tab-settings.scss +++ b/src/sass/views/tab-settings.scss @@ -15,6 +15,9 @@ right: 0; content: ''; } + &.item-divider{ + color:rgba(74, 74, 74, .8); + } &.item-heading { &:before { top: 99% @@ -25,6 +28,9 @@ width: 0; } } + .item-note{ + color:rgb(58, 58, 58); + } } } }