Skip to content

Commit

Permalink
fix(tabs): add sass variable for inactive opacity and pass it to the …
Browse files Browse the repository at this point in the history
…colors loop
  • Loading branch information
brandyscarney committed Jul 15, 2016
1 parent 0386476 commit 99efa36
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions src/components/tabs/tabs.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ $tabbar-md-item-icon-size: 2.4rem !default;
$tabbar-md-item-height: 4.8rem !default;

$tab-button-md-active-color: $toolbar-md-active-color !default;
$tab-button-md-inactive-color: rgba($toolbar-md-inactive-color, .7) !default;
$tab-button-md-inactive-opacity: .7 !default;
$tab-button-md-inactive-color: rgba($toolbar-md-inactive-color, $tab-button-md-inactive-opacity) !default;


ion-tabbar {
Expand Down Expand Up @@ -103,7 +104,7 @@ tab-highlight {
background-color: $color-base;

.tab-button {
color: $color-contrast;
color: rgba($color-contrast, $tab-button-md-inactive-opacity);
}

.tab-button:hover:not(.disable-hover),
Expand Down
5 changes: 3 additions & 2 deletions src/components/tabs/tabs.wp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ $tabbar-wp-item-icon-size: 2.4rem !default;
$tabbar-wp-item-height: 4.8rem !default;

$tab-button-wp-active-color: $toolbar-wp-active-color !default;
$tab-button-wp-inactive-color: rgba($toolbar-wp-inactive-color, .7) !default;
$tab-button-wp-inactive-opacity: .7 !default;
$tab-button-wp-inactive-color: rgba($toolbar-wp-inactive-color, $tab-button-wp-inactive-opacity) !default;

$tab-button-wp-background-activated: rgba(0, 0, 0, .1) !default;

Expand Down Expand Up @@ -96,7 +97,7 @@ ion-tabbar {
background-color: $color-base;

.tab-button {
color: $color-contrast;
color: rgba($color-contrast, $tab-button-wp-inactive-opacity);
}

.tab-button:hover:not(.disable-hover),
Expand Down

0 comments on commit 99efa36

Please sign in to comment.