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-segmented-button): implement sap_horizon theme #4197

Merged
merged 17 commits into from
Nov 1, 2021
Merged

feat(ui5-segmented-button): implement sap_horizon theme #4197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
55861e6
SAP Horizon applied to segmented button
terezamch Oct 27, 2021
f9d16ae
Merge branch 'master' of github.com:terezamch/ui5-webcomponents into …
terezamch Oct 27, 2021
953a7f7
hash restored
terezamch Oct 27, 2021
0434152
css-vars-usage.json restored
terezamch Oct 27, 2021
fd8a694
css-vars-usage.json restored
terezamch Oct 27, 2021
ba076e5
css-vars-usage.json restored
terezamch Oct 27, 2021
f138d3a
fiori_3 theme restored
terezamch Oct 28, 2021
fb617b7
Merge branch 'master' of github.com:terezamch/ui5-webcomponents into …
terezamch Oct 28, 2021
4f27393
tect is not moving
terezamch Oct 29, 2021
3ecafb2
rems instead of pxs
terezamch Oct 29, 2021
6c87dd5
Merge branch 'master' of github.com:terezamch/ui5-webcomponents into …
terezamch Oct 29, 2021
c727cc9
stabilize border appearance
terezamch Nov 1, 2021
e70e396
Update hash.txt
tsanislavgatev Nov 1, 2021
18d6326
update hash
tsanislavgatev Nov 1, 2021
37764bd
restored hash.txt
terezamch Nov 1, 2021
7b510fc
Merge branch 'master' of github.com:terezamch/ui5-webcomponents into …
terezamch Nov 1, 2021
d8dfbca
Merge branch 'segBtn-sap-horizon' of github.com:terezamch/ui5-webcomp…
terezamch Nov 1, 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
49 changes: 38 additions & 11 deletions packages/main/src/themes/SegmentedButton.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,56 +6,83 @@

.ui5-segmented-button-root {
display: flex;
margin: 0;
padding: 0;
margin: 0;
padding: 0;
background-color: var(--_ui5_segmented_btn_background_color);
border-radius: var(--_ui5_segmented_btn_inner_border_radius);
}

::slotted([ui5-segmented-button-item]) {
border-radius: 0;
border-radius: var(--_ui5_segmented_btn_inner_border_radius);
height: var(--_ui5_button_base_height);
min-width: 2.5rem;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
border: var(--_ui5_segmented_btn_inner_border);
}

::slotted([ui5-segmented-button-item][pressed]) {
border: 0.0625rem solid var(--sapButton_Selected_BorderColor)
}

::slotted([ui5-segmented-button-item]:nth-child(odd)) {
border: 1px solid var(--sapButton_Selected_BorderColor);
border-right: 0;
border-left: 0;
border-right: var(--_ui5_segmented_btn_inner_border_odd_child);
border-left: var(--_ui5_segmented_btn_inner_border_odd_child);
}

::slotted([ui5-segmented-button-item][pressed]:nth-child(odd)) {
border-right: var(--_ui5_segmented_btn_inner_pressed_border_odd_child);
border-left: var(--_ui5_segmented_btn_inner_pressed_border_odd_child);
}

::slotted([ui5-segmented-button-item]:last-child) {
border-top-right-radius: var(--_ui5_segmented_btn_border_radius);
border-bottom-right-radius: var(--_ui5_segmented_btn_border_radius);
border-right: 1px solid var(--sapButton_Selected_BorderColor);
border-right: var(--_ui5_segmented_btn_inner_border);
}

::slotted([ui5-segmented-button-item][pressed]:last-child) {
border-right: 0.0625rem solid var(--sapButton_Selected_BorderColor);
}

::slotted([ui5-segmented-button-item]:first-child) {
border-top-left-radius: var(--_ui5_segmented_btn_border_radius);
border-bottom-left-radius: var(--_ui5_segmented_btn_border_radius);
border-left: 1px solid var(--sapButton_Selected_BorderColor);
border-left: var(--_ui5_segmented_btn_inner_border);
}

::slotted([ui5-segmented-button-item][pressed]:first-child) {
border-left: 0.0625rem solid var(--sapButton_Selected_BorderColor);
}

[dir="rtl"] ::slotted([ui5-segmented-button-item]:first-child) {
border-top-right-radius: var(--_ui5_segmented_btn_border_radius);
border-bottom-right-radius: var(--_ui5_segmented_btn_border_radius);
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-right: 1px solid var(--sapButton_Selected_BorderColor);
border-right: var(--_ui5_segmented_btn_inner_border);
}

[dir="rtl"] ::slotted([ui5-segmented-button-item][pressed]:first-child) {
border-right: 0.0625rem solid var(--sapButton_Selected_BorderColor);
}

[dir="rtl"] ::slotted([ui5-segmented-button-item]:last-child) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-top-left-radius: var(--_ui5_segmented_btn_border_radius);
border-bottom-left-radius: var(--_ui5_segmented_btn_border_radius);
border-left: 1px solid var(--sapButton_Selected_BorderColor);
border-left: var(--_ui5_segmented_btn_inner_border);
}

[dir="rtl"] ::slotted([ui5-segmented-button-item][pressed]:last-child) {
border-left: 0.0625rem solid var(--sapButton_Selected_BorderColor);
}

[dir="rtl"] ::slotted([ui5-segmented-button-item]:only-child) {
border-top-right-radius: var(--_ui5_segmented_btn_border_radius);
border-bottom-right-radius: var(--_ui5_segmented_btn_border_radius);
border-top-left-radius: var(--_ui5_segmented_btn_border_radius);
border-bottom-left-radius: var(--_ui5_segmented_btn_border_radius);
}
}
8 changes: 8 additions & 0 deletions packages/main/src/themes/base/SegmentedButtton-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
:root {
--_ui5_segmented_btn_inner_border: 0.0625rem solid var(--sapButton_Selected_BorderColor);
--_ui5_segmented_btn_inner_border_odd_child: 0;
--_ui5_segmented_btn_inner_pressed_border_odd_child: 0;
--_ui5_segmented_btn_border_radius: 0.35rem;
--_ui5_segmented_btn_inner_border_radius: 0;
--_ui5_segmented_btn_background_color: transparent;
}
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 @@ -23,6 +23,7 @@
@import "../base/PopupsCommon-parameters.css";
@import "./ProgressIndicator-parameters.css";
@import "../base/RadioButton-parameters.css";
@import "../base/SegmentedButtton-parameters.css";
@import "../base/Select-parameters.css";
@import "../base/Switch-parameters.css";
@import "./TabContainer-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 @@ -23,6 +23,7 @@
@import "../base/PopupsCommon-parameters.css";
@import "./ProgressIndicator-parameters.css";
@import "./RadioButton-parameters.css";
@import "../base/SegmentedButtton-parameters.css";
@import "./Select-parameters.css";
@import "./Switch-parameters.css";
@import "./TabContainer-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 @@ -23,6 +23,7 @@
@import "../base/PopupsCommon-parameters.css";
@import "./ProgressIndicator-parameters";
@import "./RadioButton-parameters.css";
@import "../base/SegmentedButtton-parameters.css";
@import "./Select-parameters.css";
@import "./Switch-parameters.css";
@import "./TabContainer-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 @@ -22,6 +22,7 @@
@import "../base/PopupsCommon-parameters.css";
@import "../base/ProgressIndicator-parameters.css";
@import "../base/RadioButton-parameters.css";
@import "../base/SegmentedButtton-parameters.css";
@import "../base/Select-parameters.css";
@import "../base/Switch-parameters.css";
@import "./TabContainer-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 @@ -22,6 +22,7 @@
@import "../base/PopupsCommon-parameters.css";
@import "../base/ProgressIndicator-parameters.css";
@import "../base/RadioButton-parameters.css";
@import "../base/SegmentedButtton-parameters.css";
@import "../base/Select-parameters.css";
@import "../base/Switch-parameters.css";
@import "./TabContainer-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 @@ -23,6 +23,7 @@
@import "../base/PopupsCommon-parameters.css";
@import "./ProgressIndicator-parameters";
@import "./RadioButton-parameters.css";
@import "../base/SegmentedButtton-parameters.css";
@import "./Select-parameters.css";
@import "./Switch-parameters.css";
@import "./TabContainer-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 @@ -23,6 +23,7 @@
@import "../base/PopupsCommon-parameters.css";
@import "./ProgressIndicator-parameters";
@import "./RadioButton-parameters.css";
@import "../base/SegmentedButtton-parameters.css";
@import "./Select-parameters.css";
@import "./Switch-parameters.css";
@import "./TabContainer-parameters.css";
Expand Down
10 changes: 10 additions & 0 deletions packages/main/src/themes/sap_horizon/SegmentedButtton-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@import "../base/SegmentedButtton-parameters.css";

:root {
--_ui5_segmented_btn_inner_border: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_border_odd_child: 0.0625rem solid transparent;
--_ui5_segmented_btn_inner_pressed_border_odd_child: 0.0625rem solid var(--sapButton_Selected_BorderColor);
--_ui5_segmented_btn_border_radius: 0.5rem;
--_ui5_segmented_btn_inner_border_radius: 0.5rem;
--_ui5_segmented_btn_background_color: var(--sapButton_Background);
}
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 @@ -26,6 +26,7 @@
@import "./ProgressIndicator-parameters.css";
@import "../base/RadioButton-parameters.css";
@import "./RatingIndicator-parameters.css";
@import "./SegmentedButtton-parameters.css";
@import "./RadioButton-parameters.css";
@import "../base/Select-parameters.css";
@import "./SelectPopover-parameters.css";
Expand Down