javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 05:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(toolbar): change to activated background color

Browse Source
This commit is contained in:
Ross Gerbasi
2018-02-13 17:44:13 -06:00
parent ee887a4842
commit fda46431d5
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/src/components/toolbar/toolbar.ios.scss
View File

@ -199,7 +199,7 @@
background-color: transparent; background-color: transparent;
&.activated { &.activated {
color: $toolbar-ios-text-color; color: $toolbar-ios-background-color;
background-color: $toolbar-ios-button-color; background-color: $toolbar-ios-button-color;
} }
} }

2
packages/core/src/components/toolbar/toolbar.ios.vars.scss
View File

@ -28,7 +28,7 @@ $toolbar-ios-button-color: ion-color($colors-ios, prima
$toolbar-ios-button-background-color: $toolbar-ios-background-color !default; $toolbar-ios-button-background-color: $toolbar-ios-background-color !default;
/// @prop - Background color of the toolbar button when activated /// @prop - Background color of the toolbar button when activated
$toolbar-ios-button-background-color-activated: ion-color($colors-ios, primary, tint, ios); $toolbar-ios-button-background-color-activated: $toolbar-ios-color-active !default;
/// @prop - Border radius of the toolbar button /// @prop - Border radius of the toolbar button
$toolbar-ios-button-border-radius: 4px !default; $toolbar-ios-button-border-radius: 4px !default;

2
packages/core/src/components/toolbar/toolbar.md.vars.scss
View File

@ -28,7 +28,7 @@ $toolbar-md-button-color: $toolbar-md-text-color !defaul
$toolbar-md-button-background-color: $toolbar-md-background-color !default; $toolbar-md-button-background-color: $toolbar-md-background-color !default;
/// @prop - Background color of the toolbar button when activated /// @prop - Background color of the toolbar button when activated
$toolbar-md-button-background-color-activated: ion-color($colors-md, primary, tint, md); $toolbar-md-button-background-color-activated: $toolbar-md-color-active !default;
/// @prop - Border radius of the toolbar button /// @prop - Border radius of the toolbar button
$toolbar-md-button-border-radius: 2px !default; $toolbar-md-button-border-radius: 2px !default;

2
packages/core/src/themes/ionic.theme.default.md.scss
View File

@ -105,7 +105,7 @@ $toolbar-md-height: 56px !default;
$toolbar-md-padding: 4px !default; $toolbar-md-padding: 4px !default;
$toolbar-md-background-color: css-var($toolbar-background-color, toolbar-md-background-color) !default; $toolbar-md-background-color: css-var($toolbar-background-color, toolbar-md-background-color) !default;
$toolbar-md-border-color: css-var($border-md-color, toolbar-md-border-color) !default; $toolbar-md-border-color: css-var($border-md-color, toolbar-md-border-color) !default;
$toolbar-md-color-active: css-var($toolbar-color-active, toolbar-md-color-active) !default; $toolbar-md-color-active: css-var(#4a4a4a, toolbar-md-color-active) !default;
$toolbar-md-color-inactive: css-var($toolbar-color-inactive, toolbar-md-color-inactive) !default; $toolbar-md-color-inactive: css-var($toolbar-color-inactive, toolbar-md-color-inactive) !default;
$toolbar-md-text-color: css-var(#424242, toolbar-md-text-color) !default; $toolbar-md-text-color: css-var(#424242, toolbar-md-text-color) !default;

2
packages/core/src/themes/ionic.theme.default.scss
View File

@ -198,7 +198,7 @@ $tabbar-text-color: css-var(#8c8c8c, tabbar-text-color) !def
// -------------------------------------------------- // --------------------------------------------------
$toolbar-background-color: css-var(#f8f8f8, toolbar-background-color) !default; $toolbar-background-color: css-var(#f8f8f8, toolbar-background-color) !default;
$toolbar-border-color: css-var($border-color, toolbar-border-color) !default; $toolbar-border-color: css-var($border-color, toolbar-border-color) !default;
$toolbar-color-active: css-var(#488aff, toolbar-color-active) !default; $toolbar-color-active: css-var(#4a4a4a, toolbar-color-active) !default;
$toolbar-color-inactive: css-var(#8c8c8c, toolbar-color-inactive) !default; $toolbar-color-inactive: css-var(#8c8c8c, toolbar-color-inactive) !default;
$toolbar-text-color: css-var($text-color, toolbar-text-color) !default; $toolbar-text-color: css-var($text-color, toolbar-text-color) !default;