Merge remote-tracking branch 'origin/master'

This commit is contained in:
FezVrasta 2014-12-28 15:47:15 +01:00
commit f60c594067
2 changed files with 4 additions and 1 deletions

View File

@ -41,7 +41,7 @@
font-size: 26px;
width: 56px;
height: 56px;
&, &:hover, &:active
&, &:hover, &:active {
.variations(~"", background-color, transparent);
}
& {

View File

@ -9,6 +9,9 @@
.generic-variations(@extra, @default, {
background-color: @material-color;
color: @text-color;
& when (@material-color = @btn-default) {
color: @lightbg-text;
}
});
}