From e471237942030d6e8513af6b6721dedcc3bbe072 Mon Sep 17 00:00:00 2001 From: phoeagon Date: Fri, 26 Dec 2014 13:03:07 +0800 Subject: [PATCH] Floating Action Button should float higher than Raised Button (See http://www.google.com/design/spec/what-is-material/objects-in-3d-space.html#objects-in-3d-space-elevation) --- less/_buttons.less | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/less/_buttons.less b/less/_buttons.less index 90abe04f..dd7b1197 100644 --- a/less/_buttons.less +++ b/less/_buttons.less @@ -9,10 +9,10 @@ text-decoration: none; color: @darkbg-text; - &:hover:not(.btn-link):not(.btn-flat) { + &:hover:not(.btn-link):not(.btn-flat):not(.btn-fab) { .shadow-z-2-hover(); } - &:active:not(.btn-link):not(.btn-flat) { + &:active:not(.btn-link):not(.btn-flat):not(.btn-fab) { .shadow-z-3(); } transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1); @@ -41,10 +41,18 @@ font-size: 26px; width: 56px; height: 56px; - &, &:hover { - .shadow-z-1(); + &, &:hover, &:active .variations(~"", background-color, transparent); } + & { + .shadow-z-3(); + } + &:hover { + .shadow-z-4(); + } + &:active { + .shadow-z-5(); + } &, .ripple-wrapper { border-radius: 100%; }