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

fix(ui5-li-custom): enable setting height of the custom content #311

Merged
merged 4 commits into from
Apr 9, 2019
+15 −6
Merged

fix(ui5-li-custom): enable setting height of the custom content #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97fef9e
fix(ui5-li-custom): enable setting height of the custom content
ilhan007 Apr 5, 2019
2d79950
Merge branch 'master' into custom-height-li
ilhan007 Apr 8, 2019
8921701
update styling
ilhan007 Apr 8, 2019
747f714
merge similar selectors
ilhan007 Apr 9, 2019
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
9 changes: 9 additions & 0 deletions packages/main/src/themes-next/CustomListItem.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,23 @@ ui5-li-custom .sap-phone .sapMLIB {
}

.sapMLIB.sapMCustomLI {
height: 100%;
padding: 0;
}

ui5-checkbox.multiSelectionCheckBox,
ui5-radiobutton.singleSelectionRadioButton {
display: flex;
align-items: center;
}

.sapMLIB.sapMCustomLI,
ui5-checkbox.multiSelectionCheckBox,
ui5-radiobutton.singleSelectionRadioButton {
min-width: 3rem;
}

.sapUiSizeCompact .sapMLIB.sapMCustomLI,
.sapUiSizeCompact ui5-checkbox.multiSelectionCheckBox,
.sapUiSizeCompact ui5-radiobutton.singleSelectionRadioButton {
min-width: 2rem;
Expand Down
12 changes: 6 additions & 6 deletions packages/main/test/sap/ui/webcomponents/main/pages/Kitchen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,19 +390,19 @@
<section class="row">
<ui5-list header-text="Products" mode="SingleSelectEnd">
<ui5-li-custom type="Active">
<div style="width: 100%; height: 3rem; display: flex; align-items: center; justify-content: space-between">
<div style="width: 100%; height: 5rem; display: flex; align-items: center; justify-content: space-between">
<span>Laptop HP 2GB RAM Dual-core</span>
<ui5-link>Go to SAP</ui5-link>
</div>
</ui5-li-custom>
<ui5-li-custom type="Active">
<div style="width: 100%; height: 3rem; display: flex; align-items: center; justify-content: space-between">
<div style="width: 100%; height: 5rem; display: flex; align-items: center; justify-content: space-between">
<span>Laptop HP 2GB RAM Dual-core</span>
<ui5-link>Go to SAP</ui5-link>
</div>
</ui5-li-custom>
<ui5-li-custom type="Active">
<div style="width: 100%; height: 3rem; display: flex; align-items: center; justify-content: space-between">
<div style="width: 100%; height: 5rem; display: flex; align-items: center; justify-content: space-between">
<span>Laptop HP 2GB RAM Dual-core</span>
<ui5-link>Go to SAP</ui5-link>
</div>
Expand All @@ -411,19 +411,19 @@

<ui5-list header-text="Products" mode="MultiSelect">
<ui5-li-custom type="Active">
<div style="width: 100%; height: 3rem; display: flex; align-items: center; justify-content: space-between">
<div style="width: 100%; height: 8rem; display: flex; align-items: center; justify-content: space-between">
<span>Laptop HP 2GB RAM Dual-core</span>
<ui5-link>Go to SAP</ui5-link>
</div>
</ui5-li-custom>
<ui5-li-custom type="Active">
<div style="width: 100%; height: 3rem; display: flex; align-items: center; justify-content: space-between">
<div style="width: 100%; height: 8rem; display: flex; align-items: center; justify-content: space-between">
<span>Laptop HP 2GB RAM Dual-core</span>
<ui5-link>Go to SAP</ui5-link>
</div>
</ui5-li-custom>
<ui5-li-custom type="Active">
<div style="width: 100%; height: 3rem; display: flex; align-items: center; justify-content: space-between">
<div style="width: 100%; height: 8rem; display: flex; align-items: center; justify-content: space-between">
<span>Laptop HP 2GB RAM Dual-core</span>
<ui5-link>Go to SAP</ui5-link>
</div>
Expand Down