Skip to content

fix(ui5-slider): align slider to the spec #12802

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

Open
aleksandar-terziev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(ui5-slider): align slider to the spec #12802

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
4 changes: 2 additions & 2 deletions packages/main/src/Slider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ class Slider extends SliderBase implements IFormInputElement {
get styles() {
return {
progress: {
"transform": `scaleX(${this._progressPercentage})`,
"transform-origin": `${this.directionStart} top`,
"width": `${this._handlePositionFromStart}%`,
"border": this._handlePositionFromStart === 0 ? "none" : "",
},
handle: {
[this.directionStart]: `${this._handlePositionFromStart}%`,
Expand Down
16 changes: 8 additions & 8 deletions packages/main/src/themes/SliderBase.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

.ui5-slider-root {
box-sizing: border-box;
height: 3.3125rem;
height: var(--_ui5_slider_root_height);
outline: none;
padding: var(--_ui5_slider_padding);
touch-action: none;
Expand Down Expand Up @@ -68,13 +68,13 @@

.ui5-slider-progress {
background: var(--_ui5_slider_progress_background);
border-radius: var(--_ui5_slider_progress_border_radius);
height: var(--_ui5_slider_progress_height);
position: relative;
border-radius: var(--_ui5_slider_active_progress_border_radius);
height: var(--_ui5_slider_active_progress_height);
position: absolute;
outline: none;
box-sizing: var(--_ui5_slider_active_progress_box_sizing);
box-sizing: content-box;
border: var(--_ui5_slider_active_progress_border);
left: var(--_ui5_slider_active_progress_left);
inset-inline-start: var(--_ui5_slider_active_progress_left);
top: var(--_ui5_slider_active_progress_top);
}

Expand Down Expand Up @@ -247,9 +247,9 @@
}

:host([show-tickmarks]) .ui5-slider-progress {
height: var(--_ui5_slider_no_tickmarks_progress_height);
height: var(--_ui5_slider_no_tickmarks_active_progress_height);
border: var(--_ui5_slider_no_tickmarks_active_progress_border);
left: var(--_ui5_slider_no_tickmarks_active_progress_left);
inset-inline-start: var(--_ui5_slider_no_tickmarks_active_progress_left);
top: var(--_ui5_slider_no_tickmarks_active_progress_top);
}

Expand Down
47 changes: 30 additions & 17 deletions packages/main/src/themes/base/SliderBase-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,23 @@
--_ui5_slider_progress_container_dot_display: none;
--_ui5_slider_progress_container_dot_background: var(--sapField_BorderColor);
--_ui5_slider_progress_border: solid 0.0625rem var(--sapSlider_BorderColor);
--_ui5_slider_progress_before_background: transparent;
--_ui5_slider_progress_after_background: transparent;
--_ui5_slider_progress_before_border: none;
--_ui5_slider_progress_after_border: none;
--_ui5_slider_padding: 1.406rem 1.0625rem;
--_ui5_slider_root_height: 2.75rem;
--_ui5_slider_inner_height: 0.25rem;
--_ui5_slider_inner_min_width: 4rem;
--_ui5_slider_outer_height: 1.6875rem;
--_ui5_slider_progress_border_radius: 0.25rem;
--_ui5_slider_progress_background: var(--sapActiveColor);
--_ui5_slider_handle_icon_display: none;
--_ui5_range_slider_root_hover_handle_icon_display: none;
--_ui5_slider_handle_height: 1.625rem;
--_ui5_slider_handle_width: 1.625rem;
--_ui5_slider_handle_border: solid 0.125rem var(--sapField_BorderColor);
--_ui5_slider_handle_border_radius: 1rem;
--_ui5_slider_handle_height: 1.5rem;
--_ui5_slider_handle_width: 2rem;
--_ui5_slider_handle_border: 0.0625rem solid var(--sapField_BorderColor);
--_ui5_slider_handle_border_radius: 0.5rem;
--_ui5_slider_handle_background: var(--sapButton_Background);
--_ui5_range_slider_handle_background: #FFF;
--_ui5_slider_handle_top: -0.825rem;
Expand Down Expand Up @@ -49,9 +55,9 @@
--_ui5_range_slider_progress_focus_height: 2rem;
--_ui5_range_slider_legacy_progress_focus_display: block;
--_ui5_slider_handle_focus_width: 0;
--_ui5_slider_start_end_point_size: .375rem;
--_ui5_slider_start_end_point_left: -0.875rem;
--_ui5_slider_start_end_point_top: -.1875rem;
--_ui5_slider_start_end_point_size: 0.5rem;
--_ui5_slider_start_end_point_left: -0.75rem;
--_ui5_slider_start_end_point_top: -0.1875rem;
--_ui5_slider_handle_background_focus: var(--sapButton_Active_Background);
--_ui5_slider_handle_focused_tooltip_distance: var(--_ui5_slider_tooltip_bottom);
--_ui5_slider_handle_box_sizing: content-box;
Expand All @@ -61,33 +67,40 @@
--_ui5_range_slider_handle_background_focus: transparent;
--_ui5_range_slider_progress_focus_width: 100%;
--_ui5_range_slider_root_active_handle_icon_display: none;
--_ui5_slider_tickmark_height: 1rem;
--_ui5_slider_tickmark_top: -.3125rem;
--_ui5_slider_tickmark_height: 0.5rem;
--_ui5_slider_tickmark_top: -0.125rem;
--_ui5_slider_progress_box_sizing: border-box;
--_ui5_slider_active_progress_box_sizing: content-box;
--_ui5_slider_tickmark_in_range_bg: var(--sapField_BorderColor);
--_ui5_range_slider_focus_outline_width: 100%;
--_ui5_slider_progress_outline_offset_left: 0;
--_ui5_range_slider_focus_outline_radius: 0;

--_ui5_slider_progress_container_top: 0;
--_ui5_slider_progress_height: 100%;
--_ui5_slider_progress_height: 0.25rem;
--_ui5_slider_active_progress_border: solid 0.0625rem var(--sapSlider_Selected_BorderColor);
--_ui5_slider_active_progress_left: 0;
--_ui5_slider_active_progress_top: 0;
--_ui5_slider_active_progress_border_radius: 0.25rem;
--_ui5_slider_active_progress_left: -0.0625rem;
--_ui5_slider_active_progress_top: -0.0625rem;
--_ui5_slider_active_progress_padding: 0.125rem;
--_ui5_slider_active_progress_height: calc(var(--_ui5_slider_progress_height) - 0.125rem);

--_ui5_slider_no_tickmarks_progress_container_top: var(--_ui5_slider_progress_container_top);
--_ui5_slider_no_tickmarks_progress_height: var(--_ui5_slider_progress_height);
--_ui5_slider_no_tickmarks_active_progress_border: var(--_ui5_slider_active_progress_border);
--_ui5_slider_no_tickmarks_active_progress_left: var(--_ui5_slider_active_progress_left);
--_ui5_slider_no_tickmarks_active_progress_top: var(--_ui5_slider_active_progress_top);
--_ui5_slider_no_tickmarks_active_progress_left: -0.0625rem;
--_ui5_slider_no_tickmarks_active_progress_top: -0.0625rem;
--_ui5_slider_no_tickmarks_active_progress_height: calc(var(--_ui5_slider_no_tickmarks_progress_height) - 0.125rem);
--_ui5_slider_handle_focus_visibility: none;
--_ui5_slider_handle_icon_size: 1rem;
--_ui5_slider_handle_icon_size: 0.875rem;
}

[data-ui5-compact-size],
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_slider_handle_icon_size: .875rem;
--_ui5_slider_handle_icon_size: 0.875rem;
--_ui5_slider_padding: 1rem 1.0625rem;
--_ui5_slider_root_height: 2rem;
--_ui5_slider_handle_height: 1.25rem;
--_ui5_slider_handle_width: 1.5rem;
--_ui5_slider_handle_top: -0.5rem;
}
5 changes: 3 additions & 2 deletions packages/main/src/themes/sap_fiori_3/SliderBase-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:root {
--_ui5_slider_inner_min_width: 4rem;
--_ui5_range_slider_handle_background_focus: transparent;
--_ui5_slider_handle_top: -.875rem;
--_ui5_slider_handle_top: -0.8125rem;
--_ui5_range_slider_handle_background: transparent;
--_ui5_range_slider_handle_active_background: transparent;
--_ui5_slider_handle_background: var(--sapButton_Background);
Expand All @@ -13,7 +13,8 @@
--_ui5_slider_handle_width: 1.875rem;
--_ui5_slider_handle_height: 1.875rem;
--_ui5_slider_handle_box_sizing: border-box;
--_ui5_slider_tickmark_top: -.34375rem;
--_ui5_slider_tickmark_height: 1rem;
--_ui5_slider_tickmark_top: -0.375rem;
}

[data-ui5-compact-size],
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/themes/sap_fiori_3_dark/SliderBase-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

:root {
--_ui5_slider_inner_min_width: 4rem;
--_ui5_slider_handle_top: -0.6875rem;
--_ui5_range_slider_handle_background: transparent;
--_ui5_range_slider_root_hover_handle_bg: transparent;
}
Expand Down
17 changes: 14 additions & 3 deletions packages/main/src/themes/sap_fiori_3_hcb/SliderBase-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,26 @@
@import "../base/SliderBase-parameters.css";

:root {
--_ui5_slider_inner_height: 0.375rem;
--_ui5_slider_inner_height: 0.375rem; /* Total height including border */
--_ui5_slider_progress_box_sizing: border-box;
--_ui5_slider_progress_border: solid 0.0625rem var(--sapField_BorderColor);
--_ui5_slider_progress_border_radius: 0.375rem;
--_ui5_range_slider_handle_background: transparent;
--_ui5_slider_handle_hover_background: var(--sapButton_Hover_Background);
--_ui5_slider_handle_border: solid 0.125rem var(--sapField_BorderColor);
--_ui5_slider_handle_height: 1.65rem;
--_ui5_slider_handle_width: 1.65rem;
--_ui5_slider_handle_top: -0.75rem;
--_ui5_slider_handle_top: -0.6375rem; /* -(1.65rem handle - 0.375rem track) / 2 */
--_ui5_slider_handle_box_sizing: border-box;
--_ui5_slider_progress_background: var(--sapSelectedColor);
--_ui5_slider_tickmark_top: -0.2525rem;
--_ui5_slider_tickmark_height: 1rem;
--_ui5_slider_tickmark_top: -0.3125rem; /* -(1rem tickmark - 0.375rem track) / 2 */
--_ui5_slider_active_progress_border: none;
--_ui5_slider_active_progress_left: 0;
--_ui5_slider_active_progress_top: 0;
--_ui5_slider_active_progress_height: var(--_ui5_slider_progress_height);
--_ui5_slider_no_tickmarks_active_progress_border: none;
--_ui5_slider_no_tickmarks_active_progress_left: 0;
--_ui5_slider_no_tickmarks_active_progress_top: 0;
--_ui5_slider_no_tickmarks_active_progress_height: var(--_ui5_slider_no_tickmarks_progress_height);
}
5 changes: 0 additions & 5 deletions packages/main/src/themes/sap_fiori_3_hcb/sizes-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
@import "../base/sizes-parameters.css";
:root {
/* Slider, Range Slider */
--_ui5_slider_handle_width: 1.25rem;
--_ui5_slider_handle_height: 1.25rem;
--_ui5_slider_handle_top: -0.5rem;

/* ColorPicker */
--_ui5_color_picker_slider_handle_container_margin_top: -0.125rem;
}
Expand Down
17 changes: 14 additions & 3 deletions packages/main/src/themes/sap_fiori_3_hcw/SliderBase-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
@import "../base/SliderBase-parameters.css";

:root {
--_ui5_slider_inner_height: 0.375rem;
--_ui5_slider_inner_height: 0.375rem; /* Total height including border */
--_ui5_slider_progress_box_sizing: border-box;
--_ui5_slider_progress_border: solid 0.0625rem var(--sapField_BorderColor);
--_ui5_slider_progress_border_radius: 0.375rem;
--_ui5_range_slider_handle_background: transparent;
--_ui5_slider_handle_border: solid 0.125rem var(--sapField_BorderColor);
--_ui5_slider_handle_height: 1.65rem;
--_ui5_slider_handle_width: 1.65rem;
--_ui5_slider_handle_top: -0.75rem;
--_ui5_slider_handle_top: -0.6375rem; /* -(1.65rem handle - 0.375rem track) / 2 */
--_ui5_slider_handle_box_sizing: border-box;
--_ui5_slider_progress_background: var(--sapSelectedColor);
--_ui5_slider_tickmark_top: -0.2525rem;
--_ui5_slider_tickmark_height: 1rem;
--_ui5_slider_tickmark_top: -0.3125rem; /* -(1rem tickmark - 0.375rem track) / 2 */
--_ui5_slider_active_progress_border: none;
--_ui5_slider_active_progress_left: 0;
--_ui5_slider_active_progress_top: 0;
--_ui5_slider_active_progress_height: var(--_ui5_slider_progress_height);
--_ui5_slider_no_tickmarks_active_progress_border: none;
--_ui5_slider_no_tickmarks_active_progress_left: 0;
--_ui5_slider_no_tickmarks_active_progress_top: 0;
--_ui5_slider_no_tickmarks_active_progress_height: var(--_ui5_slider_no_tickmarks_progress_height);
}
5 changes: 0 additions & 5 deletions packages/main/src/themes/sap_fiori_3_hcw/sizes-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
@import "../base/sizes-parameters.css";
:root {
/* Slider, Range Slider */
--_ui5_slider_handle_width: 1.25rem;
--_ui5_slider_handle_height: 1.25rem;
--_ui5_slider_handle_top: -0.5rem;

/* ColorPicker */
--_ui5_color_picker_slider_handle_container_margin_top: -0.125rem;
}
Expand Down
4 changes: 3 additions & 1 deletion packages/main/src/themes/sap_horizon/SliderBase-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
--_ui5_slider_handle_focus_width: 1px;
--_ui5_slider_start_end_point_size: .5rem;
--_ui5_slider_start_end_point_left: -.75rem;
--_ui5_slider_start_end_point_top: -0.125rem;
--_ui5_slider_start_end_point_top: -0.1875rem;
--_ui5_slider_handle_focused_tooltip_distance: calc(var(--_ui5_slider_tooltip_bottom) - var(--_ui5_slider_handle_focus_width));
--_ui5_slider_tooltip_border_box: border-box;

Expand All @@ -62,6 +62,8 @@
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_slider_handle_width: 1.5rem;
--_ui5_slider_handle_height: 1.25rem;
--_ui5_slider_handle_top: -0.5rem;
--_ui5_range_slider_progress_focus_width: calc(100% + var(--_ui5_slider_handle_width) + 10px);
--_ui5_range_slider_progress_focus_height: calc(var(--_ui5_slider_handle_height) + 10px);
--_ui5_range_slider_progress_focus_top: -.8125rem;
Expand Down
4 changes: 3 additions & 1 deletion packages/main/src/themes/sap_horizon_dark/SliderBase-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
--_ui5_slider_handle_focus_width: 1px;
--_ui5_slider_start_end_point_size: .5rem;
--_ui5_slider_start_end_point_left: -.75rem;
--_ui5_slider_start_end_point_top: -0.125rem;
--_ui5_slider_start_end_point_top: -0.1875rem;
--_ui5_slider_handle_focused_tooltip_distance: calc(var(--_ui5_slider_tooltip_bottom) - var(--_ui5_slider_handle_focus_width));
--_ui5_slider_tooltip_border_box: border-box;

Expand All @@ -62,6 +62,8 @@
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_slider_handle_width: 1.5rem;
--_ui5_slider_handle_height: 1.25rem;
--_ui5_slider_handle_top: -0.5rem;
--_ui5_range_slider_progress_focus_width: calc(100% + var(--_ui5_slider_handle_width) + 10px);
--_ui5_range_slider_progress_focus_height: calc(var(--_ui5_slider_handle_height) + 10px);
--_ui5_range_slider_progress_focus_top: -.8125rem;
Expand Down
19 changes: 10 additions & 9 deletions packages/main/src/themes/sap_horizon_hcb/SliderBase-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
--_ui5_slider_handle_hover_background: var(--sapButton_Hover_Background);
--_ui5_slider_handle_border: 0.0625rem solid var(--sapField_BorderColor);
--_ui5_slider_handle_hover_border: var(--_ui5_slider_handle_border);
--_ui5_slider_handle_top: -.5625rem;
--_ui5_slider_handle_top: -0.5625rem;
--_ui5_slider_handle_background_focus: var(--sapSlider_Active_RangeHandleBackground);
--_ui5_slider_handle_focus_border: 0.125rem solid var(--sapField_BorderColor);
--_ui5_slider_handle_outline: none;
--_ui5_slider_handle_box_sizing: border-box;
--_ui5_range_slider_handle_background: var(--sapSlider_RangeHandleBackground);
--_ui5_range_slider_root_hover_handle_bg: var(--sapButton_Hover_Background);
--_ui5_range_slider_handle_active_background: var(--sapSlider_Active_RangeHandleBackground);
--_ui5_slider_inner_height: 0.25rem;
--_ui5_slider_inner_height: 0.375rem;
--_ui5_slider_progress_border_radius: 0.25rem;
--_ui5_slider_progress_background: var(--sapSlider_Selected_Background);
--_ui5_slider_progress_container_background: var(--sapSlider_Background);
Expand All @@ -27,25 +27,24 @@
--_ui5_slider_progress_after_background: var(--sapContent_MeasureIndicatorColor);
--_ui5_slider_progress_after_border: solid 0.0625rem var(--sapContent_Selected_MeasureIndicatorColor);
--_ui5_slider_progress_before_border: solid 0.0625rem var(--sapContent_MeasureIndicatorColor);
--_ui5_slider_start_end_point_top: -3px;
--_ui5_slider_start_end_point_top: -0.1875rem;
--_ui5_slider_progress_outline_offset: -14px;
--_ui5_slider_outer_height: calc(var(--_ui5_slider_handle_height) + 9px);
--_ui5_slider_progress_outline_offset_left: calc(-1 * (var(--_ui5_slider_handle_width) / 2) - 6px);
--_ui5_slider_progress_outline: var(--sapContent_FocusWidth) dotted var(--sapContent_FocusColor);
--_ui5_range_slider_focus_outline_width: calc(100% + var(--_ui5_slider_handle_width) + 12px);
--_ui5_range_slider_focus_outline_radius: .5rem;
--_ui5_slider_tickmark_height: .5rem;
--_ui5_slider_tickmark_top: -.125rem;
--_ui5_slider_tickmark_top: -0.0625rem; /* -(0.5rem tickmark - 0.375rem track) / 2 */
--_ui5_slider_progress_box_sizing: border-box;
--_ui5_slider_active_progress_box_sizing: border-box;
--_ui5_slider_active_progress_box_sizing: content-box;

--_ui5_slider_progress_container_top: .0625rem;
--_ui5_slider_progress_container_top: 0;
--_ui5_slider_progress_height: .375rem;
--_ui5_slider_active_progress_left: -.0625rem;
--_ui5_slider_active_progress_top: -.15625rem;
--_ui5_slider_active_progress_border: solid 0.0625rem var(--sapSlider_Selected_BorderColor);
--_ui5_slider_active_progress_top: -.0625rem;

--_ui5_slider_no_tickmarks_progress_container_top: 0;
--_ui5_slider_no_tickmarks_progress_height: 100%;
--_ui5_slider_no_tickmarks_active_progress_border: none;
--_ui5_slider_no_tickmarks_active_progress_left: 0;
--_ui5_slider_no_tickmarks_active_progress_top: 0;
Expand All @@ -70,6 +69,8 @@
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_slider_handle_width: 1.5rem;
--_ui5_slider_handle_height: 1.25rem;
--_ui5_slider_handle_top: -0.5rem;
--_ui5_range_slider_focus_outline_width: calc(100% + var(--_ui5_slider_handle_width) + 12px);
--_ui5_slider_outer_height: calc(var(--_ui5_slider_handle_height) + 10px);
--_ui5_slider_progress_outline_offset: calc((-1 * var(--_ui5_slider_outer_height)) + 1rem);
Expand Down
Loading
Loading