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

feat(ui5-color-picker): implement sap_horizon theme #4177

Merged
merged 8 commits into from
Nov 3, 2021
Merged

feat(ui5-color-picker): implement sap_horizon theme #4177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
31f329b
SAP Horizon theme applied to color-picker
terezamch Oct 26, 2021
2da4659
Merge branch 'master' of github.com:terezamch/ui5-webcomponents into …
terezamch Oct 26, 2021
a9729ad
base paraeters added
terezamch Oct 26, 2021
03b1a73
hover state of slider handle updated
terezamch Oct 26, 2021
0346a4c
Merge branch 'master' of github.com:terezamch/ui5-webcomponents into …
terezamch Nov 2, 2021
058052e
Merge branch 'master' of github.com:terezamch/ui5-webcomponents into …
terezamch Nov 2, 2021
4bede14
merge conflict solved
terezamch Nov 2, 2021
6d97370
adjusted to slider implementation
terezamch Nov 2, 2021
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
2 changes: 1 addition & 1 deletion packages/main/src/Slider.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
data-sap-focus-ref
part="handle"
>
<ui5-icon name="source-code" slider-icon></ui5-icon>
<ui5-icon name="source-code" part="icon-slider" slider-icon></ui5-icon>
{{#if showTooltip}}
<div class="ui5-slider-tooltip" style="{{styles.tooltip}}">
<span class="ui5-slider-tooltip-value">{{tooltipValue}}</span>
Expand Down
33 changes: 32 additions & 1 deletion packages/main/src/themes/ColorPicker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
height: 1.25rem;
background: transparent;
margin-left: -2px;
margin-top: 1px;
margin-top: var(--_ui5_color_picker_slider_handle_margin_top);
}

[ui5-slider]::part(handle)::after {
Expand Down Expand Up @@ -156,4 +156,35 @@
width: 2.5rem;
min-width: 2.5rem;
text-align: center;
}

.ui5-color-picker-hue-slider::part(progress-container)::before,
.ui5-color-picker-alpha-slider::part(progress-container)::before,
.ui5-color-picker-hue-slider::part(progress-container)::after,
.ui5-color-picker-alpha-slider::part(progress-container)::after,
[ui5-slider].ui5-color-picker-hue-slider::part(icon-slider),
[ui5-slider].ui5-color-picker-alpha-slider::part(icon-slider) {
display: none;
}

.ui5-color-picker-alpha-slider::part(handle),
.ui5-color-picker-hue-slider::part(handle) {
box-shadow: var(--_ui5_color_picker_slider_handle_box_shadow);
border: var(--_ui5_color_picker_slider_handle_border);
}

.ui5-color-picker-alpha-slider::part(handle):hover,
.ui5-color-picker-hue-slider::part(handle):hover {
border: var(--_ui5_color_picker_slider_handle_outline_hover);
}

.ui5-color-picker-alpha-slider::part(handle):focus,
.ui5-color-picker-hue-slider::part(handle):focus {
outline: var(--_ui5_color_picker_slider_handle_outline_focus);
outline-offset: 0.0625rem;
}

.ui5-color-picker-alpha-slider::part(handle):focus,
.ui5-color-picker-hue-slider::part(handle):focus {
margin-top: var(--_ui5_color_picker_slider_handle_focus_margin_top);
}
8 changes: 8 additions & 0 deletions packages/main/src/themes/base/ColorPicker-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
:root {
--_ui5_color_picker_slider_handle_box_shadow: 0.0625rem solid var(--sapField_BorderColor);
--_ui5_color_picker_slider_handle_border: 0.125rem solid var(--sapField_BorderColor);
--_ui5_color_picker_slider_handle_outline_hover: 0.125rem solid var(--sapButton_Hover_BorderColor);
--_ui5_color_picker_slider_handle_outline_focus: 0.0625rem dotted var(--sapContent_FocusColor);
--_ui5_color_picker_slider_handle_margin_top: 0.0625rem;
--_ui5_color_picker_slider_handle_focus_margin_top: 0.0625rem;
}
1 change: 1 addition & 0 deletions packages/main/src/themes/sap_belize/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@import "../base/Card-parameters.css";
@import "../base/CheckBox-parameters.css";
@import "../base/ColorPalette-parameters.css";
@import "../base/ColorPicker-parameters.css";
@import "../base/GroupHeaderListItem-parameters.css";
@import "./Input-parameters.css";
@import "./InputIcon-parameters.css";
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/themes/sap_belize_hcb/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@import "./Card-parameters.css";
@import "./CheckBox-parameters.css";
@import "../base/ColorPalette-parameters.css";
@import "../base/ColorPicker-parameters.css";
@import "./DatePicker-parameters.css";
@import "./DayPicker-parameters.css";
@import "./Dialog-parameters.css";
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/themes/sap_belize_hcw/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@import "./Card-parameters.css";
@import "./CheckBox-parameters.css";
@import "../base/ColorPalette-parameters.css";
@import "../base/ColorPicker-parameters.css";
@import "./DatePicker-parameters.css";
@import "./DayPicker-parameters.css";
@import "./Dialog-parameters.css";
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/themes/sap_fiori_3/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@import "../base/Carousel-parameters.css";
@import "./CheckBox-parameters.css";
@import "../base/ColorPalette-parameters.css";
@import "../base/ColorPicker-parameters.css";
@import "../base/DatePicker-parameters.css";
@import "./DayPicker-parameters.css";
@import "../base/Dialog-parameters.css";
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/themes/sap_fiori_3_dark/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
@import "../base/Carousel-parameters.css";
@import "./CheckBox-parameters.css";
@import "../base/ColorPalette-parameters.css";
@import "../base/ColorPicker-parameters.css";
@import "../base/DatePicker-parameters.css";
@import "./DayPicker-parameters.css";
@import "../base/Dialog-parameters.css";
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@import "./Card-parameters.css";
@import "./CheckBox-parameters.css";
@import "../base/ColorPalette-parameters.css";
@import "../base/ColorPicker-parameters.css";
@import "./DatePicker-parameters.css";
@import "./DayPicker-parameters.css";
@import "./Dialog-parameters.css";
Expand Down
1 change: 1 addition & 0 deletions packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@import "./Card-parameters.css";
@import "./CheckBox-parameters.css";
@import "../base/ColorPalette-parameters.css";
@import "../base/ColorPicker-parameters.css";
@import "./DatePicker-parameters.css";
@import "./DayPicker-parameters.css";
@import "./Dialog-parameters.css";
Expand Down
2 changes: 2 additions & 0 deletions packages/main/src/themes/sap_horizon/ColorPalette-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../base/ColorPalette-parameters.css";

:root {
--_ui5_color-palette-item-container-sides-padding: 0.3125rem;
--_ui5_color-palette-item-container-rows-padding: 0.6875rem;
Expand Down
10 changes: 10 additions & 0 deletions packages/main/src/themes/sap_horizon/ColorPicker-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@import "../base/ColorPicker-parameters.css";

:root {
--_ui5_color_picker_slider_handle_box_shadow: 0.125rem solid var(--sapField_BorderColor);
--_ui5_color_picker_slider_handle_border: 0.125rem solid var(--sapField_BorderColor);
--_ui5_color_picker_slider_handle_outline_hover: 0.125rem solid var(--sapContent_FocusColor);
--_ui5_color_picker_slider_handle_outline_focus: 0.125rem solid var(--sapContent_FocusColor);
--_ui5_color_picker_slider_handle_margin_top: 0;
--_ui5_color_picker_slider_handle_focus_margin_top: -1px;
}
1 change: 1 addition & 0 deletions packages/main/src/themes/sap_horizon/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
@import "../base/Carousel-parameters.css";
@import "./CheckBox-parameters.css";
@import "./ColorPalette-parameters.css";
@import "./ColorPicker-parameters.css";
@import "../base/DatePicker-parameters.css";
@import "./DayPicker-parameters.css";
@import "../base/Dialog-parameters.css";
Expand Down