Merge branch 'feature/settings_views_polish' of https://github.com/jamal-jackson/bitpay-wallet into feature/address_book

# Conflicts:
#	src/sass/views/address-book.scss
This commit is contained in:
Jamal Jackson 2016-09-23 10:11:19 -04:00
commit 4004efd5e4
16 changed files with 138 additions and 36 deletions

View file

@ -993,6 +993,7 @@ input[type=number] {
@import "views/tab-settings";
@import "views/walletDetails";
@import "views/bitpayCard";
@import "views/address-book";
@import "views/wallet-backup-phrase";
@import "views/address-book";
@import 'views/onboarding/onboarding';

View file

@ -1,8 +1,19 @@
@mixin center-block($topBottom: 0) {
float:none;
float: none;
margin: $topBottom auto;
}
.center-block{
@mixin absolute-center() {
position: absolute;
transform: translate(-50%, -50%);
top: 50%;
left: 50%;
}
.center-block {
@include center-block();
}
.absolute-center{
@include absolute-center();
}

View file

@ -2,4 +2,70 @@
.list{
background: #ffffff;
}
}
#view-address-book {
.scroll{
height:100%;
}
#add-contact{
img{
width: 6rem;
display: inline-block;
}
a{
text-decoration: none;
}
}
.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-divider {
color: rgba(74, 74, 74, .8);
}
&.item-heading {
&:before {
top: 99%
}
}
&.item-icon-left{
padding-left:80px;
}
&:nth-child(2) {
&:before {
width: 0;
}
}
.item-note {
color: rgb(58, 58, 58);
}
.big-icon-svg {
padding: 0 7px;
> .bg {
border-radius: 50%;
width: 40px;
height: 40px;
box-shadow: none;
background-repeat: no-repeat;
background-clip: padding-box;
background-size: 103%;
&.green {
background: rgb(1, 209, 162);
}
}
}
}
}
}

View file

@ -1,3 +1,10 @@
.settings {
.item {
color: #444;
border-color: rgba(221, 221, 221, 0.3);
}
}
#tab-settings {
.list {
.item {
@ -15,8 +22,8 @@
right: 0;
content: '';
}
&.item-divider{
color:rgba(74, 74, 74, .8);
&.item-divider {
color: rgba(74, 74, 74, .8);
}
&.item-heading {
&:before {
@ -28,8 +35,8 @@
width: 0;
}
}
.item-note{
color:rgb(58, 58, 58);
.item-note {
color: rgb(58, 58, 58);
}
}
}