Desfault button refactor

stable
Xavier Julián 2015-02-10 16:46:55 +01:00
parent 61ce5e21db
commit a8aae53c00
1 changed files with 10 additions and 0 deletions

View File

@ -87,6 +87,7 @@
background: $red;
color: $white;
}
<<<<<<< HEAD
.icon {
color: $white;
}
@ -99,6 +100,8 @@
background: $red-light;
color: $white;
}
=======
>>>>>>> Desfault button refactor
}
.button-bulk {
@ -113,6 +116,7 @@
}
}
<<<<<<< HEAD
.button-auth {
@extend %button;
@ -121,6 +125,12 @@
img {
@extend %large;
color: $white;
=======
.button-auth {
@extend %button;
background: $grayer;
.icon {
>>>>>>> Desfault button refactor
margin-right: .5rem;
}
&:hover {