Skip to content

fix(ui5-combobox, ui5-multicombobox): center ValueState text #2733

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

Merged
merged 5 commits into from
Jan 27, 2021
Merged

fix(ui5-combobox, ui5-multicombobox): center ValueState text #2733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0cea145
fix(ui5-combobox): center valueState message text
ndeshev Jan 26, 2021
1add06e
Fix MultiComboBox also, restore previous resp. header height
ndeshev Jan 26, 2021
fbc5df2
Match line-height of the value state header with the min-height of th…
ndeshev Jan 26, 2021
1391586
Restore the Popover's header height param for cozy themes
ndeshev Jan 27, 2021
6678813
Remove line-height, correct the paddings
ndeshev Jan 27, 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/ComboBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ class ComboBox extends UI5Element {
suggestionPopoverHeader: {
"display": this._listWidth === 0 ? "none" : "inline-block",
"width": `${this._listWidth}px`,
"padding": "0.5625rem 1rem",
"padding": "0.9125rem 1rem",
},
};
}
Expand Down
3 changes: 1 addition & 2 deletions packages/main/src/MultiComboBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,9 +872,8 @@ class MultiComboBox extends UI5Element {
return {
popoverValueStateMessage: {
"width": `${this._listWidth}px`,
"min-height": "2.5rem",
"padding": "0.5625rem 1rem",
"display": this._listWidth === 0 ? "none" : "inline-block",
"padding": "0.9125rem 1rem",
},
popoverHeader: {
"width": `${this._inputWidth}px`,
Expand Down
2 changes: 1 addition & 1 deletion packages/main/src/themes/ResponsivePopover.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}

.ui5-responsive-popover-header {
height: var(--_ui5-responnsive_popover_header_height);
height: var(--_ui5-responsive_popover_header_height);
display: flex;
justify-content: space-between;
align-items: center;
Expand Down
4 changes: 2 additions & 2 deletions packages/main/src/themes/base/sizes-parameters.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
--_ui5_textarea_padding: 0.5625rem 0.6875rem;

/* Responsive Popover */
--_ui5-responnsive_popover_header_height: 2.75rem;
--_ui5-responsive_popover_header_height: 2.75rem;

/* Side Navigation */
--ui5_side_navigation_item_height: 2.75rem;
Expand Down Expand Up @@ -210,7 +210,7 @@
--_ui5_radiobutton_min_width: var(--_ui5_radiobutton_min_width_compact);

/* Responsive Popover */
--_ui5-responnsive_popover_header_height: 2.5rem;
--_ui5-responsive_popover_header_height: 2.5rem;

/* Side Navigation */
--ui5_side_navigation_item_height: 2rem;
Expand Down