Skip to content
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

feat(select): allow setting the theme color #3928

Merged
merged 3 commits into from
Apr 21, 2017

Conversation

crisbeto
Copy link
Member

@crisbeto crisbeto commented Apr 6, 2017

  • Allows the user to set the theme color of a md-select.
  • Adds theming to the md-option component.
  • Tweaks the md-pseudo-checkbox theme to allow it to inherit the color.

Fixes #3923.

@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Apr 6, 2017
@@ -24,15 +24,15 @@
}

.mat-pseudo-checkbox-checked, .mat-pseudo-checkbox-indeterminate {
&.mat-primary {
&.mat-primary, .mat-primary & {
Copy link
Member

Choose a reason for hiding this comment

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

As we discovered in #4077, adding the & of the selector doesn't work with secondary themes


.mat-select-underline {
background-color: mat-color($primary);
}
Copy link
Member

Choose a reason for hiding this comment

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

Make this a mixin?

* Allows the user to set the theme color of a `md-select`.
* Adds theming to the `md-option` component.
* Tweaks the `md-pseudo-checkbox` theme to allow it to inherit the color.

Fixes angular#3923.
@crisbeto
Copy link
Member Author

crisbeto commented Apr 17, 2017

Addressed the feedback, rebased and cleaned up the select theming in general. Can you take another look @jelbourn?

@crisbeto
Copy link
Member Author

Fixed the theming on the options @jelbourn.

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

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker and removed pr: needs review labels Apr 17, 2017
crisbeto added a commit to crisbeto/material2 that referenced this pull request Apr 18, 2017
* Fixes certain theme selectors being broken due to uses of the `&` operator at the end of the selector.
* Adds a custom Stylelint rule to catch future improper uses of the ampersand inside themes.

Relates to angular#3928.
Fixes angular#4077.
@kara kara removed their assignment Apr 20, 2017
@kara kara merged commit 3a29d67 into angular:master Apr 21, 2017
crisbeto added a commit to crisbeto/material2 that referenced this pull request Apr 21, 2017
* Fixes certain theme selectors being broken due to uses of the `&` operator at the end of the selector.
* Adds a custom Stylelint rule to catch future improper uses of the ampersand inside themes.

Relates to angular#3928.
Fixes angular#4077.
@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 6, 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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

md-select has no color parameter
4 participants