Skip to content

Commit

Permalink
Merge branch 'develop' into add-missing-time-marker-dep
Browse files Browse the repository at this point in the history
  • Loading branch information
@epetrow
epetrow authored Dec 6, 2024
2 parents 649464c + ca4c52c commit 5462c26
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 21 deletions.
5 changes: 4 additions & 1 deletion packages/default/scss/slider/_theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
);
@include border-radius( 50% );

&:hover {
&:hover,
&.k-hover {
@include fill(
$kendo-slider-draghandle-hover-text,
$kendo-slider-draghandle-hover-bg,
Expand All @@ -39,7 +40,9 @@
);
}

// TODO: remove k-pressed and rely on k-active
&:active,
&.k-active,
&.k-pressed {
@include fill(
$kendo-slider-draghandle-pressed-text,
Expand Down
16 changes: 8 additions & 8 deletions packages/material/docs/customization-slider.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ The following table lists the available variables for customization.
<tr>
<td>$kendo-slider-draghandle-hover-bg</td>
<td>String</td>
<td><code>unset</code></td>
<td><code>unset</code></td>
<td><code>$kendo-color-primary</code></td>
<td><code>var(--kendo-color-primary, #3f51b5)</code></td>
</tr>
<tr>
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The background color of the hovered Slider drag handle.</div></div>
Expand All @@ -240,8 +240,8 @@ The following table lists the available variables for customization.
<tr>
<td>$kendo-slider-draghandle-hover-border</td>
<td>String</td>
<td><code>unset</code></td>
<td><code>unset</code></td>
<td><code>$kendo-color-primary</code></td>
<td><code>var(--kendo-color-primary, #3f51b5)</code></td>
</tr>
<tr>
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The border color of the hovered Slider drag handle.</div></div>
Expand All @@ -260,8 +260,8 @@ The following table lists the available variables for customization.
<tr>
<td>$kendo-slider-draghandle-pressed-bg</td>
<td>String</td>
<td><code>unset</code></td>
<td><code>unset</code></td>
<td><code>$kendo-color-primary</code></td>
<td><code>var(--kendo-color-primary, #3f51b5)</code></td>
</tr>
<tr>
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The background color of the active Slider drag handle.</div></div>
Expand All @@ -280,8 +280,8 @@ The following table lists the available variables for customization.
<tr>
<td>$kendo-slider-draghandle-pressed-border</td>
<td>String</td>
<td><code>unset</code></td>
<td><code>unset</code></td>
<td><code>$kendo-color-primary</code></td>
<td><code>var(--kendo-color-primary, #3f51b5)</code></td>
</tr>
<tr>
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The border color of the active Slider drag handle.</div></div>
Expand Down
16 changes: 8 additions & 8 deletions packages/material/docs/customization.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22522,8 +22522,8 @@ The following table lists the available variables for customizing the Material t
<tr>
<td>$kendo-slider-draghandle-hover-bg</td>
<td>String</td>
<td><code>unset</code></td>
<td><code>unset</code></td>
<td><code>$kendo-color-primary</code></td>
<td><code>var(--kendo-color-primary, #3f51b5)</code></td>
</tr>
<tr>
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The background color of the hovered Slider drag handle.</div></div>
Expand All @@ -22542,8 +22542,8 @@ The following table lists the available variables for customizing the Material t
<tr>
<td>$kendo-slider-draghandle-hover-border</td>
<td>String</td>
<td><code>unset</code></td>
<td><code>unset</code></td>
<td><code>$kendo-color-primary</code></td>
<td><code>var(--kendo-color-primary, #3f51b5)</code></td>
</tr>
<tr>
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The border color of the hovered Slider drag handle.</div></div>
Expand All @@ -22562,8 +22562,8 @@ The following table lists the available variables for customizing the Material t
<tr>
<td>$kendo-slider-draghandle-pressed-bg</td>
<td>String</td>
<td><code>unset</code></td>
<td><code>unset</code></td>
<td><code>$kendo-color-primary</code></td>
<td><code>var(--kendo-color-primary, #3f51b5)</code></td>
</tr>
<tr>
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The background color of the active Slider drag handle.</div></div>
Expand All @@ -22582,8 +22582,8 @@ The following table lists the available variables for customizing the Material t
<tr>
<td>$kendo-slider-draghandle-pressed-border</td>
<td>String</td>
<td><code>unset</code></td>
<td><code>unset</code></td>
<td><code>$kendo-color-primary</code></td>
<td><code>var(--kendo-color-primary, #3f51b5)</code></td>
</tr>
<tr>
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The border color of the active Slider drag handle.</div></div>
Expand Down
8 changes: 4 additions & 4 deletions packages/material/scss/slider/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,26 +66,26 @@ $kendo-slider-draghandle-gradient: null !default;

/// The background color of the hovered Slider drag handle.
/// @group slider
$kendo-slider-draghandle-hover-bg: unset !default;
$kendo-slider-draghandle-hover-bg: $kendo-color-primary !default;
/// The text color of the hovered Slider drag handle.
/// @group slider
$kendo-slider-draghandle-hover-text: null !default;
/// The border color of the hovered Slider drag handle.
/// @group slider
$kendo-slider-draghandle-hover-border: unset !default;
$kendo-slider-draghandle-hover-border: $kendo-color-primary !default;
/// The gradient of the hovered Slider drag handle.
/// @group slider
$kendo-slider-draghandle-hover-gradient: null !default;

/// The background color of the active Slider drag handle.
/// @group slider
$kendo-slider-draghandle-pressed-bg: unset !default;
$kendo-slider-draghandle-pressed-bg: $kendo-color-primary !default;
/// The text color of the active Slider drag handle.
/// @group slider
$kendo-slider-draghandle-pressed-text: null !default;
/// The border color of the active Slider drag handle.
/// @group slider
$kendo-slider-draghandle-pressed-border: unset !default;
$kendo-slider-draghandle-pressed-border: $kendo-color-primary !default;
/// The gradient of the active Slider drag handle.
/// @group slider
$kendo-slider-draghandle-pressed-gradient: null !default;
Expand Down
Binary file modified tests/_output/bootstrap/slider/slider.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/classic/slider/slider.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/_output/default/slider/slider.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5462c26

Please sign in to comment.