Skip to content

Commit

Permalink
fix(checkbox, radio): not using theme border color (#2744)
Browse files Browse the repository at this point in the history
* fix(checkbox, radio): not using theme border color

Fixes the checkbox and radio button not using the border color from the theme. The cause of the issue was that both components used the shorthand `border`, which ended up overriding the `border-color` from the theme.

* chore: fix leaking test
  • Loading branch information
crisbeto authored and tinayuangao committed Feb 10, 2017
1 parent 1ab1af1 commit 07ec765
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
10 changes: 7 additions & 3 deletions src/lib/checkbox/checkbox.scss
Expand Up @@ -196,7 +196,7 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * $mat-checkbox-size !default;
}

.mat-checkbox-layout {
// `cursor: inherit` ensures that the wrapper element gets the same cursor as the md-checkbox
// `cursor: inherit` ensures that the wrapper element gets the same cursor as the mat-checkbox
// (e.g. pointer by default, regular when disabled), instead of the browser default.
cursor: inherit;
align-items: baseline;
Expand Down Expand Up @@ -234,8 +234,12 @@ $_mat-checkbox-mark-stroke-size: 2 / 15 * $mat-checkbox-size !default;
@extend %mat-checkbox-outer-box;

background-color: transparent;
border: $mat-checkbox-border-width solid;
transition: border-color $mat-checkbox-transition-duration $mat-linear-out-slow-in-timing-function;
transition:
border-color $mat-checkbox-transition-duration $mat-linear-out-slow-in-timing-function;
border: {
width: $mat-checkbox-border-width;
style: solid;
}
}

.mat-checkbox-background {
Expand Down
7 changes: 5 additions & 2 deletions src/lib/radio/radio.scss
Expand Up @@ -32,15 +32,18 @@ $mat-radio-ripple-size: $mat-radio-size * 0.75;

// The outer circle for the radio, always present.
.mat-radio-outer-circle {
border: solid 2px;
border-radius: 50%;
box-sizing: border-box;
height: $mat-radio-size;
left: 0;
position: absolute;
top: 0;
transition: border-color ease 280ms;
width: $mat-radio-size;
border: {
width: 2px;
style: solid;
radius: 50%;
}
}

// The inner circle for the radio, shown when checked.
Expand Down

0 comments on commit 07ec765

Please sign in to comment.