From 3102351dc569ad86cb03d9875b9b528aade305f0 Mon Sep 17 00:00:00 2001 From: mmalerba Date: Tue, 12 Feb 2019 08:42:26 -0800 Subject: [PATCH] feat(feature-targeting): Rename main mixins to end with `-core-styles` (#4404) BREAKING CHANGE: The main mixins recently introduced to some packages in in v0.44.0 have been renamed from `mdc-foo` to `mdc-foo-core-styles`. (Importing baseline styles via `mdc-foo.scss` remains unaffected.) --- packages/mdc-button/_mixins.scss | 2 +- packages/mdc-button/mdc-button.scss | 2 +- packages/mdc-card/_mixins.scss | 2 +- packages/mdc-card/mdc-card.scss | 2 +- packages/mdc-checkbox/_mixins.scss | 2 +- packages/mdc-checkbox/mdc-checkbox.scss | 2 +- packages/mdc-list/_mixins.scss | 2 +- packages/mdc-list/mdc-list.scss | 2 +- packages/mdc-menu-surface/_mixins.scss | 2 +- packages/mdc-menu-surface/mdc-menu-surface.scss | 2 +- packages/mdc-menu/_mixins.scss | 2 +- packages/mdc-menu/mdc-menu.scss | 2 +- packages/mdc-radio/_mixins.scss | 2 +- packages/mdc-radio/mdc-radio.scss | 2 +- packages/mdc-switch/_mixins.scss | 2 +- packages/mdc-switch/mdc-switch.scss | 2 +- test/scss/feature-targeting.scss | 16 ++++++++-------- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/mdc-button/_mixins.scss b/packages/mdc-button/_mixins.scss index 5d0583e2521..bad666023f0 100644 --- a/packages/mdc-button/_mixins.scss +++ b/packages/mdc-button/_mixins.scss @@ -32,7 +32,7 @@ @import "@material/shape/functions"; @import "./variables"; -@mixin mdc-button($query: mdc-feature-all()) { +@mixin mdc-button-core-styles($query: mdc-feature-all()) { $feat-color: mdc-feature-create-target($query, color); $feat-structure: mdc-feature-create-target($query, structure); diff --git a/packages/mdc-button/mdc-button.scss b/packages/mdc-button/mdc-button.scss index bd4ec1e8c3d..87ea442d022 100644 --- a/packages/mdc-button/mdc-button.scss +++ b/packages/mdc-button/mdc-button.scss @@ -21,4 +21,4 @@ // @import "./mixins"; -@include mdc-button; +@include mdc-button-core-styles; diff --git a/packages/mdc-card/_mixins.scss b/packages/mdc-card/_mixins.scss index 8d9b1b6b89b..556bba5b93c 100644 --- a/packages/mdc-card/_mixins.scss +++ b/packages/mdc-card/_mixins.scss @@ -33,7 +33,7 @@ // Public // -@mixin mdc-card($query: mdc-feature-all()) { +@mixin mdc-card-core-styles($query: mdc-feature-all()) { // postcss-bem-linter: define card $feat-color: mdc-feature-create-target($query, color); diff --git a/packages/mdc-card/mdc-card.scss b/packages/mdc-card/mdc-card.scss index 3b783cfd215..153883b5ae2 100644 --- a/packages/mdc-card/mdc-card.scss +++ b/packages/mdc-card/mdc-card.scss @@ -21,4 +21,4 @@ // @import "./mixins"; -@include mdc-card; +@include mdc-card-core-styles; diff --git a/packages/mdc-checkbox/_mixins.scss b/packages/mdc-checkbox/_mixins.scss index c1d4aea9fc8..b2fbb26d247 100644 --- a/packages/mdc-checkbox/_mixins.scss +++ b/packages/mdc-checkbox/_mixins.scss @@ -33,7 +33,7 @@ // Public // -@mixin mdc-checkbox($query: mdc-feature-all()) { +@mixin mdc-checkbox-core-styles($query: mdc-feature-all()) { // postcss-bem-linter: define checkbox $feat-animation: mdc-feature-create-target($query, animation); diff --git a/packages/mdc-checkbox/mdc-checkbox.scss b/packages/mdc-checkbox/mdc-checkbox.scss index 65c25c8528f..936e9c9a135 100644 --- a/packages/mdc-checkbox/mdc-checkbox.scss +++ b/packages/mdc-checkbox/mdc-checkbox.scss @@ -21,4 +21,4 @@ // @import "./mixins"; -@include mdc-checkbox; +@include mdc-checkbox-core-styles; diff --git a/packages/mdc-list/_mixins.scss b/packages/mdc-list/_mixins.scss index 69c6b7db185..cafedf6c943 100644 --- a/packages/mdc-list/_mixins.scss +++ b/packages/mdc-list/_mixins.scss @@ -33,7 +33,7 @@ // Public // -@mixin mdc-list($query: mdc-feature-all()) { +@mixin mdc-list-core-styles($query: mdc-feature-all()) { $feat-color: mdc-feature-create-target($query, color); $feat-structure: mdc-feature-create-target($query, structure); $feat-typography: mdc-feature-create-target($query, typography); diff --git a/packages/mdc-list/mdc-list.scss b/packages/mdc-list/mdc-list.scss index de0773efe68..020277fbe4a 100644 --- a/packages/mdc-list/mdc-list.scss +++ b/packages/mdc-list/mdc-list.scss @@ -19,4 +19,4 @@ // THE SOFTWARE. @import "./mixins"; -@include mdc-list; +@include mdc-list-core-styles; diff --git a/packages/mdc-menu-surface/_mixins.scss b/packages/mdc-menu-surface/_mixins.scss index 9a43a4b534e..a5573ff443f 100644 --- a/packages/mdc-menu-surface/_mixins.scss +++ b/packages/mdc-menu-surface/_mixins.scss @@ -33,7 +33,7 @@ // Public // -@mixin mdc-menu-surface($query: mdc-feature-all()) { +@mixin mdc-menu-surface-core-styles($query: mdc-feature-all()) { $feat-structure: mdc-feature-create-target($query, structure); // postcss-bem-linter: define menu-surface diff --git a/packages/mdc-menu-surface/mdc-menu-surface.scss b/packages/mdc-menu-surface/mdc-menu-surface.scss index 7bbaf44a50f..d90664ea307 100644 --- a/packages/mdc-menu-surface/mdc-menu-surface.scss +++ b/packages/mdc-menu-surface/mdc-menu-surface.scss @@ -21,4 +21,4 @@ // @import "./mixins"; -@include mdc-menu-surface; +@include mdc-menu-surface-core-styles; diff --git a/packages/mdc-menu/_mixins.scss b/packages/mdc-menu/_mixins.scss index fc54232ab0b..d716195e92c 100644 --- a/packages/mdc-menu/_mixins.scss +++ b/packages/mdc-menu/_mixins.scss @@ -27,7 +27,7 @@ @import "@material/ripple/mixins"; @import "./variables"; -@mixin mdc-menu($query: mdc-feature-all()) { +@mixin mdc-menu-core-styles($query: mdc-feature-all()) { $feat-color: mdc-feature-create-target($query, color); $feat-structure: mdc-feature-create-target($query, structure); diff --git a/packages/mdc-menu/mdc-menu.scss b/packages/mdc-menu/mdc-menu.scss index 3d4a3cc1c83..76c2a1b5c97 100644 --- a/packages/mdc-menu/mdc-menu.scss +++ b/packages/mdc-menu/mdc-menu.scss @@ -21,4 +21,4 @@ // @import "./mixins"; -@include mdc-menu; +@include mdc-menu-core-styles; diff --git a/packages/mdc-radio/_mixins.scss b/packages/mdc-radio/_mixins.scss index b800b628791..1bd3696c9f2 100644 --- a/packages/mdc-radio/_mixins.scss +++ b/packages/mdc-radio/_mixins.scss @@ -30,7 +30,7 @@ @import "./functions"; @import "./variables"; -@mixin mdc-radio($query: mdc-feature-all()) { +@mixin mdc-radio-core-styles($query: mdc-feature-all()) { // postcss-bem-linter: define radio $feat-animation: mdc-feature-create-target($query, animation); diff --git a/packages/mdc-radio/mdc-radio.scss b/packages/mdc-radio/mdc-radio.scss index 38c23d27f87..ce797d266a2 100644 --- a/packages/mdc-radio/mdc-radio.scss +++ b/packages/mdc-radio/mdc-radio.scss @@ -21,4 +21,4 @@ // @import "./mixins"; -@include mdc-radio; +@include mdc-radio-core-styles; diff --git a/packages/mdc-switch/_mixins.scss b/packages/mdc-switch/_mixins.scss index e1833c0b936..8a34c98b4a0 100644 --- a/packages/mdc-switch/_mixins.scss +++ b/packages/mdc-switch/_mixins.scss @@ -33,7 +33,7 @@ // Public // -@mixin mdc-switch($query: mdc-feature-all()) { +@mixin mdc-switch-core-styles($query: mdc-feature-all()) { // postcss-bem-linter: define switch $feat-animation: mdc-feature-create-target($query, animation); diff --git a/packages/mdc-switch/mdc-switch.scss b/packages/mdc-switch/mdc-switch.scss index 9d23d9f2fe0..611d510dabc 100644 --- a/packages/mdc-switch/mdc-switch.scss +++ b/packages/mdc-switch/mdc-switch.scss @@ -21,4 +21,4 @@ // @import "./mixins"; -@include mdc-switch; +@include mdc-switch-core-styles; diff --git a/test/scss/feature-targeting.scss b/test/scss/feature-targeting.scss index d19c1961f7d..b3332193f88 100644 --- a/test/scss/feature-targeting.scss +++ b/test/scss/feature-targeting.scss @@ -15,7 +15,7 @@ .mdc-test { // Button - @include mdc-button($query: mdc-feature-any()); + @include mdc-button-core-styles($query: mdc-feature-any()); @include mdc-button-filled-accessible(red, $query: mdc-feature-any()); @include mdc-button-container-fill-color(red, $query: mdc-feature-any()); @include mdc-button-outline-color(red, $query: mdc-feature-any()); @@ -26,14 +26,14 @@ @include mdc-button-outline-width(0, $query: mdc-feature-any()); // Card - @include mdc-card($query: mdc-feature-any()); + @include mdc-card-core-styles($query: mdc-feature-any()); @include mdc-card-fill-color(red, $query: mdc-feature-any()); @include mdc-card-outline(red, $query: mdc-feature-any()); @include mdc-card-shape-radius(0, $query: mdc-feature-any()); @include mdc-card-media-aspect-ratio(1, 1, $query: mdc-feature-any()); // Checkbox - @include mdc-checkbox($query: mdc-feature-any()); + @include mdc-checkbox-core-styles($query: mdc-feature-any()); @include mdc-checkbox-container-colors($query: mdc-feature-any()); @include mdc-checkbox-ink-color(red, $query: mdc-feature-any()); @include mdc-checkbox-focus-indicator-color(red, $query: mdc-feature-any()); @@ -43,7 +43,7 @@ @include mdc-elevation(0, $query: mdc-feature-any()); // List - @include mdc-list($query: mdc-feature-any()); + @include mdc-list-core-styles($query: mdc-feature-any()); @include mdc-list-item-primary-text-ink-color(red, $query: mdc-feature-any()); @include mdc-list-item-secondary-text-ink-color(red, $query: mdc-feature-any()); @include mdc-list-item-graphic-fill-color(red, $query: mdc-feature-any()); @@ -54,17 +54,17 @@ @include mdc-list-group-subheader-ink-color(red, $query: mdc-feature-any()); // Menu - @include mdc-menu($query: mdc-feature-any()); + @include mdc-menu-core-styles($query: mdc-feature-any()); @include mdc-menu-width(0, $query: mdc-feature-any()); // Menu Surface - @include mdc-menu-surface($query: mdc-feature-any()); + @include mdc-menu-surface-core-styles($query: mdc-feature-any()); @include mdc-menu-surface-fill-color(surface, $query: mdc-feature-any()); @include mdc-menu-surface-ink-color(on-surface, $query: mdc-feature-any()); @include mdc-menu-surface-shape-radius(medium, $query: mdc-feature-any()); // Radio - @include mdc-radio($query: mdc-feature-any()); + @include mdc-radio-core-styles($query: mdc-feature-any()); @include mdc-radio-unchecked-stroke-color(red, $query: mdc-feature-any()); @include mdc-radio-checked-stroke-color(red, $query: mdc-feature-any()); @include mdc-radio-ink-color(red, $query: mdc-feature-any()); @@ -88,7 +88,7 @@ @include mdc-shape-radius(1px 2px, true, $query: mdc-feature-any()); // Switch - @include mdc-switch($query: mdc-feature-any()); + @include mdc-switch-core-styles($query: mdc-feature-any()); @include mdc-switch-toggled-on-color(on-surface, $query: mdc-feature-any()); @include mdc-switch-toggled-off-color(on-surface, $query: mdc-feature-any()); @include mdc-switch-toggled-on-ripple-color(on-surface, $query: mdc-feature-any());