Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Commit

Permalink
feat(radio): Add theme color mixins and update default color to secon…
Browse files Browse the repository at this point in the history
…dary (#1410)

Resolves #1149
  • Loading branch information
acdvorak authored Oct 17, 2017
1 parent de9b5a5 commit da9d48f
Show file tree
Hide file tree
Showing 7 changed files with 250 additions and 125 deletions.
191 changes: 111 additions & 80 deletions demos/radio.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,6 @@
background-color: #303030;
}

/* Example of manually theming a radio. In a real app, the primary color would have enough
contrast from the dark background that this wouldn't be necessary. */
.mdc-theme--dark .mdc-radio__native-control:checked:not(:disabled) ~ .mdc-radio__background .mdc-radio__outer-circle {
border-color: #e91e63;
}
.mdc-theme--dark .mdc-radio__native-control:checked:not(:disabled) ~ .mdc-radio__background .mdc-radio__inner-circle {
background-color: #e91e63;
}
.mdc-theme--dark .mdc-radio__background::before {
background-color: #e91e63;
}
.mdc-theme--dark .mdc-radio.mdc-ripple-upgraded::before,
.mdc-theme--dark .mdc-radio.mdc-ripple-upgraded::after {
background-color: rgba(233, 31, 99, .2);
}

.example {
margin: 24px;
padding: 24px;
Expand Down Expand Up @@ -86,100 +70,147 @@


<section class="example">
<h2>With Javascript</h2>
<div class="mdc-form-field">
<div class="mdc-radio">
<input class="mdc-radio__native-control" type="radio" id="ex0-radio1" checked name="ex0">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
<h2>With JavaScript</h2>
<div class="demo-radio-row">
<div class="mdc-form-field">
<div class="mdc-radio">
<input class="mdc-radio__native-control" type="radio" id="ex0-default-radio1" checked name="ex0-default">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex0-default-radio1-label" for="ex0-default-radio1">Default Radio 1</label>
</div>
<div class="mdc-form-field">
<div class="mdc-radio">
<input class="mdc-radio__native-control" type="radio" id="ex0-default-radio2" name="ex0-default">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex0-default-radio2-label" for="ex0-default-radio2">Default Radio 2</label>
</div>
<label id="ex0-radio1-label" for="ex0-radio1">Radio 1</label>
</div>
<div class="mdc-form-field">
<div class="mdc-radio">
<input class="mdc-radio__native-control" type="radio" id="ex0-radio2" name="ex0">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
<div class="demo-radio-row">
<div class="mdc-form-field">
<div class="mdc-radio demo-radio--custom">
<input class="mdc-radio__native-control" type="radio" id="ex0-custom-radio1" checked name="ex0-custom">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex0-custom-radio1-label" for="ex0-custom-radio1">Custom Radio 1</label>
</div>
<div class="mdc-form-field">
<div class="mdc-radio demo-radio--custom">
<input class="mdc-radio__native-control" type="radio" id="ex0-custom-radio2" name="ex0-custom">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex0-custom-radio2-label" for="ex0-custom-radio2">Custom Radio 2</label>
</div>
<label id="ex0-radio2-label" for="ex0-radio2">Radio 2</label>
</div>
</section>

<section class="example">
<h2>CSS Only</h2>
<div class="mdc-form-field">
<div class="mdc-radio" data-demo-no-js>
<input class="mdc-radio__native-control" type="radio" id="ex1-radio1" checked name="ex1">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
<div class="demo-radio-row">
<div class="mdc-form-field">
<div class="mdc-radio" data-demo-no-js>
<input class="mdc-radio__native-control" type="radio" id="ex1-default-radio1" checked name="ex1-default">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex1-default-radio1-label" for="ex1-default-radio1">Default Radio 1</label>
</div>
<label id="ex1-radio1-label" for="ex1-radio1">Radio 1</label>
</div>
<div class="mdc-form-field">
<div class="mdc-radio" data-demo-no-js>
<input class="mdc-radio__native-control" type="radio" id="ex1-radio2" name="ex1">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
<div class="mdc-form-field">
<div class="mdc-radio" data-demo-no-js>
<input class="mdc-radio__native-control" type="radio" id="ex1-default-radio2" name="ex1-default">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex1-default-radio2-label" for="ex1-default-radio2">Default Radio 2</label>
</div>
<label id="ex1-radio2-label" for="ex1-radio2">Radio 2</label>
</div>
</section>

<section class="example">
<h2>CSS Only - Disabled</h2>
<div class="mdc-form-field">
<div class="mdc-radio mdc-radio--disabled" data-demo-no-js>
<input class="mdc-radio__native-control" type="radio" id="ex2-radio1" checked name="ex2" disabled>
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
<div class="demo-radio-row">
<div class="mdc-form-field">
<div class="mdc-radio demo-radio--custom" data-demo-no-js>
<input class="mdc-radio__native-control" type="radio" id="ex1-custom-radio1" checked name="ex1-custom">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex1-custom-radio1-label" for="ex1-custom-radio1">Custom Radio 1</label>
</div>
<label id="ex2-radio1-label" for="ex2-radio1">Radio 1</label>
</div>
<div class="mdc-form-field">
<div class="mdc-radio mdc-radio--disabled" data-demo-no-js>
<input class="mdc-radio__native-control" type="radio" id="ex2-radio2" name="ex2" disabled>
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
<div class="mdc-form-field">
<div class="mdc-radio demo-radio--custom" data-demo-no-js>
<input class="mdc-radio__native-control" type="radio" id="ex1-custom-radio2" name="ex1-custom">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex1-custom-radio2-label" for="ex1-custom-radio2">Custom Radio 2</label>
</div>
<label id="ex2-radio2-label" for="ex2-radio2">Radio 2</label>
</div>
</section>


<section class="example mdc-theme--dark">
<h2 class="mdc-theme--text-primary-on-dark">Dark Theme</h2>

<div class="mdc-form-field">
<div class="mdc-radio">
<input class="mdc-radio__native-control" type="radio" id="ex3-radio1" checked name="ex3">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
<div class="demo-radio-row">
<div class="mdc-form-field">
<div class="mdc-radio">
<input class="mdc-radio__native-control" type="radio" id="ex3-default-radio1" checked name="ex3-default">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex3-default-radio1-label" for="ex3-default-radio1">Default Radio 1</label>
</div>
<div class="mdc-form-field">
<div class="mdc-radio">
<input class="mdc-radio__native-control" type="radio" id="ex3-default-radio2" name="ex3-default">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex3-default-radio2-label" for="ex3-default-radio2">Default Radio 2</label>
</div>
<label id="ex3-radio1-label" for="ex3-radio1">Radio 1</label>
</div>
<div class="mdc-form-field">
<div class="mdc-radio">
<input class="mdc-radio__native-control" type="radio" id="ex3-radio2" name="ex3">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
<div class="demo-radio-row">
<div class="mdc-form-field">
<div class="mdc-radio demo-radio--custom">
<input class="mdc-radio__native-control" type="radio" id="ex3-custom-radio1" checked name="ex3-custom">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex3-custom-radio1-label" for="ex3-custom-radio1">Custom Radio 1</label>
</div>
<div class="mdc-form-field">
<div class="mdc-radio demo-radio--custom">
<input class="mdc-radio__native-control" type="radio" id="ex3-custom-radio2" name="ex3-custom">
<div class="mdc-radio__background">
<div class="mdc-radio__outer-circle"></div>
<div class="mdc-radio__inner-circle"></div>
</div>
</div>
<label id="ex3-custom-radio2-label" for="ex3-custom-radio2">Custom Radio 2</label>
</div>
<label id="ex3-radio2-label" for="ex3-radio2">Radio 2</label>
</div>
</section>

Expand Down
11 changes: 11 additions & 0 deletions demos/radio.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,15 @@
@import "./common";
@import "../packages/mdc-form-field/mdc-form-field";
@import "../packages/mdc-radio/mdc-radio";
@import "../packages/mdc-theme/color_palette";
@import "../packages/mdc-typography/mdc-typography";

.mdc-radio.demo-radio--custom {
$color: $material-color-red-500;

@include mdc-radio-unchecked-stroke-color($color);
@include mdc-radio-checked-stroke-color($color);
@include mdc-radio-ink-color($material-color-orange-500);
@include mdc-radio-focus-indicator-color($color);
@include mdc-radio-ripple((base-color: $color));
}
17 changes: 15 additions & 2 deletions packages/mdc-radio/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,21 @@ not return an object.

## Theming

MDC Radios use the theme's primary color by default for on states, and are completely dark theme
aware.
MDC Radios use the theme's secondary color by default for checked states, and are completely dark theme aware.

### Sass Mixins

The following mixins apply only to _enabled_ radio buttons. It is not currently possible to customize the color of a _disabled_ radio button.

Mixin | Description
--- | ---
`mdc-radio-unchecked-stroke-color($color)` | Sets the stroke color of an unchecked radio
`mdc-radio-checked-stroke-color($color)` | Sets the stroke color of a checked radio
`mdc-radio-ink-color($color)` | Sets the ink color
`mdc-radio-focus-indicator-color($color)` | Sets the color of the focus indicator
`mdc-radio-ripple-color($ripple-config)` | Sets the ripple to the given [ripple configuration][ripple-readme]

[ripple-readme]: https://github.com/material-components/material-components-web/blob/master/packages/mdc-ripple/README.md

### Caveat: Edge and CSS Variables

Expand Down
26 changes: 26 additions & 0 deletions packages/mdc-radio/_functions.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// 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/functions";
@import "./variables";

@function mdc-radio-enter($name) {
@return mdc-animation-enter($name, $mdc-radio-transition-duration);
}

@function mdc-radio-exit($name) {
@return mdc-animation-exit-temporary($name, $mdc-radio-transition-duration);
}
52 changes: 52 additions & 0 deletions packages/mdc-radio/_mixins.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
//
// 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/variables";
@import "./variables";

@mixin mdc-radio-unchecked-stroke-color($color) {
// stylelint-disable-next-line selector-max-specificity
.mdc-radio__native-control:enabled:not(:checked) + .mdc-radio__background .mdc-radio__outer-circle {
@include mdc-theme-prop(border-color, $color);
}
}

@mixin mdc-radio-checked-stroke-color($color) {
// stylelint-disable-next-line selector-max-specificity
.mdc-radio__native-control:enabled:checked + .mdc-radio__background .mdc-radio__outer-circle {
@include mdc-theme-prop(border-color, $color);
}
}

@mixin mdc-radio-ink-color($color) {
// stylelint-disable-next-line selector-max-specificity
.mdc-radio__native-control:enabled + .mdc-radio__background .mdc-radio__inner-circle {
@include mdc-theme-prop(background-color, $color);
}
}

@mixin mdc-radio-focus-indicator-color($color) {
.mdc-radio__background::before {
@include mdc-theme-prop(background-color, $color, $edgeOptOut: true);
}
}

@mixin mdc-radio-ripple($ripple-config) {
$ripple-config: map-merge((opacity: $mdc-radio-ripple-opacity, radius: 50%), $ripple-config);

@include mdc-ripple-bg(map-merge($ripple-config, (pseudo: "::before")));
@include mdc-ripple-fg(map-merge($ripple-config, (pseudo: "::after")));
}
22 changes: 22 additions & 0 deletions packages/mdc-radio/_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//
// 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.
//

$mdc-radio-touch-area: 40px;
$mdc-radio-ui-size: 20px;
$mdc-radio-ui-pct: percentage($mdc-radio-ui-size / $mdc-radio-touch-area);
$mdc-radio-transition-duration: 120ms;
$mdc-radio-ripple-opacity: .14;
$mdc-radio-baseline-theme-color: secondary;
Loading

0 comments on commit da9d48f

Please sign in to comment.