Skip to content

fix(checkbox, radio): not using theme border color #2744

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

Merged
merged 6 commits into from
Feb 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/lib/checkbox/checkbox.scss
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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