Merge remote-tracking branch 'origin/master'

This commit is contained in:
FezVrasta 2014-12-26 19:12:48 +01:00
commit f1782a0af0

View File

@ -9,10 +9,10 @@
text-decoration: none; text-decoration: none;
color: @darkbg-text; color: @darkbg-text;
&:hover:not(.btn-link):not(.btn-flat) { &:hover:not(.btn-link):not(.btn-flat):not(.btn-fab) {
.shadow-z-2-hover(); .shadow-z-2-hover();
} }
&:active:not(.btn-link):not(.btn-flat) { &:active:not(.btn-link):not(.btn-flat):not(.btn-fab) {
.shadow-z-3(); .shadow-z-3();
} }
transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1); transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
@ -41,10 +41,18 @@
font-size: 26px; font-size: 26px;
width: 56px; width: 56px;
height: 56px; height: 56px;
&, &:hover { &, &:hover, &:active
.shadow-z-1();
.variations(~"", background-color, transparent); .variations(~"", background-color, transparent);
} }
& {
.shadow-z-3();
}
&:hover {
.shadow-z-4();
}
&:active {
.shadow-z-5();
}
&, .ripple-wrapper { &, .ripple-wrapper {
border-radius: 100%; border-radius: 100%;
} }