Skip to content

Commit

Permalink
fix(sass): add border support to mixin. Fixes #4886
Browse files Browse the repository at this point in the history
  • Loading branch information
@mlynch
mlynch committed Dec 31, 2015
1 parent 29a33d7 commit 129cc97
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions scss/_mixins.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
// --------------------------------------------------

@mixin button-style($bg-color, $border-color, $active-bg-color, $active-border-color, $color) {
border-color: transparent;//$border-color;
border-color: $border-color;

background-color: $bg-color;
color: $color;

Expand All @@ -14,9 +15,8 @@
}
&.active,
&.activated {
//border-color: transparent;//$active-border-color;
border-color: $active-border-color;
background-color: $active-bg-color;
//box-shadow: inset 0 1px 4px rgba(0,0,0,0.1);
}
}

Expand Down
36 changes: 18 additions & 18 deletions scss/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,57 +95,57 @@ $button-bar-button-icon-size: 20px !default;

$button-light-bg: $light !default;
$button-light-text: #444 !default;
$button-light-border: #ddd !default;
$button-light-border: transparent !default;
$button-light-active-bg: #fafafa !default;
$button-light-active-border: #ccc !default;
$button-light-active-border: transparent !default;

$button-stable-bg: $stable !default;
$button-stable-text: #444 !default;
$button-stable-border: #b2b2b2 !default;
$button-stable-border: transparent !default;
$button-stable-active-bg: #e5e5e5 !default;
$button-stable-active-border: #a2a2a2 !default;
$button-stable-active-border: transparent !default;

$button-positive-bg: $positive !default;
$button-positive-text: #fff !default;
$button-positive-border: darken($positive, 10%) !default;
$button-positive-border: transparent !default;
$button-positive-active-bg: darken($positive, 10%) !default;
$button-positive-active-border: darken($positive, 10%) !default;
$button-positive-active-border: transparent !default;

$button-calm-bg: $calm !default;
$button-calm-text: #fff !default;
$button-calm-border: darken($calm, 10%) !default;
$button-calm-border: transparent !default;
$button-calm-active-bg: darken($calm, 10%) !default;
$button-calm-active-border: darken($calm, 10%) !default;
$button-calm-active-border: transparent !default;

$button-assertive-bg: $assertive !default;
$button-assertive-text: #fff !default;
$button-assertive-border: darken($assertive, 10%) !default;
$button-assertive-border: transparent !default;
$button-assertive-active-bg: darken($assertive, 10%) !default;
$button-assertive-active-border: darken($assertive, 10%) !default;
$button-assertive-active-border: transparent !default;

$button-balanced-bg: $balanced !default;
$button-balanced-text: #fff !default;
$button-balanced-border: darken($balanced, 10%) !default;
$button-balanced-border: transparent !default;
$button-balanced-active-bg: darken($balanced, 10%) !default;
$button-balanced-active-border: darken($balanced, 10%) !default;
$button-balanced-active-border: transparent !default;

$button-energized-bg: $energized !default;
$button-energized-text: #fff !default;
$button-energized-border: darken($energized, 5%) !default;
$button-energized-border: transparent !default;
$button-energized-active-bg: darken($energized, 5%) !default;
$button-energized-active-border: darken($energized, 5%) !default;
$button-energized-active-border: transparent !default;

$button-royal-bg: $royal !default;
$button-royal-text: #fff !default;
$button-royal-border: darken($royal, 8%) !default;
$button-royal-border: transparent !default;
$button-royal-active-bg: darken($royal, 8%) !default;
$button-royal-active-border: darken($royal, 8%) !default;
$button-royal-active-border: transparent !default;

$button-dark-bg: $dark !default;
$button-dark-text: #fff !default;
$button-dark-border: #111 !default;
$button-dark-border: transparent !default;
$button-dark-active-bg: #262626 !default;
$button-dark-active-border: #000 !default;
$button-dark-active-border: transparent !default;

$button-default-bg: $button-stable-bg !default;
$button-default-text: $button-stable-text !default;
Expand Down

1 comment on commit 129cc97

@beatgrabe
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For others: This commit was reverted here commit 0e0e71c.

Please sign in to comment.