feat(select): Move colors for default select to mixins #1934
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| // | ||
| // Copyright 2018 Google Inc. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| // Public | ||
|
|
||
| @mixin mdc-select-ink-color($color) { | ||
| :not(.mdc-select--disabled) { | ||
| @include mdc-select-ink-color_($color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-fill-color($color) { | ||
| :not(.mdc-select--disabled) { | ||
| @include mdc-select-fill-color_($color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-label-color($color) { | ||
| &:not(.mdc-select--disabled) { | ||
| @include mdc-select-label-color_($color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-focused-label-color($color, $opacity: .87) { | ||
| &:not(.mdc-select--disabled) { | ||
| @include mdc-select-focused-label-color_($color, $opacity); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-bottom-line-color($color) { | ||
| &:not(.mdc-select--disabled) { | ||
| @include mdc-select-bottom-line-color_($color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-focused-bottom-line-color($color) { | ||
| &:not(.mdc-select--disabled) { | ||
| @include mdc-select-focused-bottom-line-color_($color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-selected-text-color($color) { | ||
| &:not(.mdc-select--disabled) { | ||
| @include mdc-select-selected-text-color_($color); | ||
| } | ||
| } | ||
|
|
||
| // Private | ||
|
|
||
| @mixin mdc-select-ink-color_($color) { | ||
| .mdc-select__surface { | ||
| @include mdc-theme-prop(color, $color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-fill-color_($color) { | ||
| .mdc-select__surface { | ||
| @include mdc-theme-prop(background-color, $color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-label-color_($color) { | ||
| .mdc-select__label { | ||
| @include mdc-theme-prop(color, $color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-focused-label-color_($color, $opacity: .87) { | ||
| .mdc-select__surface:focus .mdc-select__label { | ||
| @include mdc-theme-prop(color, $color); | ||
| } | ||
|
|
||
| // Separate parameter is used for opacity, because opacity is only applied when the | ||
| // label is floating, but the label is the same color when the select is focused | ||
| // but an option has not been selected. | ||
| .mdc-select__surface:focus .mdc-select__label--float-above { | ||
| opacity: $opacity; | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-bottom-line-color_($color) { | ||
| .mdc-select__bottom-line { | ||
| @include mdc-theme-prop(background-color, $color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-focused-bottom-line-color_($color) { | ||
| .mdc-select__surface:focus .mdc-select__bottom-line, | ||
| .mdc-select__surface:focus ~ .mdc-select__bottom-line { | ||
|
There was a problem hiding this comment. why do you need both these selectors? There was a problem hiding this comment. JS version has bottom line as a child element. CSS version is a sibling element. |
||
| @include mdc-theme-prop(background-color, $color); | ||
| } | ||
|
|
||
| .mdc-select--open .mdc-select__bottom-line { | ||
| @include mdc-theme-prop(background-color, $color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-selected-text-color_($color) { | ||
| .mdc-select__selected-text { | ||
| @include mdc-theme-prop(color, $color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-select-dd-arrow-svg-bg_($fill-hex-number: 000000, $opacity: .54) { | ||
| background-image: url(data:image/svg+xml,%3Csvg%20width%3D%2210px%22%20height%3D%225px%22%20viewBox%3D%227%2010%2010%205%22%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%0A%20%20%20%20%3Cpolygon%20id%3D%22Shape%22%20stroke%3D%22none%22%20fill%3D%22%23#{$fill-hex-number}%22%20fill-rule%3D%22evenodd%22%20opacity%3D%22#{$opacity}%22%20points%3D%227%2010%2012%2015%2017%2010%22%3E%3C%2Fpolygon%3E%0A%3C%2Fsvg%3E); | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
container-fill-color, not just fill-color. Its a little more specific, since just "fill" is vague