mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
Reviews the `--width` and `--height` variables in each component to either remove or add them based on need. - fixes a bug where the spinner color wasn't being set properly in loading - adds css variables for customizing background, color, some borders in overlays - fixes a bug where prefix, suffix are taking up too much width in picker closes #16097 references ionic-team/ionic-docs#228 BREAKING CHANGES ## Core Components Removes the `--width` and `--height` variables from the following components, in favor of CSS: - Button - FAB Button - Checkbox - Removes the `--width`/`--height` and adds a `--size` variable that is set on the width and height, allowing width and height to still be set and border-radius to still use it as a variable - Radio - Removes the `--width`/`--height` and `--inner-width`/`--inner-height` variables. Calculates inner values based on parent element size. ## Overlay Components The following components have all be converted to shadow (or scoped) and have CSS variables for width/height: - Action Sheet _(scoped)_ - Alert _(scoped)_ - Loading _(scoped)_ - Menu _(shadow)_ - Modal _(scoped)_ - Picker _(scoped)_ - Popover _(scoped)_ - Toast _(shadow)_ The above components will now have the following CSS variables for consistency among overlays: | Name | | ----------------- | | `--height` | | `--max-height` | | `--max-width` | | `--min-height` | | `--min-width` | | `--width` | If the component does not set the value, it will default to `auto`. ## Removed CSS Variables The following CSS properties have been removed: | Component | Property | Reason | | ---------------| --------------------| --------------------------------| | **Button** | `--height` | Use CSS instead | | **Button** | `--margin-bottom` | Use CSS instead | | **Button** | `--margin-end` | Use CSS instead | | **Button** | `--margin-start` | Use CSS instead | | **Button** | `--margin-top` | Use CSS instead | | **Button** | `--width` | Use CSS instead | | **Checkbox** | `--height` | Use CSS or `--size` | | **Checkbox** | `--width` | Use CSS or `--size` | | **FAB Button** | `--width` | Use CSS instead | | **FAB Button** | `--height` | Use CSS instead | | **FAB Button** | `--margin-bottom` | Use CSS instead | | **FAB Button** | `--margin-end` | Use CSS instead | | **FAB Button** | `--margin-start` | Use CSS instead | | **FAB Button** | `--margin-top | Use CSS instead | | **Menu** | `--width-small` | Use a media query and `--width` | | **Radio** | `--width` | Use CSS instead | | **Radio** | `--height` | Use CSS instead | | **Radio** | `--inner-height` | Calculated based on parent | | **Radio** | `--inner-width` | Calculated based on parent |
140 lines
3.7 KiB
SCSS
140 lines
3.7 KiB
SCSS
@import "./button";
|
|
@import "./button.md.vars";
|
|
|
|
// Material Design Button
|
|
// --------------------------------------------------
|
|
|
|
:host {
|
|
--border-radius: #{$button-md-border-radius};
|
|
--padding-top: #{$button-md-padding-top};
|
|
--padding-bottom: #{$button-md-padding-bottom};
|
|
--padding-start: #{$button-md-padding-start};
|
|
--padding-end: #{$button-md-padding-end};
|
|
--transition: box-shadow 280ms cubic-bezier(.4, 0, .2, 1),
|
|
background-color 15ms linear,
|
|
color 15ms linear;
|
|
|
|
@include margin($button-md-margin-top, $button-md-margin-end, $button-md-margin-bottom, $button-md-margin-start);
|
|
|
|
height: #{$button-md-height};
|
|
|
|
font-size: #{$button-md-font-size};
|
|
font-weight: #{$button-md-font-weight};
|
|
|
|
letter-spacing: #{$button-md-letter-spacing};
|
|
|
|
text-transform: #{$button-md-text-transform};
|
|
}
|
|
|
|
// Material Design Solid Button
|
|
// --------------------------------------------------
|
|
|
|
:host(.button-solid) {
|
|
--background-activated: var(--background);
|
|
--box-shadow: #{$button-md-box-shadow};
|
|
}
|
|
|
|
:host(.button-solid.activated) {
|
|
--box-shadow: #{$button-md-box-shadow-activated};
|
|
}
|
|
|
|
// Material Design Outline Button
|
|
// --------------------------------------------------
|
|
|
|
:host(.button-outline) {
|
|
--border-width: 2px;
|
|
--border-style: solid;
|
|
--box-shadow: none;
|
|
--background-activated: transparent;
|
|
--background-focused: #{ion-color(primary, base, .1)};
|
|
--color-activated: #{ion-color(primary, base)};
|
|
}
|
|
|
|
:host(.button-outline.activated.ion-color) .button-native {
|
|
background: transparent;
|
|
}
|
|
|
|
|
|
// Material Design Clear Button
|
|
// --------------------------------------------------
|
|
|
|
:host(.button-clear) {
|
|
--opacity: #{$button-md-clear-opacity};
|
|
--background-activated: transparent;
|
|
--background-focused: #{ion-color(primary, base, .1)};
|
|
--color-activated: #{ion-color(primary, base)};
|
|
--color-focused: #{ion-color(primary, base)};
|
|
}
|
|
|
|
|
|
// Material Design Round Button
|
|
// --------------------------------------------------
|
|
|
|
:host(.button-round) {
|
|
--border-radius: #{$button-md-round-border-radius};
|
|
--padding-top: #{$button-md-round-padding-top};
|
|
--padding-start: #{$button-md-round-padding-start};
|
|
--padding-end: #{$button-md-round-padding-end};
|
|
--padding-bottom: #{$button-md-round-padding-bottom};
|
|
}
|
|
|
|
|
|
// Material Design Button Sizes
|
|
// --------------------------------------------------
|
|
|
|
:host(.button-large) {
|
|
--padding-top: #{$button-md-large-padding-top};
|
|
--padding-start: #{$button-md-large-padding-start};
|
|
--padding-end: #{$button-md-large-padding-end};
|
|
--padding-bottom: #{$button-md-large-padding-bottom};
|
|
|
|
height: #{$button-md-large-height};
|
|
|
|
font-size: #{$button-md-large-font-size};
|
|
}
|
|
|
|
:host(.button-small) {
|
|
--padding-top: #{$button-md-small-padding-top};
|
|
--padding-start: #{$button-md-small-padding-start};
|
|
--padding-end: #{$button-md-small-padding-end};
|
|
--padding-bottom: #{$button-md-small-padding-bottom};
|
|
|
|
height: #{$button-md-small-height};
|
|
|
|
font-size: #{$button-md-small-font-size};
|
|
}
|
|
|
|
|
|
// MD strong Button
|
|
// --------------------------------------------------
|
|
|
|
:host(.button-strong) {
|
|
font-weight: #{$button-md-strong-font-weight};
|
|
}
|
|
|
|
::slotted(ion-icon[slot="icon-only"]) {
|
|
@include padding(0);
|
|
}
|
|
|
|
|
|
// Material Design Button Sizes
|
|
// --------------------------------------------------
|
|
|
|
@media (any-hover: hover) {
|
|
:host(.button-outline:hover) .button-native {
|
|
background: ion-color(primary, base, .04);
|
|
}
|
|
|
|
:host(.button-outline.ion-color:hover) .button-native {
|
|
background: current-color(base, .04);
|
|
}
|
|
|
|
:host(.button-clear:hover) .button-native {
|
|
background: ion-color(primary, base, .04);
|
|
}
|
|
|
|
:host(.button-clear.ion-color:hover) .button-native {
|
|
background: current-color(base, .04);
|
|
}
|
|
}
|