taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/styles/components/buttons.scss
View File

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