Skip to content

fix(material-experimental/theming): prefix elevation mixins with mdc #22600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
May 3, 2021
Merged

fix(material-experimental/theming): prefix elevation mixins with mdc #22600

merged 1 commit into from
May 3, 2021

Conversation

@jelbourn
Copy link
Member

@jelbourn jelbourn commented Apr 30, 2021

This adds an mdc- prefix in the _index.scss public API for material experimental. Without the prefix, this collides with the older elevation mixins. This collision is a problem in Google where we export both APIs through a combined entry-point.

@jelbourn jelbourn added area: theming target: rc This PR is targeted for the next release-candidate labels Apr 30, 2021
@jelbourn jelbourn requested a review from crisbeto April 30, 2021 04:04
@google-cla google-cla bot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Apr 30, 2021
@jelbourn
fix(material-experimental/mdc-theming): prefix elevation mixins with mdc
aedd6b9 
This adds an mdc- prefix in the `_index.scss` public API for material experimental. Without the prefix, this collides with the older elevation mixins. This collision is a problem in Google where we export both APIs through a combined entry-point.
@jelbourn jelbourn force-pushed the mdc-elevation-prefix branch from 279ef82 to aedd6b9 Compare April 30, 2021 05:04
crisbeto
crisbeto approved these changes Apr 30, 2021
View reviewed changes
Copy link
Member

@crisbeto crisbeto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@crisbeto crisbeto added the action: merge The PR is ready for merge by the caretaker label Apr 30, 2021
@jelbourn
Copy link
Member Author

jelbourn commented Apr 30, 2021

Marking as merge safe because I ran a presubmit for this and nothing was affected

@annieyw annieyw merged commit 0f9c1e6 into angular:master May 3, 2021
annieyw pushed a commit that referenced this pull request May 3, 2021
@jelbourn @annieyw
fix(material-experimental/mdc-theming): prefix elevation mixins with …
7a52bdf 
…mdc (#22600)

This adds an mdc- prefix in the `_index.scss` public API for material experimental. Without the prefix, this collides with the older elevation mixins. This collision is a problem in Google where we export both APIs through a combined entry-point.

(cherry picked from commit 0f9c1e6)
@angular-automatic-lock-bot
Copy link

angular-automatic-lock-bot bot commented Jun 3, 2021

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Jun 3, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@crisbeto crisbeto crisbeto approved these changes

Assignees

No one assigned

Labels

action: merge The PR is ready for merge by the caretaker area: theming cla: yes PR author has agreed to Google's Contributor License Agreement target: rc This PR is targeted for the next release-candidate

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jelbourn @crisbeto @annieyw