-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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(switch): Add color theme mixins and update default color to secondary #1411
Merged
Merged
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
4c415c6
feat(switch): Create theme color mixins
acdvorak 11274bb
WIP: Normalize copyright notice formatting
acdvorak 9f18c73
WIP: Move function to its own file for consistency
acdvorak 984bcba
WIP: Fix preexisting tap target bug
acdvorak c364607
WIP: Add custom examples to demo page
acdvorak d1631f5
WIP: Make unchecked color mixins private for now
acdvorak d8ad94e
WIP: Update README.md
acdvorak 26f45bc
WIP: Fix linter errors
acdvorak 4160d7c
WIP: Fix typo
acdvorak 086eac8
WIP: Remove unnecessary stylelint-disable comment in demo
acdvorak 486e0c5
WIP: Reorder CSS to match our convention
acdvorak 2c92ef3
WIP: Rename variable for clarity
acdvorak 08d4a90
Merge remote-tracking branch 'origin/master' into feat/theme/switch-m…
acdvorak a62e708
WIP: Simplify public mixin names
acdvorak d1329be
Merge branch 'master' into feat/theme/switch-mixins
acdvorak b55dc87
WIP: Update remaining references to old mixin names
acdvorak File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,21 @@ | ||
| // | ||
| // Copyright 2016 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. | ||
| // | ||
|
|
||
| @import "@material/animation/variables"; | ||
|
|
||
| @function mdc-switch-transition($property) { | ||
| @return $property 90ms $mdc-animation-standard-curve-timing-function; | ||
| } |
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,74 @@ | ||
| // | ||
| // Copyright 2016 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. | ||
| // | ||
|
|
||
| @import "@material/theme/mixins"; | ||
| @import "./variables"; | ||
|
|
||
| // | ||
| // Public | ||
| // | ||
|
|
||
| @mixin mdc-switch-checked-track-color($color) { | ||
| .mdc-switch__native-control:enabled:checked ~ .mdc-switch__background::before { | ||
| @include mdc-theme-prop(background-color, $color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-switch-checked-knob-color($color) { | ||
| // stylelint-disable-next-line selector-max-specificity | ||
| .mdc-switch__native-control:enabled:checked ~ .mdc-switch__background .mdc-switch__knob { | ||
| @include mdc-theme-prop(background-color, $color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-switch-checked-focus-indicator-color($color) { | ||
| // stylelint-disable-next-line selector-max-specificity | ||
| .mdc-switch__native-control:enabled:checked ~ .mdc-switch__background .mdc-switch__knob::before { | ||
| @include mdc-theme-prop(background-color, $color); | ||
| } | ||
| } | ||
|
|
||
| // | ||
| // Private | ||
| // | ||
|
|
||
| @mixin mdc-switch-unchecked-track-color_($color) { | ||
| .mdc-switch__native-control:enabled:not(:checked) ~ .mdc-switch__background::before { | ||
| @include mdc-theme-prop(background-color, $color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-switch-unchecked-knob-color_($color) { | ||
| // stylelint-disable-next-line selector-max-specificity | ||
| .mdc-switch__native-control:enabled:not(:checked) ~ .mdc-switch__background .mdc-switch__knob { | ||
| @include mdc-theme-prop(background-color, $color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-switch-unchecked-focus-indicator-color_($color) { | ||
| // stylelint-disable-next-line selector-max-specificity | ||
| .mdc-switch__native-control:enabled:not(:checked) ~ .mdc-switch__background .mdc-switch__knob::before { | ||
| @include mdc-theme-prop(background-color, $color); | ||
| } | ||
| } | ||
|
|
||
| @mixin mdc-switch-tap-target_ { | ||
| position: absolute; | ||
| top: -14px; | ||
| left: -14px; | ||
| width: $mdc-switch-focus-ring-diameter; | ||
| height: $mdc-switch-focus-ring-diameter; | ||
| } |
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
Oops, something went wrong.
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.
Should we just make this
mdc-switch-track-color($color)? Simplify our naming. (and the same for the other two)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.
Done