From 97fef9e94a7b088f097b6d79a80059c7961184af Mon Sep 17 00:00:00 2001 From: ilhan Date: Fri, 5 Apr 2019 16:22:37 +0300 Subject: [PATCH 1/3] fix(ui5-li-custom): enable setting height of the custom content Fixes: https://github.com/SAP/ui5-webcomponents/issues/310 --- packages/main/src/themes-next/CustomListItem.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/main/src/themes-next/CustomListItem.css b/packages/main/src/themes-next/CustomListItem.css index 0656274bf66a..231f97ce7b04 100644 --- a/packages/main/src/themes-next/CustomListItem.css +++ b/packages/main/src/themes-next/CustomListItem.css @@ -15,14 +15,22 @@ ui5-li-custom .sap-phone .sapMLIB { } .sapMLIB.sapMCustomLI { + height: auto; + min-height: 3rem; padding: 0; } ui5-checkbox.multiSelectionCheckBox, ui5-radiobutton.singleSelectionRadioButton { + display: flex; + align-items: center; min-width: 3rem; } +.sapUiSizeCompact .sapMLIB.sapMCustomLI { + min-height: 2rem; +} + .sapUiSizeCompact ui5-checkbox.multiSelectionCheckBox, .sapUiSizeCompact ui5-radiobutton.singleSelectionRadioButton { min-width: 2rem; From 89217014d986fd556a02708a341a2e25596d36a8 Mon Sep 17 00:00:00 2001 From: ilhan Date: Mon, 8 Apr 2019 16:18:48 +0300 Subject: [PATCH 2/3] update styling --- packages/main/src/themes-next/CustomListItem.css | 2 +- .../sap/ui/webcomponents/main/pages/Kitchen.html | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/main/src/themes-next/CustomListItem.css b/packages/main/src/themes-next/CustomListItem.css index 231f97ce7b04..71b96a421b59 100644 --- a/packages/main/src/themes-next/CustomListItem.css +++ b/packages/main/src/themes-next/CustomListItem.css @@ -15,7 +15,7 @@ ui5-li-custom .sap-phone .sapMLIB { } .sapMLIB.sapMCustomLI { - height: auto; + height: 100%; min-height: 3rem; padding: 0; } diff --git a/packages/main/test/sap/ui/webcomponents/main/pages/Kitchen.html b/packages/main/test/sap/ui/webcomponents/main/pages/Kitchen.html index f3c13eb91446..aabf6390cf67 100644 --- a/packages/main/test/sap/ui/webcomponents/main/pages/Kitchen.html +++ b/packages/main/test/sap/ui/webcomponents/main/pages/Kitchen.html @@ -390,19 +390,19 @@
-
+
Laptop HP 2GB RAM Dual-core Go to SAP
-
+
Laptop HP 2GB RAM Dual-core Go to SAP
-
+
Laptop HP 2GB RAM Dual-core Go to SAP
@@ -411,19 +411,19 @@ -
+
Laptop HP 2GB RAM Dual-core Go to SAP
-
+
Laptop HP 2GB RAM Dual-core Go to SAP
-
+
Laptop HP 2GB RAM Dual-core Go to SAP
From 747f7144b690313bf2a6befb52c1ccb1a1effee4 Mon Sep 17 00:00:00 2001 From: ilhan Date: Tue, 9 Apr 2019 11:22:43 +0300 Subject: [PATCH 3/3] merge similar selectors --- packages/main/src/themes-next/CustomListItem.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/main/src/themes-next/CustomListItem.css b/packages/main/src/themes-next/CustomListItem.css index 71b96a421b59..4c78be266ee0 100644 --- a/packages/main/src/themes-next/CustomListItem.css +++ b/packages/main/src/themes-next/CustomListItem.css @@ -16,7 +16,6 @@ ui5-li-custom .sap-phone .sapMLIB { .sapMLIB.sapMCustomLI { height: 100%; - min-height: 3rem; padding: 0; } @@ -24,13 +23,15 @@ ui5-checkbox.multiSelectionCheckBox, ui5-radiobutton.singleSelectionRadioButton { display: flex; align-items: center; - min-width: 3rem; } -.sapUiSizeCompact .sapMLIB.sapMCustomLI { - min-height: 2rem; +.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;