Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Move mixin-based colors to variables #972

Merged
merged 1 commit into from
Sep 9, 2024
Merged

Move mixin-based colors to variables #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions src/sass/_rules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@
}
&.slider-disabled {
.slider-handle {
@include slider_background-image($slider-gray-2, $slider-gray-1, mix($slider-gray-2, $slider-gray-1));
@include slider_background-image($slider-gray-2, $slider-gray-1, $slider-handle-background-color-disabled);
}
.slider-track {
@include slider_background-image($slider-gray-3, $slider-gray-4, mix($slider-gray-3, $slider-gray-4));
@include slider_background-image($slider-gray-3, $slider-gray-4, $slider-track-background-color-disabled);
cursor: not-allowed;
}
}
Expand Down Expand Up @@ -182,7 +182,7 @@
}

.slider-track {
@include slider_background-image($slider-gray-5, $slider-gray-6, mix($slider-gray-5, $slider-gray-6));
@include slider_background-image($slider-gray-5, $slider-gray-6, $slider-track-background-color);
@include slider_box-shadow(inset 0 1px 2px rgba(0,0,0,0.1));
@include slider_border-radius($slider-border-radius);

Expand All @@ -191,15 +191,15 @@
}

.slider-selection {
@include slider_background-image($slider-gray-6, $slider-gray-5, mix($slider-gray-6, $slider-gray-5));
@include slider_background-image($slider-gray-6, $slider-gray-5, $slider-selection-background-color);
@include slider_box-shadow(inset 0 -1px 0 rgba(0,0,0,0.15));
@include slider_box-sizing(border-box);
@include slider_border-radius($slider-border-radius);

position: absolute;
}
.slider-selection.tick-slider-selection {
@include slider_background-image($slider-secondary-top, $slider-secondary-bottom, mix($slider-secondary-top, $slider-secondary-bottom));
@include slider_background-image($slider-secondary-top, $slider-secondary-bottom, $slider-selection-tick-background-color);
}

.slider-track-low, .slider-track-high {
Expand All @@ -211,15 +211,15 @@
}

.slider-handle {
@include slider_background-image($slider-primary-top, $slider-primary-bottom, mix($slider-primary-top, $slider-primary-bottom));
@include slider_background-image($slider-primary-top, $slider-primary-bottom, $slider-handle-background-color);
@include slider_box-shadow(inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05));

position: absolute;
top: 0;
width: $slider-line-height;
height: $slider-line-height;
background-color: $slider-primary;
border: 0px solid transparent;
border: 0 solid transparent;
&:hover {
cursor: pointer;
}
Expand All @@ -241,7 +241,7 @@
}

.slider-tick {
@include slider_background-image($slider-gray-5, $slider-gray-6, mix($slider-gray-5, $slider-gray-6));
@include slider_background-image($slider-gray-5, $slider-gray-6, $slider-tick-background-color);
@include slider_box-shadow(inset 0 -1px 0 rgba(0,0,0,0.15));
@include slider_box-sizing(border-box);

Expand All @@ -251,7 +251,7 @@
height: $slider-line-height;
filter: none;
opacity: 0.8;
border: 0px solid transparent;
border: 0 solid transparent;

&.round {
border-radius: 50%;
Expand All @@ -269,7 +269,7 @@
}
}
&.in-selection {
@include slider_background-image($slider-secondary-top, $slider-secondary-bottom, mix($slider-secondary-top, $slider-secondary-bottom));
@include slider_background-image($slider-secondary-top, $slider-secondary-bottom, $slider-tick-in-selection-background-color);
opacity: 1;
}
}
12 changes: 11 additions & 1 deletion src/sass/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,14 @@ $slider-gray-5: #F5F5F5 !default;
$slider-gray-6: #F9F9F9 !default;

// unicode color for demo page
$slider-unicode-color: #726204 !default;
$slider-unicode-color: #726204 !default;

// components
$slider-selection-background-color: mix($slider-gray-6, $slider-gray-5) !default;
$slider-selection-tick-background-color: mix($slider-secondary-top, $slider-secondary-bottom) !default;
$slider-tick-background-color: mix($slider-gray-5, $slider-gray-6) !default;
$slider-tick-in-selection-background-color: mix($slider-secondary-top, $slider-secondary-bottom) !default;
$slider-handle-background-color: mix($slider-primary-top, $slider-primary-bottom) !default;
$slider-handle-background-color-disabled: mix($slider-gray-2, $slider-gray-1) !default;
$slider-track-background-color: mix($slider-gray-5, $slider-gray-6) !default;
$slider-track-background-color-disabled: mix($slider-gray-3, $slider-gray-4) !default;