fix merge conflicts

This commit is contained in:
Marty Alcala 2016-10-18 17:23:43 -04:00
commit 78bd523391
272 changed files with 8069 additions and 5496 deletions

View file

@ -107,12 +107,8 @@
i {
color: grey;
position: inherit;
left: 25px;
vertical-align: super;
padding-right: 10px;
border-right: 1px solid;
border-color: grey;
font-size: 20px;
padding: 0 10px;
float: right;
}
contact {
margin-left: 15px;

View file

@ -1,15 +1,14 @@
.wallets {
.slides {
.swiper-container {
width: 75% !important;
width: 85% !important;
overflow: visible;
}
.card {
padding: .7rem;
padding-left: .25rem;
padding-right: .25rem;
border-radius: .25rem;
max-width: 350px;
box-shadow:$subtle-box-shadow;
padding:0;
border-radius: 6px;
@media (min-width: 500px) {
& {
width: 350px;
@ -17,6 +16,23 @@
margin: 1.5rem auto 0;
}
}
.item{
padding: calc(100vh - 99vh) calc(100vw - 93vw) calc(100vh - 97vh) calc(100vw - 95vw);
i{left:auto;}
span{
clear:both;
width: 100%;
display: inline-block;
&.wallet-name{
margin-top:10px;
margin-bottom:5px;
font-size:13px;
}
}
.big-icon-svg{
& > .bg{padding:.3rem;width: 40px;height:40px;}
}
}
}
.swiper-slide {
width: 100% !important;
@ -37,13 +53,14 @@
}
&.swiper-slide-prev,
&.swiper-slide-next {
opacity: .2;
opacity: .3;
transform: scale(.8);
}
&.swiper-slide-prev {
left: -5%;
left: 10vw;
}
&.swiper-slide-next {
left: 4%;
left: -10vw;
}
}
}