diff --git a/src/sass/directives/gravatar.scss b/src/sass/directives/gravatar.scss index 49587d201..6a6307ef4 100644 --- a/src/sass/directives/gravatar.scss +++ b/src/sass/directives/gravatar.scss @@ -1,18 +1,4 @@ .gravatar { border-radius: 50%; -} - -.gravatar-content { - position: relative; - height: 70px; - border-color: #172565; - background-color: #1e3186; - background-image: linear-gradient(0deg, #172565, #172565 0%, transparent 0%); - color: #fff; - margin-bottom: 50px; - .gravatar { - position: absolute; - bottom: -30px; - left: 41%; - } + display: inline-block; } diff --git a/src/sass/ionic.scss b/src/sass/ionic.scss index 4b1d5b6b1..6ea7f90db 100644 --- a/src/sass/ionic.scss +++ b/src/sass/ionic.scss @@ -15,19 +15,6 @@ ion-tabs.ion-tabs-transparent { background: none transparent; } -// Some overrides for the card class which can't be set by variable -.card, .list { - .icon { - color: $light-gray; - } - & > .item-heading { - font-weight: 700; - .icon { - color: $mid-gray; - } - } -} - // .placeholder-icon padding cannot be modified by a variable $placeholder-icon-padding: 10px; .placeholder-icon { @@ -38,3 +25,8 @@ $placeholder-icon-padding: 10px; padding-left: $placeholder-icon-padding; } } + +// .item-input-wrapper background cannot be modified by a variable +.item-input-wrapper { + background: none transparent; +} diff --git a/src/sass/variables.scss b/src/sass/variables.scss index 03b869e89..59f4fbd1a 100644 --- a/src/sass/variables.scss +++ b/src/sass/variables.scss @@ -2,7 +2,7 @@ $royal: #1e3186; $soft-blue: #647ce8; $fill-blue: #D5DFFF; -$subtle-gray: #f7f7f7; +$subtle-gray: darken(#fff, 5%); $roboto: "Roboto", sans-serif; $roboto-light: "Roboto-Light", sans-serif-light; $success-green: #17ae8c; @@ -18,21 +18,34 @@ $unmistakable-radius: 12px; /* Set ionic variables */ -$positive: $soft-blue; +$positive: $soft-blue; -$font-size-base: 16px; -$font-size-small: 12px; -$font-family-sans-serif: $roboto; -$font-family-light-sans-serif: $roboto-light; +$font-size-base: 16px; +$font-size-small: 12px; +$font-family-sans-serif: $roboto; +$font-family-light-sans-serif: $roboto-light; -$button-border-radius: $visible-radius; -$button-height: 52px; -$button-padding: 16px; +$button-border-radius: $visible-radius; +$button-height: 52px; +$button-padding: 16px; -$base-background-color: $subtle-gray; +$base-background-color: $subtle-gray; -$item-default-active-bg: $subtle-gray; -$item-icon-font-size: 24px; +$item-default-active-bg: $subtle-gray; +$item-icon-font-size: 24px; + +$input-color: $dark-gray; +$input-border: $light-gray; +$input-label-color: $mid-gray; +$input-color-placeholder: lighten($dark-gray, 40%); + +$item-default-bg: #ffffff; +$item-default-border: $subtle-gray; +$item-default-text: $dark-gray; +$item-default-active-bg: darken(#ffffff, 7%); +$item-default-active-border: darken($subtle-gray, 7%); + +$bar-default-border: $subtle-gray; $tabs-icon-size: 22px; diff --git a/src/sass/views/address-book.scss b/src/sass/views/address-book.scss index 4b0f49c58..757b71840 100644 --- a/src/sass/views/address-book.scss +++ b/src/sass/views/address-book.scss @@ -1,22 +1,15 @@ -#add-address{ - .list{ - background: #ffffff; +#add-address { + .zero-state-cta { + padding-bottom: 3vh; + } + .list { + background-color: #fff; } } #view-address-book { - .scroll{ + .scroll { height:100%; } - #add-contact{ - min-width: 300px; - img{ - width: 10rem; - display: inline-block; - } - a{ - text-decoration: none; - } - } .list { .item { color: #444; @@ -67,4 +60,26 @@ } } } -} \ No newline at end of file +} + +#address-book-view { + .bar.bar-royal { + border: 0 transparent; + } + .gravatar-content { + position: relative; + height: 70px; + border-color: $royal; + background-color: $royal; + padding-top: 20px; + margin-bottom: 50px; + text-align: center; + } + .address-book-field-label { + text-transform: uppercase; + font-weight: bold; + font-size: 12px; + display: block; + color: $mid-gray; + } +} diff --git a/src/sass/views/tabs.scss b/src/sass/views/tabs.scss index a58d91359..4a1fd8507 100644 --- a/src/sass/views/tabs.scss +++ b/src/sass/views/tabs.scss @@ -35,3 +35,17 @@ } } } + +#tab-home, #tab-send { + .card, .list { + .icon { + color: $light-gray; + } + & > .item-heading { + font-weight: 700; + .icon { + color: $mid-gray; + } + } + } +} diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss index 8b1319ac0..e8d8e58e1 100644 --- a/src/sass/views/views.scss +++ b/src/sass/views/views.scss @@ -14,7 +14,6 @@ @import "bitpayCard"; @import "address-book"; @import "wallet-backup-phrase"; -@import "address-book"; @import "zero-state"; @import "onboarding/onboarding"; @import "includes/walletActivity"; diff --git a/www/img/address-book-add.svg b/www/img/address-book-add.svg index fa8866b49..c23e2e98b 100644 --- a/www/img/address-book-add.svg +++ b/www/img/address-book-add.svg @@ -1,27 +1,13 @@ - - - - CF22B02A-463B-4798-B448-F6A878730EDC - Created with sketchtool. - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/www/views/addressbook.html b/www/views/addressbook.html index e27064b95..ea28dd923 100644 --- a/www/views/addressbook.html +++ b/www/views/addressbook.html @@ -3,7 +3,7 @@ - Addressbook + Address Book @@ -11,9 +11,19 @@ - - - + + + + + + No contacts yet + You haven’t added any contacts to your address book yet. Get started by adding your first one. + + Add Contact + + + + @@ -23,7 +33,6 @@ ng-change="findAddressbook(addrSearch)" ng-model-onblur> - {{addrEntry.name}} {{addrEntry.address}} - - - - - - - - - No contacts yet - - - - You haven’t added any contacts to your address book yet. Get started by adding your first one. - - - Add Contact - - diff --git a/www/views/addressbook.view.html b/www/views/addressbook.view.html index 88cf0af57..5089a66a3 100644 --- a/www/views/addressbook.view.html +++ b/www/views/addressbook.view.html @@ -1,37 +1,31 @@ - + - Addressbook + {{addressbookEntry.name}} - - - + - - + - Name - {{addressbookEntry.name}} + Name + {{addressbookEntry.name}} - Email - {{addressbookEntry.email}} + Email + {{addressbookEntry.email}} - Address - {{addressbookEntry.address}} + Address + {{addressbookEntry.address}} - - + Send Money - diff --git a/www/views/tab-send.html b/www/views/tab-send.html index 3432416b4..2a6e23347 100644 --- a/www/views/tab-send.html +++ b/www/views/tab-send.html @@ -11,9 +11,9 @@ To get started, buy bitcoin or share your address. You can receive bitcoin from any wallet or service. To get started, you'll need to create a bitcoin wallet and get some bitcoin. - Buy Bitcoin - Create bitcoin wallet - Show bitcoin address + Buy Bitcoin + Create bitcoin wallet + Show bitcoin address
{{addrEntry.address}}
- You haven’t added any contacts to your address book yet. Get started by adding your first one. -