Skip to content

Commit fd97a42

Browse files
fix(ui5-color-picker): align the slider to horizon spec (#5209)
* fix(ui5-color-picker): align the slider to horizon spec * fix(ui5-color-picker): include of size params in high contrast topics
1 parent 2fc0898 commit fd97a42

File tree

11 files changed

+32
-3
lines changed

11 files changed

+32
-3
lines changed

packages/main/src/themes/ColorPicker.css

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
[ui5-slider]::part(handle)::after {
7373
content: "";
74-
border: 1px solid #fff;
74+
border: 2px solid #fff;
7575
display: block;
7676
height: 1.25rem;
7777
border-radius: 1rem;
@@ -192,6 +192,27 @@
192192
outline-offset: 0.0625rem;
193193
}
194194

195+
.ui5-color-picker-alpha-slider::part(handle):focus::before,
196+
.ui5-color-picker-hue-slider::part(handle):focus::before {
197+
content: "";
198+
border: var(--_ui5_color_picker_slider_handle_inline_focus);
199+
display: block;
200+
height: 1.625rem;
201+
border-radius: 1rem;
202+
width: 1.05rem;
203+
box-sizing: border-box;
204+
top: -3px;
205+
position: absolute;
206+
bottom: 2px;
207+
left: -3px;
208+
right: -3px;
209+
}
210+
211+
.ui5-color-picker-alpha-slider::part(handle)::before,
212+
.ui5-color-picker-hue-slider::part(handle)::before {
213+
display: none;
214+
}
215+
195216
.ui5-color-picker-alpha-slider::part(handle):focus,
196217
.ui5-color-picker-hue-slider::part(handle):focus {
197218
margin-top: var(--_ui5_color_picker_slider_handle_focus_margin_top);

packages/main/src/themes/base/ColorPicker-parameters.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@
99
--_ui5_color_picker_circle_inner_border: 0.0625rem solid var(--sapField_BorderColor);
1010
--_ui5_color_picker_circle_inner_circle_size: 0.5625rem;
1111
--_ui5_color_picker_slider_container_margin_top: -10px;
12+
--_ui5_color_picker_slider_handle_inline_focus: none;
1213
}

packages/main/src/themes/base/sizes-parameters.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@
208208
--_ui5_color-palette-item-hover-margin: 0;
209209
--_ui5_color-palette-row-height: 7.5rem;
210210
--_ui5_color-palette-button-height: 2rem;
211+
--_ui5_color_picker_slider_container_margin_top: -4px;
211212

212213
/* Custom List Item */
213214
--_ui5_custom_list_item_rb_min_width: 2rem;

packages/main/src/themes/sap_horizon/ColorPicker-parameters.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
--_ui5_color_picker_slider_handle_margin_top: -.1875rem;
99
--_ui5_color_picker_slider_handle_focus_margin_top: var(--_ui5_color_picker_slider_handle_margin_top);
1010
--_ui5_color_picker_slider_container_margin_top: -11px;
11+
--_ui5_color_picker_slider_handle_inline_focus: 1px solid var(--sapContent_ContrastFocusColor);
1112
}

packages/main/src/themes/sap_horizon/sizes-parameters.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@
3838
--_ui5_color-palette-button-height: 2rem;
3939
--_ui5_color-palette-item-before-focus-offset: -0.25rem;
4040
--_ui5_color-palette-item-after-focus-offset: -0.125rem;
41+
--_ui5_color_picker_slider_container_margin_top: -9px;
4142
}

packages/main/src/themes/sap_horizon_dark/ColorPicker-parameters.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
--_ui5_color_picker_slider_handle_margin_top: -.1875rem;
99
--_ui5_color_picker_slider_handle_focus_margin_top: var(--_ui5_color_picker_slider_handle_margin_top);
1010
--_ui5_color_picker_slider_container_margin_top: -11px;
11+
--_ui5_color_picker_slider_handle_inline_focus: 1px solid var(--sapContent_ContrastFocusColor);
1112
}

packages/main/src/themes/sap_horizon_dark/sizes-parameters.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@
3636
--_ui5_color-palette-button-height: 2rem;
3737
--_ui5_color-palette-item-before-focus-offset: -0.25rem;
3838
--_ui5_color-palette-item-after-focus-offset: -0.125rem;
39+
--_ui5_color_picker_slider_container_margin_top: -9px;
3940
}

packages/main/src/themes/sap_horizon_hcb/parameters-bundle.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../base/sizes-parameters.css";
1+
@import "./sizes-parameters.css";
22
@import "../base/rtl-parameters.css";
33
@import "./Avatar-parameters.css";
44
@import "../base/AvatarGroup-parameters.css";

packages/main/src/themes/sap_horizon_hcb/sizes-parameters.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
.sapUiSizeCompact {
66
/* SplitButton */
77
--_ui5_split_button_text_button_width: 2.25rem;
8+
--_ui5_color_picker_slider_container_margin_top: -10px;
89
}

packages/main/src/themes/sap_horizon_hcw/parameters-bundle.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "../base/sizes-parameters.css";
1+
@import "./sizes-parameters.css";
22
@import "../base/rtl-parameters.css";
33
@import "./Avatar-parameters.css";
44
@import "../base/AvatarGroup-parameters.css";

0 commit comments

Comments
 (0)