app/assets/stylesheets/material/element/_button.scss in material-sass-0.0.3 vs app/assets/stylesheets/material/element/_button.scss in material-sass-0.0.4

- old
+ new

@@ -3,50 +3,50 @@ background-image: none; background-position: 50% 50%; background-size: 100% 100%; border: 1px solid transparent; border-radius: 2px; + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.15), 0 1px 5px 1px rgba(0, 0, 0, 0.15); color: $black-text; cursor: pointer; display: inline-block; font-size: $font-size; - font-weight: 400; + font-weight: $font-weight; line-height: $line-height; margin-bottom: 0; max-width: 100%; padding: (($btn-height - $line-height - 2) / 2) ($grid-gutter - 1); position: relative; text-align: center; text-transform: uppercase; + transition: background-color 0.3s $timing, box-shadow 0.3s $timing; + user-select: none; vertical-align: middle; white-space: nowrap; - @include box-shadow(0 1px 5px rgba(0, 0, 0, 0.15), 0 1px 5px 1px rgba(0, 0, 0, 0.15)); - @include transition(background-color 0.3s $timing, box-shadow 0.3s $timing); - @include user-select(none); &:active, &:focus, &:hover { + box-shadow: 0 1px 5px rgba(0, 0, 0, 0.15), 0 5px 10px 1px rgba(0, 0, 0, 0.3), 0 10px 30px rgba(0, 0, 0, 0.15); color: $black-text; outline: 0; text-decoration: none; - @include box-shadow(0 1px 5px rgba(0, 0, 0, 0.15), 0 5px 10px 1px rgba(0, 0, 0, 0.3), 0 10px 30px rgba(0, 0, 0, 0.15)); } &[disabled], fieldset[disabled] & { cursor: not-allowed; - @include opacity(0.5); + opacity: 0.5; } &.waves-effect { border: 0; padding: (($btn-height - $line-height) / 2) $grid-gutter; } } // colour @each $color in $palette-list { $i: index($palette-list, $color); - + .btn-#{$color} { background-color: nth($palette-color, $i); color: $white; &:active, &:focus, @@ -59,10 +59,19 @@ } } } // size + .btn-lg { + font-size: $font-size-h4; + line-height: $line-height-h4; + padding: (($base * 3 * 2.5 - $line-height-h4 - 2) / 2) ($grid-gutter * 1.5 - 1); + &.waves-effect { + padding: (($base * 3 * 2.5 - $line-height-h4) / 2) ($grid-gutter * 1.5); + } + } + .btn-sm { font-size: $font-size-h6; line-height: ($line-height - 2); padding: 0 ($grid-gutter / 2 - 1); &.waves-effect { @@ -74,46 +83,13 @@ display: block; white-space: normal; width: 100%; } -.btn-flat { - background-color: transparent; - @include box-shadow(none); - &:active, - &:focus, - &:hover { - background-color: $black-bg; - @include box-shadow(none); - } - &[disabled], - fieldset[disabled] & { - color: $black-text; - } -} - -// colour - @each $color in $palette-list { - $i: index($palette-list, $color); - - .btn-flat.btn-#{$color} { - color: nth($palette-color, $i); - &:active, - &:focus, - &:hover { - background-color: nth($palette-color-light, $i); - } - &[disabled], - fieldset[disabled] & { - color: nth($palette-color, $i); - } - } - } - .btn-text { color: $black-text; display: inline-block; font-size: $font-size; - font-weight: 400; + font-weight: $font-weight; line-height: $line-height; padding: (($btn-height - $line-height) / 2) 0; -} \ No newline at end of file +}