Skip to content
Open
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
3 changes: 2 additions & 1 deletion packages/main/src/RangeSlider.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import customElement from "@ui5/webcomponents-base/dist/decorators/customElement.js";
import property from "@ui5/webcomponents-base/dist/decorators/property.js";
import i18n from "@ui5/webcomponents-base/dist/decorators/i18n.js";
import { getScopedVarName } from "@ui5/webcomponents-base/dist/CustomElementsScope.js";
import type I18nBundle from "@ui5/webcomponents-base/dist/i18nBundle.js";
import type { IFormInputElement } from "@ui5/webcomponents-base/dist/features/InputElementsFormSupport.js";
import ValueState from "@ui5/webcomponents-base/dist/types/ValueState.js";
Expand Down Expand Up @@ -1036,7 +1037,7 @@ class RangeSlider extends SliderBase implements IFormInputElement {
progress: {
"width": `${this._selectedRange! * 100}%`,
"transform-origin": `${this.directionStart} top`,
[this.directionStart]: `${this._firstHandlePositionFromStart!}%`,
[this.directionStart]: `calc(${this._firstHandlePositionFromStart!}% + var(${getScopedVarName("--_ui5_slider_active_progress_left")}))`,
},
startHandle: {
[this.directionStart]: `${this._firstHandlePositionFromStart!}%`,
Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/Slider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,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
3 changes: 2 additions & 1 deletion packages/main/src/themes/RangeSlider.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@

.ui5-slider-progress {
position: relative;
inset-inline-start: 0;
}

.ui5-slider-progress:focus::after {
Expand All @@ -52,8 +53,8 @@
position: absolute;
top: var(--_ui5_range_slider_progress_focus_top);
left: var(--_ui5_range_slider_progress_focus_left);
right: var(--_ui5_range_slider_progress_focus_right);
padding: var(--_ui5_range_slider_progress_focus_padding);
width: var(--_ui5_range_slider_progress_focus_width);
height: var(--_ui5_range_slider_progress_focus_height);
box-sizing: border-box;
}
Expand Down
16 changes: 8 additions & 8 deletions packages/main/src/themes/SliderBase.css
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
54 changes: 34 additions & 20 deletions packages/main/src/themes/base/SliderBase-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,29 @@
--_ui5_slider_progress_container_background: var(--sapField_BorderColor);
--_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_border_width: 0.0625rem;
--_ui5_slider_progress_border: solid var(--_ui5_slider_progress_border_width) 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: 3.3125rem;
--_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;
--_ui5_slider_track_total_height: calc(var(--_ui5_slider_inner_height) + (2 * var(--_ui5_slider_progress_border_width)));
--_ui5_slider_handle_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_handle_height)) / 2 - var(--_ui5_slider_progress_border_width));
--_ui5_slider_tickmark_bg: var(--sapField_BorderColor);
--_ui5_slider_tickmark_in_range_bg: var(--sapButton_Active_Background);
--_ui5_slider_handle_hover_background: var(--sapButton_Hover_Background);
Expand All @@ -27,7 +35,7 @@
--_ui5_slider_handle_outline_offset: 0.075rem;
--_ui5_slider_progress_outline: 0.0625rem dotted var(--sapContent_FocusColor);
--_ui5_slider_progress_outline_offset: -0.8125rem;
--_ui5_slider_tickmark_top: -0.375rem;
--_ui5_slider_tickmark_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_tickmark_height)) / 2 - var(--_ui5_slider_progress_border_width));
--_ui5_slider_disabled_opacity: 0.4;
--_ui5_slider_tooltip_fontsize: var(--sapFontSmallSize);
--_ui5_slider_tooltip_color: var(--sapContent_LabelColor);
Expand All @@ -49,9 +57,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: -.95rem;
--_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 +69,39 @@
--_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_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_start_end_point_left: -0.7rem;
--_ui5_slider_handle_icon_size: 0.875rem;
--_ui5_slider_padding: 1rem 1.0625rem;
--_ui5_slider_handle_height: 1.25rem;
--_ui5_slider_handle_width: 1.5rem;
--_ui5_slider_handle_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_handle_height)) / 2 - var(--_ui5_slider_progress_border_width));
}
2 changes: 0 additions & 2 deletions packages/main/src/themes/base/sizes-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,7 @@
--_ui5-responsive_popover_header_height: 2.5rem;

/* Slider */
--_ui5_slider_handle_height: 1.25rem;
--_ui5_slider_handle_width: 1.5rem;
--_ui5_slider_handle_top: -.5rem;
--_ui5_slider_tooltip_height: 1rem;
--_ui5_slider_tooltip_padding: 0.25rem;
/* --_ui5_slider_tooltip_bottom: 1.875rem; */
Expand Down
15 changes: 11 additions & 4 deletions packages/main/src/themes/sap_fiori_3/SliderBase-parameters.css
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_track_total_height: var(--_ui5_slider_inner_height);
--_ui5_range_slider_handle_background: transparent;
--_ui5_range_slider_handle_active_background: transparent;
--_ui5_slider_handle_background: var(--sapButton_Background);
Expand All @@ -12,13 +12,20 @@
--_ui5_range_slider_root_active_handle_icon_display: none;
--_ui5_slider_handle_width: 1.875rem;
--_ui5_slider_handle_height: 1.875rem;
--_ui5_slider_handle_border: 0.125rem solid var(--sapField_BorderColor);
--_ui5_slider_handle_border_radius: 1rem;
--_ui5_slider_handle_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_handle_height)) / 2);
--_ui5_slider_handle_box_sizing: border-box;
--_ui5_slider_tickmark_top: -.34375rem;
--_ui5_slider_tickmark_height: 1rem;
--_ui5_slider_tickmark_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_tickmark_height)) / 2);
}

[data-ui5-compact-size],
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_slider_handle_width: 1.25rem;
--_ui5_slider_handle_height: 1.25rem;
--_ui5_slider_handle_width: 1.5rem;
--_ui5_slider_handle_height: 1.5rem;
--_ui5_slider_handle_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_handle_height)) / 2);
--_ui5_slider_tickmark_height: 0.75rem;
--_ui5_slider_tickmark_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_tickmark_height)) / 2);
}
4 changes: 0 additions & 4 deletions packages/main/src/themes/sap_fiori_3/sizes-parameters.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,4 @@
.sapUiSizeCompact {
/* ColorPicker */
--_ui5_color_picker_slider_handle_container_margin_top: none;

/* Slider, Range Slider */
--_ui5_slider_handle_width: 1.25rem;
--_ui5_slider_handle_height: 1.25rem;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,25 @@

:root {
--_ui5_slider_inner_min_width: 4rem;
--_ui5_slider_track_total_height: var(--_ui5_slider_inner_height);
--_ui5_range_slider_handle_background: transparent;
--_ui5_range_slider_root_hover_handle_bg: transparent;
--_ui5_slider_handle_width: 1.875rem;
--_ui5_slider_handle_height: 1.875rem;
--_ui5_slider_handle_border: 0.125rem solid var(--sapField_BorderColor);
--_ui5_slider_handle_border_radius: 1rem;
--_ui5_slider_handle_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_handle_height)) / 2);
--_ui5_slider_handle_box_sizing: border-box;
--_ui5_slider_tickmark_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_tickmark_height)) / 2);
--_ui5_slider_tickmark_height: 1rem;
}

[data-ui5-compact-size],
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_slider_handle_width: 1.25rem;
--_ui5_slider_handle_height: 1.25rem;
--_ui5_slider_handle_width: 1.5rem;
--_ui5_slider_handle_height: 1.5rem;
--_ui5_slider_handle_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_handle_height)) / 2);
--_ui5_slider_tickmark_height: 0.75rem;
--_ui5_slider_tickmark_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_tickmark_height)) / 2);
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,4 @@
.sapUiSizeCompact {
/* ColorPicker */
--_ui5_color_picker_slider_handle_container_margin_top: none;

/* Slider, Range Slider */
--_ui5_slider_handle_width: 1.25rem;
--_ui5_slider_handle_height: 1.25rem;
}
36 changes: 30 additions & 6 deletions packages/main/src/themes/sap_fiori_3_hcb/SliderBase-parameters.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,39 @@
@import "../base/SliderBase-parameters.css";

:root {
--_ui5_slider_inner_height: 0.375rem;
--_ui5_slider_inner_height: 0.375rem; /* Total height including border */
--_ui5_slider_track_total_height: var(--_ui5_slider_inner_height);
--_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_width: 1.875rem;
--_ui5_slider_handle_height: 1.875rem;
--_ui5_slider_handle_border: 0.125rem solid var(--sapField_BorderColor);
--_ui5_slider_handle_border_radius: 1rem;
--_ui5_slider_handle_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_handle_height)) / 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: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_tickmark_height)) / 2);
--_ui5_slider_active_progress_border: none;
--_ui5_slider_active_progress_left: 0rem;
--_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);
}

[data-ui5-compact-size],
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_slider_handle_width: 1.5rem;
--_ui5_slider_handle_height: 1.5rem;
--_ui5_slider_handle_border_radius: 1rem;
--_ui5_slider_handle_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_handle_height)) / 2);
--_ui5_slider_tickmark_height: 0.75rem;
--_ui5_slider_tickmark_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_tickmark_height)) / 2);
}
5 changes: 0 additions & 5 deletions packages/main/src/themes/sap_fiori_3_hcb/sizes-parameters.css
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
35 changes: 29 additions & 6 deletions packages/main/src/themes/sap_fiori_3_hcw/SliderBase-parameters.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,37 @@
@import "../base/SliderBase-parameters.css";

:root {
--_ui5_slider_inner_height: 0.375rem;
--_ui5_slider_inner_height: 0.375rem; /* Total height including border */
--_ui5_slider_track_total_height: var(--_ui5_slider_inner_height);
--_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_width: 1.875rem;
--_ui5_slider_handle_height: 1.875rem;
--_ui5_slider_handle_border: 0.125rem solid var(--sapField_BorderColor);
--_ui5_slider_handle_border_radius: 1rem;
--_ui5_slider_handle_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_handle_height)) / 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: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_tickmark_height)) / 2);
--_ui5_slider_active_progress_border: none;
--_ui5_slider_active_progress_left: 0rem;
--_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);
}

[data-ui5-compact-size],
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_slider_handle_width: 1.5rem;
--_ui5_slider_handle_height: 1.5rem;
--_ui5_slider_handle_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_handle_height)) / 2);
--_ui5_slider_tickmark_height: 0.75rem;
--_ui5_slider_tickmark_top: calc((var(--_ui5_slider_track_total_height) - var(--_ui5_slider_tickmark_height)) / 2);
}
5 changes: 0 additions & 5 deletions packages/main/src/themes/sap_fiori_3_hcw/sizes-parameters.css
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
Loading
Loading