javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-10 00:27:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(button): do not change border radius if round button in toolbar (#14941)

Browse Source 
fixes #7661
This commit is contained in:
Brandy Carney
2018-07-30 15:59:33 -04:00
committed by GitHub
parent c05d672703
commit ad006dd1ee
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/components/buttons/buttons.ios.scss
View File

@ -10,13 +10,16 @@
--pading-bottom: 0;
--padding-start: 5px;
--padding-end: 5px;
--border-radius: #{$toolbar-ios-button-border-radius};
--height: 32px;
font-size: #{$toolbar-ios-button-font-size};
font-weight: 400;
}
::slotted(*) .button:not(.button-round) {
--border-radius: #{$toolbar-ios-button-border-radius};
}
:host-context(.ion-color)::slotted(*) .button {
--ion-color-base: currentColor;
}

4
core/src/components/buttons/buttons.md.scss
View File

@ -13,7 +13,6 @@
--padding-bottom: 0;
--padding-start: 8px;
--padding-end: 8px;
--border-radius: #{$toolbar-md-button-border-radius};
--height: 32px;
--box-shadow: none;
@ -21,6 +20,9 @@
font-weight: 500;
}
::slotted(*) .button:not(.button-round) {
--border-radius: #{$toolbar-md-button-border-radius};
}
// Material Design Toolbar Button Icon
// --------------------------------------------------