Merge remote-tracking branch 'origin/master'

This commit is contained in:
FezVrasta 2015-01-06 10:25:18 +01:00
commit eaba4143b2

View File

@ -70,13 +70,13 @@
} }
// This is needed to style buttons which has not a variation suffix (they must be stiled as btn-default) // This is needed to style buttons which has not a variation suffix (they must be stiled as btn-default)
.btn-link, .btn:not([class^="btn btn-"]), .btn-default { .btn-link, .btn:not([class*="btn-"]), .btn-default {
color: @lightbg-text; color: @lightbg-text;
&:hover { &:hover {
color: @lightbg-text; color: @lightbg-text;
} }
} }
.btn:not([class^="btn btn-"]), .btn-default, .btn-flat:not(.btn-link) { .btn:not([class*="btn-"]), .btn-default, .btn-flat:not(.btn-link) {
&:hover, &.active { &:hover, &.active {
background-color: rgba(255,255,255,0.5); background-color: rgba(255,255,255,0.5);
} }