From a43afb038fcf82f84316992dfecb6325f0771643 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Tue, 4 Oct 2016 06:44:38 -0400 Subject: [PATCH 1/4] fix(onboarding): remove unfinished scanning flow --- public/views/onboarding/welcome.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/views/onboarding/welcome.html b/public/views/onboarding/welcome.html index 492247590..e753a8d65 100644 --- a/public/views/onboarding/welcome.html +++ b/public/views/onboarding/welcome.html @@ -1,6 +1,6 @@ - +
From b6bd833a966d37e50e12fdd14ed15d6b1fcac3f8 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Tue, 4 Oct 2016 14:12:09 -0400 Subject: [PATCH 2/4] design(homeTip): implement design of the homeTip card --- src/sass/variables.scss | 1 + src/sass/views/tab-home.scss | 26 +++++++++++++++----------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/sass/variables.scss b/src/sass/variables.scss index 54e56b9ec..f2e31ee55 100644 --- a/src/sass/variables.scss +++ b/src/sass/variables.scss @@ -4,6 +4,7 @@ $soft-blue: #647ce8; $subtle-gray: #f5f5f5; $roboto: "Roboto", sans-serif; $roboto-light: "Roboto-Light", sans-serif-light; +$dark-gray: #445; $mid-gray: #667; $light-gray: #9b9bab; diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss index fadcafe6c..c4dc7f1ad 100644 --- a/src/sass/views/tab-home.scss +++ b/src/sass/views/tab-home.scss @@ -65,27 +65,31 @@ padding-bottom: 27px; } .homeTip { + text-align: center; + & > .item-heading { + margin-top: 10px; + background: 0 none; + } .item { border-style: none; } - div { - text-align: center; - margin-top: 20px; - margin-bottom: 20px; - } - .title { + & > .title { font-size: 20px; font-weight: bold; + color: $dark-gray; + margin: 20px 10px; } - .subtitle{ - margin-left: 25px; - margin-right: 25px; - font-size: 18px; - font-weight: 100; + & > .subtitle { + font-size: 1rem; + line-height: 1.5em; + font-weight: 300; + color: $dark-gray; + margin: 20px 3em 2.5em; } .big-icon-svg{ .bg.green{ padding: 0 10px; + box-shadow: none; } } } From 09924ed2726a8026d83ac4eed5b163b47db69b36 Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Tue, 4 Oct 2016 15:49:12 -0400 Subject: [PATCH 3/4] design(tabs): clean up tab icons, polish spacing and colors --- public/img/tab-icons/ico-home-selected.svg | 22 ++++---- public/img/tab-icons/ico-home.svg | 20 +++---- public/img/tab-icons/ico-receive-selected.svg | 43 +++++++-------- public/img/tab-icons/ico-receive.svg | 39 ++++++-------- public/img/tab-icons/ico-scan-selected.svg | 35 ++++++------- public/img/tab-icons/ico-scan.svg | 37 ++++++------- public/img/tab-icons/ico-send-selected.svg | 29 +++++------ public/img/tab-icons/ico-send.svg | 28 ++++------ .../img/tab-icons/ico-settings-selected.svg | 52 ++++++++++++++----- public/img/tab-icons/ico-settings.svg | 43 ++++++++++----- src/sass/variables.scss | 11 +++- src/sass/views/tabs.scss | 21 ++++---- 12 files changed, 201 insertions(+), 179 deletions(-) diff --git a/public/img/tab-icons/ico-home-selected.svg b/public/img/tab-icons/ico-home-selected.svg index efe5ef4ef..3f302b1f2 100644 --- a/public/img/tab-icons/ico-home-selected.svg +++ b/public/img/tab-icons/ico-home-selected.svg @@ -1,12 +1,10 @@ - - - - Shape - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/public/img/tab-icons/ico-home.svg b/public/img/tab-icons/ico-home.svg index b966fa509..4297cf20c 100644 --- a/public/img/tab-icons/ico-home.svg +++ b/public/img/tab-icons/ico-home.svg @@ -1,12 +1,8 @@ - - - - Shape - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + diff --git a/public/img/tab-icons/ico-receive-selected.svg b/public/img/tab-icons/ico-receive-selected.svg index e4ac8d9bb..1b544dda5 100644 --- a/public/img/tab-icons/ico-receive-selected.svg +++ b/public/img/tab-icons/ico-receive-selected.svg @@ -1,23 +1,20 @@ - - - - shopping-24px-outline_bardcode-qr - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/public/img/tab-icons/ico-receive.svg b/public/img/tab-icons/ico-receive.svg index ce473bec7..aab9aec69 100644 --- a/public/img/tab-icons/ico-receive.svg +++ b/public/img/tab-icons/ico-receive.svg @@ -1,23 +1,16 @@ - - - - shopping-24px-outline_bardcode-qr - Created with Sketch. - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff --git a/public/img/tab-icons/ico-scan-selected.svg b/public/img/tab-icons/ico-scan-selected.svg index 06a118a83..6a5c8f589 100644 --- a/public/img/tab-icons/ico-scan-selected.svg +++ b/public/img/tab-icons/ico-scan-selected.svg @@ -1,20 +1,17 @@ - - - - scan - Created with Sketch. - - - - - - - - - - - - - - + + + + + + + + diff --git a/public/img/tab-icons/ico-scan.svg b/public/img/tab-icons/ico-scan.svg index 738e4f9bb..ea08ae0f0 100644 --- a/public/img/tab-icons/ico-scan.svg +++ b/public/img/tab-icons/ico-scan.svg @@ -1,20 +1,17 @@ - - - - scan - Created with Sketch. - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/public/img/tab-icons/ico-send-selected.svg b/public/img/tab-icons/ico-send-selected.svg index cab77c545..2f812b891 100644 --- a/public/img/tab-icons/ico-send-selected.svg +++ b/public/img/tab-icons/ico-send-selected.svg @@ -1,17 +1,12 @@ - - - - ui-24px-outline-1_send - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/public/img/tab-icons/ico-send.svg b/public/img/tab-icons/ico-send.svg index fdf6c8a87..a5020691d 100644 --- a/public/img/tab-icons/ico-send.svg +++ b/public/img/tab-icons/ico-send.svg @@ -1,17 +1,11 @@ - - - - ui-24px-outline-1_send - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/public/img/tab-icons/ico-settings-selected.svg b/public/img/tab-icons/ico-settings-selected.svg index fdf37cce3..220c8ca5f 100644 --- a/public/img/tab-icons/ico-settings-selected.svg +++ b/public/img/tab-icons/ico-settings-selected.svg @@ -1,12 +1,40 @@ - - - - settings - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + + diff --git a/public/img/tab-icons/ico-settings.svg b/public/img/tab-icons/ico-settings.svg index aaf5af40c..605bdb2fc 100644 --- a/public/img/tab-icons/ico-settings.svg +++ b/public/img/tab-icons/ico-settings.svg @@ -1,12 +1,31 @@ - - - - settings - Created with Sketch. - - - - - - - \ No newline at end of file + + + + + + diff --git a/src/sass/variables.scss b/src/sass/variables.scss index f2e31ee55..e66b39f1d 100644 --- a/src/sass/variables.scss +++ b/src/sass/variables.scss @@ -1,6 +1,7 @@ /* constants */ $royal: #1e3186; $soft-blue: #647ce8; +$fill-blue: #D5DFFF; $subtle-gray: #f5f5f5; $roboto: "Roboto", sans-serif; $roboto-light: "Roboto-Light", sans-serif-light; @@ -9,13 +10,19 @@ $mid-gray: #667; $light-gray: #9b9bab; /* Set ionic variables */ + +$positive: $soft-blue; + $font-family-sans-serif: $roboto; $font-family-light-sans-serif: $roboto-light; + $base-background-color: $subtle-gray; + $item-default-active-bg: $subtle-gray; +$item-icon-font-size: 24px; + +$tabs-icon-size: 22px; $ios-transition-duration: 200ms; $card-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); - -$item-icon-font-size: 24px; diff --git a/src/sass/views/tabs.scss b/src/sass/views/tabs.scss index 30ec095cd..a58d91359 100644 --- a/src/sass/views/tabs.scss +++ b/src/sass/views/tabs.scss @@ -2,34 +2,35 @@ .icon { background-repeat: no-repeat; background-position: center; - &.ico-home{ + margin: 6px 0 2px; + &.ico-home { background-image: url('../img/tab-icons/ico-home.svg'); } - &.ico-home-selected{ + &.ico-home-selected { background-image: url('../img/tab-icons/ico-home-selected.svg'); } - &.ico-receive{ + &.ico-receive { background-image: url('../img/tab-icons/ico-receive.svg'); } - &.ico-receive-selected{ + &.ico-receive-selected { background-image: url('../img/tab-icons/ico-receive-selected.svg'); } - &.ico-settings{ + &.ico-settings { background-image: url('../img/tab-icons/ico-settings.svg'); } - &.ico-settings-selected{ + &.ico-settings-selected { background-image: url('../img/tab-icons/ico-settings-selected.svg'); } - &.ico-scan{ + &.ico-scan { background-image: url('../img/tab-icons/ico-scan.svg'); } - &.ico-scan-selected{ + &.ico-scan-selected { background-image: url('../img/tab-icons/ico-scan-selected.svg'); } - &.ico-send{ + &.ico-send { background-image: url('../img/tab-icons/ico-send.svg'); } - &.ico-send-selected{ + &.ico-send-selected { background-image: url('../img/tab-icons/ico-send-selected.svg'); } } From c54ac99b1c3cced40924b2f7324761261efcfa4b Mon Sep 17 00:00:00 2001 From: Jason Dreyzehner Date: Tue, 4 Oct 2016 15:49:33 -0400 Subject: [PATCH 4/4] design(home): correct size of wallet icon --- public/img/icon-wallet.svg | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/public/img/icon-wallet.svg b/public/img/icon-wallet.svg index a1d7c73eb..73406a0cd 100644 --- a/public/img/icon-wallet.svg +++ b/public/img/icon-wallet.svg @@ -1,10 +1,9 @@ - - +