Fix wrong button merge

stable
Xavier Julián 2015-02-13 08:17:42 +01:00
parent 0187462216
commit 8bb75f3068
1 changed files with 0 additions and 11 deletions

View File

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