Skip to content

Commit

Permalink
Merge pull request #9411 from andycochran/tab-background-active-color
Browse files Browse the repository at this point in the history
rename tab-background-active-color to tab-active-color
  • Loading branch information
kball committed Nov 28, 2016
2 parents 86ebf14 + e617b60 commit ad03f22
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions scss/components/_tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ $tab-background-active: $light-gray !default;

/// Active font color of tab item.
/// @type Color
$tab-background-active-color: $primary-color !default;
$tab-active-color: $primary-color !default;

/// Font size of tab items.
/// @type Number
Expand Down Expand Up @@ -84,7 +84,7 @@ $tab-content-padding: 1rem !default;
$padding: $tab-item-padding,
$font-size: $tab-item-font-size,
$color: $tab-color,
$color-active: $tab-background-active-color,
$color-active: $tab-active-color,
$background-hover: $tab-item-background-hover,
$background-active: $tab-background-active
) {
Expand Down
2 changes: 1 addition & 1 deletion scss/settings/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ $tab-margin: 0;
$tab-background: $white;
$tab-color: $primary-color;
$tab-background-active: $light-gray;
$tab-background-active-color: $primary-color;
$tab-active-color: $primary-color;
$tab-item-font-size: rem-calc(12);
$tab-item-background-hover: $white;
$tab-item-padding: 1.25rem 1.5rem;
Expand Down

0 comments on commit ad03f22

Please sign in to comment.