Skip to content

refactor(option): move styles out of mat-core and into styleUrls #9115

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
Jan 23, 2018

Conversation

crisbeto
Copy link
Member

Moves the styling for MatOption and MatOptgroup out of the mat-core mixin and into their components' respective styleUrls. This avoids the styles potentially being included multiple times if mat-core is used in different places and is consistent with all other components.

@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Dec 24, 2017
@crisbeto crisbeto force-pushed the option-styling-location branch 3 times, most recently from 904a77a to 99c8dbc Compare December 24, 2017 10:20
Moves the styling for `MatOption` and `MatOptgroup` out of the `mat-core` mixin and into their components' respective `styleUrls`. This avoids the styles potentially being included multiple times if `mat-core` is used in different places and is consistent with all other components.
@crisbeto crisbeto force-pushed the option-styling-location branch from 99c8dbc to ab26792 Compare December 24, 2017 10:24
@@ -7,7 +7,7 @@ ng_module(
name = "core",
srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
module_name = "@angular/material/core",
assets = [":pseudo_checkbox_css"],
assets = [":pseudo_checkbox_css", ":option_css", ":optgroup_css"],
Copy link
Member Author

Choose a reason for hiding this comment

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

@jelbourn these changes seem to make Bazel happy, but I'm not sure whether it's the proper way to do it.

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

Assets are right for the ng_module rule

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release and removed pr: needs review labels Jan 12, 2018
@jelbourn jelbourn merged commit c3f662e into angular:master Jan 23, 2018
jelbourn pushed a commit to jelbourn/components that referenced this pull request Jan 29, 2018
…ular#9115)

Moves the styling for `MatOption` and `MatOptgroup` out of the `mat-core` mixin and into their components' respective `styleUrls`. This avoids the styles potentially being included multiple times if `mat-core` is used in different places and is consistent with all other components.
@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
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.

3 participants