Skip to content

fix(theme): apply base theme classes at location the theme is included #10737

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.

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

Merged
merged 1 commit into from
Apr 11, 2018

Conversation

josephperrott
Copy link
Member

No description provided.

@josephperrott josephperrott added pr: needs review target: patch This PR is targeted for the next patch release labels Apr 6, 2018
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Apr 6, 2018
@@ -48,7 +49,8 @@
}

// Marker that is used to determine whether the user has added a theme to their page.
.mat-theme-loaded-marker {
.mat-theme-loaded-marker,
&.mat-theme-loaded-marker {
Copy link
Member

Choose a reason for hiding this comment

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

This one should actually be @at-root

@@ -48,7 +49,8 @@
}

// Marker that is used to determine whether the user has added a theme to their page.
.mat-theme-loaded-marker {
.mat-theme-loaded-marker,
&.mat-theme-loaded-marker {
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure whether it makes sense to change the selector on this one. The class gets applied to an element that we create dynamically which gets removed immediately afterwards.

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 pr: lgtm action: merge The PR is ready for merge by the caretaker and removed pr: needs review labels Apr 6, 2018
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

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

LGTM

@tinayuangao tinayuangao merged commit 2aba8ab into angular:master Apr 11, 2018
@angular-automatic-lock-bot
Copy link

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 Sep 8, 2019
@josephperrott josephperrott deleted the corestyle branch March 20, 2020 22:15
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants