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-rating-indicator): implement small icons for readonly and disabled #5233

Merged
merged 10 commits into from
May 25, 2022
Merged

feat(ui5-rating-indicator): implement small icons for readonly and disabled #5233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f88c931
fix(ui5-rating-indicator): implement small icons when readonly or dis…
ivoplashkov May 18, 2022
269a9a3
fix(ui5-rating-indicator): implement small icons when readonly or dis…
ivoplashkov May 18, 2022
20d4ad2
Merge branch 'ri-small-icons' of github.com:SAP/ui5-webcomponents int…
ivoplashkov May 18, 2022
60bc4ba
fix selector
ivoplashkov May 18, 2022
8c47359
fix(ui5-rating-indicator): apply correct spacings
ivoplashkov May 18, 2022
cd94585
fix(ui5-rating-indicator): revert sample changes in order to test
ivoplashkov May 18, 2022
3d48898
Merge remote-tracking branch 'origin' into ri-small-icons
ivoplashkov May 19, 2022
b7e1a5f
fix(ui5-rating-indicator): apply outline offset
ivoplashkov May 23, 2022
8d24a8f
fix(ui5-rating-indicator): replace px with rems
ivoplashkov May 25, 2022
ac104c3
Merge remote-tracking branch 'origin' into ri-small-icons
ivoplashkov May 25, 2022
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
6 changes: 5 additions & 1 deletion packages/main/src/RatingIndicator.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@
</div>
</li>
{{else if ../readonly}}
<li class="ui5-rating-indicator-item ui5-rating-indicator-readonly-item-unsel">
<li class="ui5-rating-indicator-item ui5-rating-indicator-item-unsel">
<ui5-icon data-ui5-value="{{this.index}}" name="favorite"></ui5-icon>
</li>
{{else if ../disabled}}
<li class="ui5-rating-indicator-item ui5-rating-indicator-item-unsel">
<ui5-icon data-ui5-value="{{this.index}}" name="favorite"></ui5-icon>
</li>
{{else}}
Expand Down
11 changes: 7 additions & 4 deletions packages/main/src/themes/RatingIndicator.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@
cursor: initial;
}

:host([readonly]) .ui5-rating-indicator-readonly-item-unsel {
color: var(--sapContent_UnratedColor);
:host([disabled]) .ui5-rating-indicator-item-unsel,
:host([readonly]) .ui5-rating-indicator-item-unsel {
padding-inline: var(--_ui5_rating_indicator_readonly_item_spacing);
width: var(--_ui5_rating_indicator_readonly_item_width);
height: var(--_ui5_rating_indicator_readonly_item_height);
}

:host(:not([readonly]):not([disabled])) .ui5-rating-indicator-root:hover {
Expand All @@ -25,6 +28,7 @@

:host([_focused]) {
outline: var(--sapContent_FocusWidth) var(--sapContent_FocusStyle) var(--sapContent_FocusColor);
outline-offset: var(--_ui5_rating_indicator_outline_offset);
border-radius: var(--_ui5_rating_indicator_border_radius);
}

Expand All @@ -41,6 +45,7 @@
.ui5-rating-indicator-list {
list-style-type: none;
display: flex;
align-items: center;
margin: 0;
padding: 0;
}
Expand All @@ -49,8 +54,6 @@
position: relative;
width: var(--_ui5_rating_indicator_item_width);
height: var(--_ui5_rating_indicator_item_height);
min-width: var(--_ui5_rating_indicator_item_width);
min-height: var(--_ui5_rating_indicator_item_height);
}

.ui5-rating-indicator-item:not(:last-child) {
Expand Down
6 changes: 6 additions & 0 deletions packages/main/src/themes/base/RatingIndicator-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
:root {
--_ui5_rating_indicator_border_radius: 0px;
--_ui5_rating_indicator_outline_offset: 0px;
--_ui5_rating_indicator_item_height: 1em;
--_ui5_rating_indicator_item_width: 1em;
--_ui5_rating_indicator_readonly_item_height: 1em;
--_ui5_rating_indicator_readonly_item_width: 1em;
--_ui5_rating_indicator_readonly_item_spacing: 0px;
--_ui5_rating_indicator_component_spacing: 0.5rem 0px;
}

Expand All @@ -10,5 +14,7 @@
.sapUiSizeCompact {
--_ui5_rating_indicator_item_height: 0.67em;
--_ui5_rating_indicator_item_width: 0.67em;
--_ui5_rating_indicator_readonly_item_height: 0.67em;
--_ui5_rating_indicator_readonly_item_width: 0.67em;
--_ui5_rating_indicator_component_spacing: 0.8125rem 0px;
}
14 changes: 14 additions & 0 deletions packages/main/src/themes/sap_horizon/RatingIndicator-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
@import "../base/RatingIndicator-parameters.css";

:root {
--_ui5_rating_indicator_border_radius: 0.25rem;
--_ui5_rating_indicator_outline_offset: 0.125rem;
--_ui5_rating_indicator_readonly_item_height: 0.75em;
--_ui5_rating_indicator_readonly_item_width: 0.75em;
--_ui5_rating_indicator_readonly_item_spacing: 0.1875rem 0.1875rem;
}

[data-ui5-compact-size],
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_rating_indicator_readonly_item_height: 0.5em;
--_ui5_rating_indicator_readonly_item_width: 0.5em;
--_ui5_rating_indicator_readonly_item_spacing: 0.125rem 0.125rem;
}
1 change: 0 additions & 1 deletion 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 @@ -32,7 +32,6 @@
@import "../base/PopupsCommon-parameters.css";
@import "./ProgressIndicator-parameters.css";
@import "../base/RadioButton-parameters.css";
@import "../base/RatingIndicator-parameters.css";
@import "./RatingIndicator-parameters.css";
@import "./SegmentedButtton-parameters.css";
@import "./RadioButton-parameters.css";
Expand Down
14 changes: 14 additions & 0 deletions packages/main/src/themes/sap_horizon_dark/RatingIndicator-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
@import "../base/RatingIndicator-parameters.css";

:root {
--_ui5_rating_indicator_border_radius: 0.25rem;
--_ui5_rating_indicator_outline_offset: 0.125rem;
--_ui5_rating_indicator_readonly_item_height: 0.75em;
--_ui5_rating_indicator_readonly_item_width: 0.75em;
--_ui5_rating_indicator_readonly_item_spacing: 0.1875rem 0.1875rem;
}

[data-ui5-compact-size],
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_rating_indicator_readonly_item_height: 0.5em;
--_ui5_rating_indicator_readonly_item_width: 0.5em;
--_ui5_rating_indicator_readonly_item_spacing: 0.125rem 0.125rem;
}
1 change: 0 additions & 1 deletion packages/main/src/themes/sap_horizon_dark/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
@import "../sap_horizon/ProgressIndicator-parameters.css";
@import "../base/RadioButton-parameters.css";
@import "./RatingIndicator-parameters.css";
@import "../base/RatingIndicator-parameters.css";
@import "./SegmentedButtton-parameters.css";
@import "./RadioButton-parameters.css";
@import "./Switch-parameters.css";
Expand Down
16 changes: 16 additions & 0 deletions packages/main/src/themes/sap_horizon_exp/RatingIndicator-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@import "../base/RatingIndicator-parameters.css";

:root {
--_ui5_rating_indicator_border_radius: 0.25rem;
--_ui5_rating_indicator_readonly_item_height: 0.75em;
--_ui5_rating_indicator_readonly_item_width: 0.75em;
--_ui5_rating_indicator_readonly_item_spacing: 0.25em;
}

[data-ui5-compact-size],
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_rating_indicator_readonly_item_height: 0.5em;
--_ui5_rating_indicator_readonly_item_width: 0.5em;
--_ui5_rating_indicator_readonly_item_spacing: 0.125em;
}
2 changes: 1 addition & 1 deletion packages/main/src/themes/sap_horizon_exp/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@import "./Popover-parameters.css";
@import "../base/ProgressIndicator-parameters.css";
@import "./RadioButton-parameters.css";
@import "../base/RatingIndicator-parameters.css";
@import "./RatingIndicator-parameters.css";
@import "./Select-parameters.css";
@import "./Switch-parameters.css";
@import "./TabContainer-parameters.css";
Expand Down
16 changes: 16 additions & 0 deletions packages/main/src/themes/sap_horizon_hcb/RatingIndicator-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@import "../base/RatingIndicator-parameters.css";

:root {
--_ui5_rating_indicator_border_radius: 0.25rem;
--_ui5_rating_indicator_readonly_item_height: 0.75em;
--_ui5_rating_indicator_readonly_item_width: 0.75em;
--_ui5_rating_indicator_readonly_item_spacing: 0.1875rem 0.1875rem;
}

[data-ui5-compact-size],
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_rating_indicator_readonly_item_height: 0.5em;
--_ui5_rating_indicator_readonly_item_width: 0.5em;
--_ui5_rating_indicator_readonly_item_spacing: 0.125rem 0.125rem;
}
2 changes: 1 addition & 1 deletion packages/main/src/themes/sap_horizon_hcb/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@import "../base/PopupsCommon-parameters.css";
@import "./ProgressIndicator-parameters";
@import "./RadioButton-parameters.css";
@import "../base/RatingIndicator-parameters.css";
@import "./RatingIndicator-parameters.css";
@import "./SegmentedButtton-parameters.css";
@import "./Select-parameters.css";
@import "./SplitButton-parameters.css";
Expand Down
16 changes: 16 additions & 0 deletions packages/main/src/themes/sap_horizon_hcw/RatingIndicator-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@import "../base/RatingIndicator-parameters.css";

:root {
--_ui5_rating_indicator_border_radius: 0.25rem;
--_ui5_rating_indicator_readonly_item_height: 0.75em;
--_ui5_rating_indicator_readonly_item_width: 0.75em;
--_ui5_rating_indicator_readonly_item_spacing: 0.1875rem 0.1875rem;
}

[data-ui5-compact-size],
.ui5-content-density-compact,
.sapUiSizeCompact {
--_ui5_rating_indicator_readonly_item_height: 0.5em;
--_ui5_rating_indicator_readonly_item_width: 0.5em;
--_ui5_rating_indicator_readonly_item_spacing: 0.125rem 0.125rem;
}
2 changes: 1 addition & 1 deletion packages/main/src/themes/sap_horizon_hcw/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
@import "../base/PopupsCommon-parameters.css";
@import "../sap_horizon_hcb/ProgressIndicator-parameters";
@import "./RadioButton-parameters.css";
@import "../base/RatingIndicator-parameters.css";
@import "./RatingIndicator-parameters.css";
@import "./SegmentedButtton-parameters.css";
@import "./Select-parameters.css";
@import "./SplitButton-parameters.css";
Expand Down