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

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

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

@ -87,6 +87,7 @@
background: $red; background: $red;
color: $white; color: $white;
} }
<<<<<<< HEAD
.icon { .icon {
color: $white; color: $white;
} }
@ -99,6 +100,8 @@
background: $red-light; background: $red-light;
color: $white; color: $white;
} }
=======
>>>>>>> Desfault button refactor
} }
.button-bulk { .button-bulk {
@ -113,6 +116,7 @@
} }
} }
<<<<<<< HEAD
.button-auth { .button-auth {
@extend %button; @extend %button;
@ -121,6 +125,12 @@
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 {