lib/assets/stylesheets/tao/ui/shared/variables/_buttons.scss in tao_ui-0.2.2 vs lib/assets/stylesheets/tao/ui/shared/variables/_buttons.scss in tao_ui-0.2.3
- old
+ new
@@ -1,55 +1,61 @@
-$button-font-size: $font-size !default;
+$button-color: $green-color !default;
+$button-hover-color: #66cc33 !default;
+$button-active-color: #22AA11 !default;
+$button-warn-color: $red-color !default;
+$button-warn-active-color: #EE6633 !default;
+
+$button-font-size: 1rem !default;
$button-line-height: 1.5 !default;
$button-padding-v: 0.4375em !default;
$button-padding-h: 1.25em !default;
$button-padding: $button-padding-v $button-padding-h !default;
-$small-button-font-size: $font-size-xs !default;
+$small-button-font-size: 0.75rem !default;
$small-button-line-height: 1.5 !default;
$small-button-padding-v: 0.25em !default;
$small-button-padding-h: 0.875em !default;
$small-button-padding: $small-button-padding-v $small-button-padding-h !default;
$default-button-colors: (
normal: (
bg: $white-color,
- text: $ui-color,
+ text: $button-color,
border: $border-color
),
hover: (
bg: $white-color,
- text: #66cc33,
- border: #66cc33
+ text: $button-hover-color,
+ border: $button-hover-color
),
active: (
bg: $white-color,
- text: #22AA11,
- border: #22AA11
+ text: $button-active-color,
+ border: $button-active-color
),
disable: (
bg: $white-color,
text: $lightest-grey-color,
border: $lighter-line-color
)
) !default;
$primary-button-colors: (
normal: (
- bg: $ui-color,
+ bg: $button-color,
text: $white-color,
- border: $ui-color
+ border: $button-color
),
hover: (
- bg: #66cc33,
+ bg: $button-hover-color,
text: $white-color,
- border: #66cc33
+ border: $button-hover-color
),
active: (
- bg: #22AA11,
+ bg: $button-active-color,
text: $white-color,
- border: #22AA11
+ border: $button-active-color
),
disable: (
bg: $border-color,
text: $white-color,
border: $border-color
@@ -57,21 +63,21 @@
) !default;
$warning-button-colors: map-merge($default-button-colors, (
normal: (
bg: $white-color,
- text: $red-color,
- border: $red-color
+ text: $button-warn-color,
+ border: $button-warn-color
),
hover: (
- bg: $red-color,
+ bg: $button-warn-color,
text: $white-color,
- border: $red-color
+ border: $button-warn-color
),
active: (
- bg: #EE6633,
+ bg: $button-warn-active-color,
text: $white-color,
- border: #EE6633
+ border: $button-warn-active-color
)
)) !default;
$icon-button-colors: map-merge($default-button-colors, (
normal: (