javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(tabs): add sass variable for inactive opacity and pass it to the colors loop

Browse Source
This commit is contained in:
Brandy Carney
2016-07-15 17:03:05 -04:00
parent 0386476879
commit 99efa3687f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/tabs/tabs.md.scss
View File

@@ -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 {
@@ -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),

5
src/components/tabs/tabs.wp.scss
View File

@@ -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;
@@ -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),