-
Notifications
You must be signed in to change notification settings - Fork 13.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(toolbar): style all slotted content in order not only buttons (#1…
…6617) - style all slotted content to order properly in a toolbar, not only buttons - removes duplicated sass variables - use current color in select so icon will inherit toolbar color BREAKING CHANGES - Removes `--icon-color` and `--placeholder-color` from select in favor of inheritance with opacity
- Loading branch information
1 parent
0c61e79
commit 86fc9a5
Showing
19 changed files
with
151 additions
and
226 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1,5 @@ | ||
@import "../../themes/ionic.globals.ios"; | ||
@import "../toolbar/toolbar.ios.vars"; | ||
|
||
// iOS Toolbar | ||
// iOS Buttons | ||
// -------------------------------------------------- | ||
|
||
/// @prop - Order of the toolbar elements | ||
$toolbar-order-ios: ( | ||
back-button: 0, | ||
menu-toggle-start: 1, | ||
buttons-start: 2, | ||
buttons-secondary: 3, | ||
content: 4, | ||
buttons-primary: 5, | ||
buttons-end: 6, | ||
menu-toggle-end: 7, | ||
); | ||
|
||
/// @prop - Font size of the toolbar button | ||
$toolbar-ios-button-font-size: 17px !default; | ||
|
||
/// @prop - Text color of the toolbar button | ||
$toolbar-ios-button-color: ion-color(primary, base) !default; | ||
|
||
/// @prop - Background color of the toolbar button | ||
$toolbar-ios-button-background-color: $toolbar-ios-background !default; | ||
|
||
/// @prop - Background color of the toolbar button when activated | ||
$toolbar-ios-button-background-color-activated: $toolbar-ios-color-activated !default; | ||
|
||
/// @prop - Border radius of the toolbar button | ||
$toolbar-ios-button-border-radius: 4px !default; | ||
|
||
/// @prop - Font weight of the strong toolbar button | ||
$toolbar-ios-button-strong-font-weight: 600 !default; | ||
|
||
/// @prop - Fill color of the toolbar button icon | ||
$toolbar-ios-button-icon-fill-color: currentColor !default; | ||
|
||
/// @prop - Filter of the translucent toolbar | ||
$toolbar-ios-translucent-filter: saturate(180%) blur(20px) !default; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,37 +1,5 @@ | ||
@import "../../themes/ionic.globals.md"; | ||
@import "../toolbar/toolbar.md.vars"; | ||
|
||
// Material Design Toolbar | ||
// Material Design Buttons | ||
// -------------------------------------------------- | ||
|
||
/// @prop - Order of the toolbar elements | ||
$toolbar-order-md: ( | ||
back-button: 0, | ||
menu-toggle-start: 1, | ||
buttons-start: 2, | ||
content: 3, | ||
buttons-secondary: 4, | ||
buttons-primary: 5, | ||
buttons-end: 6, | ||
menu-toggle-end: 7, | ||
); | ||
|
||
/// @prop - Font size of the toolbar button | ||
$toolbar-md-button-font-size: 14px !default; | ||
|
||
/// @prop - Text color of the toolbar button | ||
$toolbar-md-button-color: $toolbar-md-color !default; | ||
|
||
/// @prop - Background color of the toolbar button | ||
$toolbar-md-button-background-color: $toolbar-md-background !default; | ||
|
||
/// @prop - Background color of the toolbar button when activated | ||
$toolbar-md-button-background-color-activated: $toolbar-md-color-activated !default; | ||
|
||
/// @prop - Border radius of the toolbar button | ||
$toolbar-md-button-border-radius: 2px !default; | ||
|
||
/// @prop - Fill color of the toolbar button icon | ||
$toolbar-md-button-icon-fill-color: currentColor !default; | ||
|
||
/// @prop - Font weight of the strong toolbar button | ||
$toolbar-md-button-strong-font-weight: bold !default; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.