app/assets/stylesheets/modules/buttons/_buttons.sass in oulu-0.19.1 vs app/assets/stylesheets/modules/buttons/_buttons.sass in oulu-1.0.0.beta1
- old
+ new
@@ -1,52 +1,40 @@
@import button-base
// button styles
@import styles/normal
@import styles/border
-@import styles/flat
@import styles/flat-emboss
@import styles/material
@import styles/flat-round
@import styles/super-bold-border
-@import styles/standard
-@import styles/simple
@import button-helper
-@import button-sizes
=button($style, $size, $color, $options: false)
+ +button-base
@if $style == normal
- +button-size($size, .0625rem, .25rem)
+ +button-size($size, 1px, 4px)
+normal-button($color)
@else if $style == border
- +button-size($size, .0625rem, .25rem)
+ +button-size($size, 1px, 4px)
+border-button($color)
@else if $style == bold-border
- +button-size($size, .125rem, .5rem)
+ +button-size($size, 2px, 8px)
+border-button($color)
- @else if $style == flat
- +button-size($size, .0625rem, .25rem)
- +flat-button($color)
@else if $style == flat-emboss
- +button-size($size, false, .25rem)
+ +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, 1000px)
+flat-round-button($color)
@else if $style == super-bold-border
- +button-size($size, .25rem, .375rem)
+ +button-size($size, false, 3px)
+super-bold-border-button($color, $size)
- @else if $style == standard
- +button-size($size, .0625rem, .25rem)
- +standard-button($color)
- @else if $style == simple
- +button-size($size, false, .1875rem)
- +simple-button($color)
@each $option in $options
@if $option == 'left'
text-align: left
@if $option == 'right'
text-align: right
@@ -68,10 +56,6 @@
$button-color: $warning
@else if $button-color-name == danger
$button-color: $danger
@else if $button-color-name == info
$button-color: $info
- @else if $button-color-name == twitter
- $button-color: $twitter
- @else if $button-color-name == facebook
- $button-color: $facebook
+button($button-style, $button-size, $button-color)