Skip to content
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
8 changes: 4 additions & 4 deletions components/datepicker/_datepicker.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use './mixins.module.scss' as *;
@use '../../sass/mixins.module.scss' as *;

.datepicker-container {
display: flex;
Expand Down Expand Up @@ -100,7 +100,7 @@
display: block;
font-size: 1.5rem;
line-height: 25px;
color: var(--md-sys-color-on-primary);
color: var(--md-sys-color-on-primary);
}

.date-text {
Expand Down Expand Up @@ -215,7 +215,7 @@
z-index: 1;

&:hover {
background-color: rgba(var(--md-sys-color-primary-numeric), 0.06);
background-color: color-mix(in srgb, transparent, var(--md-sys-color-primary) 6%);
}

&:focus {
Expand Down Expand Up @@ -262,7 +262,7 @@

/* Display modes */
.datepicker-modal {
max-width: calc(325px + var(--modal-padding)*2);
max-width: calc(325px + var(--modal-padding) * 2);
max-height: none;
background-color: var(--md-sys-color-inverse-on-surface);
}
2 changes: 1 addition & 1 deletion components/radio-button/_radio-buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@

/* Focused styles */
[type="radio"].tabbed:focus + span:before {
box-shadow: 0 0 0 10px rgba(var(--md-sys-color-primary-numeric), 0.18);
box-shadow: 0 0 0 10px color-mix(in srgb, transparent, var(--md-sys-color-primary) 18%);
}

/* Disabled Radio With gap */
Expand Down
8 changes: 4 additions & 4 deletions components/sliders/_range.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ input[type=range] + .thumb {
border-radius: 50% 50% 50% 0;

.value {
color: var(--md-sys-color-on-primary);
color: var(--md-sys-color-on-primary);
margin-left: -1px;
margin-top: 8px;
font-size: 10px;
Expand Down Expand Up @@ -97,7 +97,7 @@ input[type=range]::-webkit-slider-thumb {
}

.keyboard-focused input[type=range]:focus:not(.active)::-webkit-slider-thumb {
box-shadow: 0 0 0 10px rgba(var(--md-sys-color-primary-numeric), 0.18);
box-shadow: 0 0 0 10px color-mix(in srgb, transparent, var(--md-sys-color-primary) 18%);
}

// FireFox
Expand Down Expand Up @@ -125,7 +125,7 @@ input[type=range]:-moz-focusring {
}

.keyboard-focused input[type=range]:focus:not(.active)::-moz-range-thumb {
box-shadow: 0 0 0 10px rgba(var(--md-sys-color-primary-numeric), 0.18);
box-shadow: 0 0 0 10px color-mix(in srgb, transparent, var(--md-sys-color-primary) 18%);
}

//------------------------------- Remove this?
Expand Down Expand Up @@ -154,5 +154,5 @@ input[type=range]::-ms-thumb {
//--------------------------------

.keyboard-focused input[type=range]:focus:not(.active)::-ms-thumb {
box-shadow: 0 0 0 10px rgba(var(--md-sys-color-primary-numeric), 0.18);
box-shadow: 0 0 0 10px color-mix(in srgb, transparent, var(--md-sys-color-primary) 18%);
}
6 changes: 3 additions & 3 deletions components/switch/_switches.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

// NOT CHECKED [DOT]
&:after {
@extend .outline;
@extend .outline;
height: var(--size-off);
width: var(--size-off);

Expand All @@ -98,13 +98,13 @@ input[type=checkbox]:not(:disabled) ~ .lever:hover::before {
}

input[type=checkbox]:checked:not(:disabled) ~ .lever:hover::before {
background-color: rgba(var(--md-sys-color-primary-numeric), 0.06);
background-color: color-mix(in srgb, transparent, var(--md-sys-color-primary) 6%);
}

// Switch active style
input[type=checkbox]:checked:not(:disabled) ~ .lever:active::before,
input[type=checkbox]:checked:not(:disabled).tabbed:focus ~ .lever::before {
background-color: rgba(var(--md-sys-color-primary-numeric), 0.18);
background-color: color-mix(in srgb, transparent, var(--md-sys-color-primary) 18%);
}

input[type=checkbox]:not(:disabled) ~ .lever:hover::before {
Expand Down
8 changes: 4 additions & 4 deletions components/tabs/_tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
.tab a:hover,
.tab a.active,
.tab a:focus {
color: var(--md-sys-color-on-primary);
color: var(--md-sys-color-on-primary);
}

.indicator {
background-color: var(--md-sys-color-on-primary);
background-color: var(--md-sys-color-on-primary);
}
}

Expand Down Expand Up @@ -96,15 +96,15 @@
}

&:hover {
background-color: rgba(var(--md-sys-color-primary-numeric), 0.06);
background-color: color-mix(in srgb, transparent, var(--md-sys-color-primary) 6%);
}

&:focus {
background-color: var(--md-sys-color-primary-container);
}

&.active {
background-color: rgba(var(--md-sys-color-primary-numeric), 0.18);
background-color: color-mix(in srgb, transparent, var(--md-sys-color-primary) 18%);
}

&:focus,
Expand Down
17 changes: 10 additions & 7 deletions components/text-fields/_input-fields.scss
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ textarea.materialize-textarea {
}

&:disabled, &[readonly="readonly"] {
color: rgba(var(--md_sys_color_on-surface), 0.38);
border-color: rgba(var(--md_sys_color_on-surface), 0.12);
background-color: rgba(var(--md_sys_color_on-surface), 0.04);
color: color-mix(in srgb, transparent, var(--md-sys-color-on-surface) 38%);
border-color: color-mix(in srgb, transparent, var(--md-sys-color-on-surface) 12%);
background-color: color-mix(in srgb, transparent, var(--md-sys-color-on-surface) 4%);
}

// Label
Expand All @@ -86,7 +86,7 @@ textarea.materialize-textarea {
}

&:disabled + label, &[readonly="readonly"] + label {
color: rgba(var(--md_sys_color_on-surface), 0.38);
color: color-mix(in srgb, transparent, var(--md-sys-color-on-surface) 38%);
}

// Hide helper text on data message
Expand Down Expand Up @@ -208,8 +208,8 @@ textarea.materialize-textarea {
}

&:disabled, &[readonly="readonly"] {
color: rgba(var(--md_sys_color_on-surface), 0.38);
border-color: rgba(var(--md_sys_color_on-surface), 0.12);
color: color-mix(in srgb, transparent, var(--md-sys-color-on-surface) 38%);
border-color: color-mix(in srgb, transparent, var(--md-sys-color-on-surface) 12%);
}
}
}
Expand Down Expand Up @@ -323,7 +323,10 @@ textarea {
/* Autocomplete Items */
.autocomplete-content {
li {
.highlight { color: var(--md-sys-color-on-background); }
.highlight {
color: var(--md-sys-color-on-background);
}

img {
height: $dropdown-item-height - 10;
width: $dropdown-item-height - 10;
Expand Down
2 changes: 1 addition & 1 deletion components/timepicker/_timepicker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ input[type=text].timepicker-input-minutes {

.timepicker-tick.active,
.timepicker-tick:hover {
background-color: rgba(var(--md-sys-color-primary-numeric), 0.06);
background-color: color-mix(in srgb, transparent, var(--md-sys-color-primary) 6%);
}

.timepicker-dial {
Expand Down