assets/stylesheets/modules/buttons/_buttons.sass in middleman-oulu-0.7.6 vs assets/stylesheets/modules/buttons/_buttons.sass in middleman-oulu-0.7.7

- old
+ new

@@ -1,25 +1,20 @@ $button-sizes: xs, sm, md, lg, xl !default $button-color-names: default, primary, success, warning, danger !default -$button-styles: normal, border, bold-border, flat-emboss, material !default +$button-styles: normal, border, bold-border, flat-emboss, material, flat-round !default @import button-base // button styles @import styles/normal @import styles/border @import styles/flat-emboss @import styles/material +@import styles/flat-round @import button-helper -// inputのスタイルを継承させる -input[type= submit] - color: inherit - font-size: inherit - font-weight: inherit - =button($style, $size, $color, $options: false) +button-base @if $style == normal +button-size($size, 1px, 4px) +normal-button($color) @@ -33,9 +28,12 @@ +button-size($size, false, 4px) +flat-emboss-button($color) @else if $style == material +button-size($size, false, false) +material-button($color) + @else if $style == flat-round + +button-size($size, false, false) + +flat-round-button($color) @each $option in $options @if $option == 'left' text-align: left @if $option == 'right' text-align: right