@openui5/themelib_sap_horizon 1.100.0 → 1.102.1

package/src/sap/ui/unified/themes/sap_horizon_hcw/CalendarRow.less

@@ -21,7 +21,7 @@
 
 /* Appointments */
 /* as outlines can't have different offsets on one side (no left border) and don't work in IE just use a inner border */
-html.sap-desktop .sapUiCalendarApp:focus > .sapUiCalendarAppCont:after{
+html.sap-desktop .sapUiCalendarApp:focus > .sapUiCalendarAppCont:after {
 	position: absolute;
 	top: 1px;
 	left: 1px;
@@ -32,6 +32,25 @@ html.sap-desktop .sapUiCalendarApp:focus > .sapUiCalendarAppCont:after{
 	pointer-events: none;
 }
 
+.sapUiCalendarApp,
+.sapUiCalendarAppCont {
+	border-radius: 0.25rem;
+}
+
+.sapUiCalendarAppCont {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
+}
+
+html.sap-desktop .sapUiCalendarApp:focus:not(:active) > .sapUiCalendarAppCont {
+	background-color: @sapUiListBackground;
+}
+
+html.sap-desktop .sapUiCalendarApp.sapUiCalendarAppSel:focus:hover:not(:active) > .sapUiCalendarAppCont,
+html.sap-desktop .sapUiCalendarApp:hover:not(:active) > .sapUiCalendarAppCont {
+	background-color: @sapUiListHoverBackground;
+}
+
 .sapMListTblRow.sapMLIBFocusable:focus {
 	.sapUiCalendarRowAppsInt.sapUiCalendarRowAppsNoWork:before {
 		position: absolute;
@@ -92,7 +111,6 @@ html.sap-desktop .sapUiCalendarApp.sapUiCalendarAppSel:focus:not(:active){
 .sapUiCalendarApp:active > .sapUiCalendarAppCont,
 .sapUiCalendarApp.sapUiCalendarAppSel:active > .sapUiCalendarAppCont{
 	border-color: @sapUiListSelectionBorderColor;
-	border-left: 0.0625rem solid @sapUiListBackground;
 }
 
 
@@ -117,6 +135,7 @@ html.sap-desktop .sapUiCalendarApp.sapUiCalendarAppSel:hover:not(:active)  > .sa
 
 .sapUiCalendarAppTitle{
 	font-size: @sapMFontMediumSize;
+	color: @sapUiBaseText;
 }
 
 .sapUiCalendarAppText{

package/src/sap/ui/unified/themes/sap_horizon_hcw/ColorPicker.less

@@ -1,7 +1,7 @@
-/* =========================================== */
-/* CSS for control sap.ui.unified.ColorPicker  */
-/* Horizon High Contrast White theme           */
-/* =========================================== */
+/* ========================================== */
+/* CSS for control sap.ui.unified.ColorPicker */
+/* Horizon High Contrast Black theme          */
+/* ========================================== */
 
 .sapUiColorPicker-ColorPickerSlider.sapUiSliHori .sapUiSliBar,
 .sapUiColorPicker-ColorPickerSlider.sapUiSliHori .sapUiSliBar .sapUiSliHiLi {
@@ -19,10 +19,10 @@
 	.sapUiColorPicker-ColorPickerAlphaSlider,
 	.sapUiColorPicker-ColorPickerSlider {
 		.sapMSliderHandle {
+			width: 1.0625rem;
 			top: -0.50rem;
 			border: 0.125rem solid @sapUiContentContrastShadowColor;
 			background-color: transparent;
-			height: 1.625rem;
 			box-shadow: inset 0 0 0 0.125rem @sapUiContentForegroundColor;
 		}
 		.sapMSliderProgress {
@@ -35,6 +35,12 @@
 				//override the blue border color when the handle is pressed
 				border-color: @sapUiContentContrastShadowColor;
 			}
+			.sapMSliderHandle:not(.sapMSliderHandlePressed):not(.sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled) .sapMSliderHandle:focus):after {
+				content: none;
+			}
+			&::before {
+				content: none
+			}
 		}
 	}
 }

package/src/sap/ui/unified/themes/sap_horizon_hcw/FileUploader.less

@@ -8,6 +8,13 @@
 	height: 2.75rem;
 }
 
+.sapUiSizeCompact{
+	.sapUiFup,
+	.sapUiFup.sapMBarChild {
+		height: 2rem;
+	}
+}
+
 /* increase outline offset */
 .sapMIBar-CTX .sapUiFup .sapMBtnInner:focus.sapMFocusable {
 	outline-offset: -.125rem;

package/src/sap/ui/unified/themes/sap_horizon_hcw/Menu.less

@@ -3,6 +3,14 @@
 /* Horizon High Contrast White theme    */
 /* ==================================== */
 
+.sapUiMnu {
+	border-radius: @sapUiPopoverBorderCornerRadius;
+}
+
+.sapUiMnuItmSbMnu > div:after {
+	font-size: 1rem;
+}
+
 .sapUiMnuItm.sapUiMnuTfItm .sapUiMnuTfItemTf.sapUiMnuTfItemTfDsbl {
 	opacity: @sapUiContentDisabledOpacity;
 }
@@ -84,7 +92,7 @@ html.sap-phone .sapUiSizeCozy .sapUiMnuItm {
 }
 
 .sapMMenuLIArrowRightIcon {
-	font-size: 0.75rem;
+	font-size: 1rem;
 	width: 2.75rem;
 	height: 2.75rem;
 	line-height: 2.75rem;

package/src/sap/uxap/themes/sap_horizon/AnchorBar.less

@@ -12,7 +12,7 @@ Common compact/cozy
 @sapUiFiori3ABUnderlineTopRadius: 0.125rem;
 
 .sapUxAPAnchorBarFiori3Height {
-	height: @sapElement_LineHeight;
+	height: @sapUiElementLineHeight;
 }
 
 .sapUiSizeCompact .sapUxAPAnchorBar,
@@ -54,7 +54,7 @@ Common compact/cozy
 				font-family: @sapUiFontFamily;
 				font-size: @sapMFontMediumSize;
 				height: 2.5rem;
-				line-height: @sapElement_LineHeight;
+				line-height: @sapUiElementLineHeight;
 			}
 		}
 	}
@@ -106,7 +106,7 @@ html .sapUxAPObjectPageLayout-Std-Desktop .sapUxAPAnchorBar.sapMTB
 	&.sapMMenuBtn .sapMSBActive:not(.sapMBtnDisabled) > .sapMBtnInner .sapMBtnIcon,
 	&.sapMMenuBtn .sapMSBArrow:not(.sapMBtnDisabled) > .sapMBtnInner.sapMBtnActive .sapMBtnIcon,
 	&.sapMMenuBtn.sapMMenuBtnSplit .sapMSBText:not(.sapMBtnDisabled) > .sapMBtnInner.sapMBtnActive .sapMBtnContent {
-		color: @sapContent_Selected_TextColor;
+		color: @sapUiContentSelectedTextColor;
 	}
 
 	&.sapMMenuBtn .sapMSBArrow:not(.sapMBtnDisabled) > .sapMBtnInner.sapMBtnActive {
@@ -131,7 +131,7 @@ html .sapUxAPObjectPageLayout-Std-Desktop .sapUxAPAnchorBar.sapMTB
 
 		.sapMBtnContent,
 		.sapUiIcon {
-			color: @sapContent_Selected_TextColor;
+			color: @sapUiContentSelectedTextColor;
 		}
 
 		&::after {
@@ -155,7 +155,7 @@ html .sapUxAPObjectPageLayout-Std-Desktop .sapUxAPAnchorBar.sapMTB
 
 	.sapMBtnDefault .sapMBtnContent {
 		overflow: visible;
-		color: @sapContent_Selected_TextColor;
+		color: @sapUiContentSelectedTextColor;
 
 		&::after {
 			content: "";
@@ -166,7 +166,7 @@ html .sapUxAPObjectPageLayout-Std-Desktop .sapUxAPAnchorBar.sapMTB
 			padding: (@sapUiFiori3ABUnderlineOffsetAndHeight / 2) @sapUiFiori3ABUnderlineOffsetAndHeight;
 			border-top-left-radius: @sapUiFiori3ABUnderlineTopRadius;
 			border-top-right-radius: @sapUiFiori3ABUnderlineTopRadius;
-			background-color: @sapContent_Selected_ForegroundColor;
+			background-color: @sapUiContentSelectedForegroundColor;
 		}
 	}
 }
@@ -303,7 +303,7 @@ html.sap-desktop .sapMBtnBase.sapMBtn.sapUxAPAnchorBarButton:focus::after {
 	right: 0;
 	bottom: 0.25rem;
 	left: 0;
-	border: @sapContent_FocusWidth @sapContent_FocusStyle @sapContent_FocusColor;
+	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
 	border-radius: 0.5rem;
 }
 
@@ -320,5 +320,5 @@ html.sap-desktop .sapUxAPAnchorBarButton .sapMBtn:focus .sapMBtnInner::before {
 .sapUxAPAnchorBar .sapUxAPAnchorBarButton:hover .sapMBtn > .sapMBtnTransparent.sapMBtnHoverable:not(.sapMBtnActive):not(.sapMToggleBtnPressed) bdi,
 .sapUxAPAnchorBar .sapUxAPAnchorBarButton:hover .sapMBtn + .sapMBtn .sapMBtnInner *,
 .sapUxAPAnchorBar .sapMBtn:hover:not(.sapMBtnDisabled):not(.sapMSBActive) > .sapMBtnHoverable:not(.sapMBtnDisabled):not(.sapMBtnActive):not(.sapMToggleBtnPressed):not(.sapMBtnTransparent).sapMBtnDefault .sapMBtnContent{
-	color: @sapContent_Selected_TextColor;
+	color: @sapUiContentSelectedTextColor;
 }

package/src/sap/uxap/themes/sap_horizon/HierarchicalSelect.less

@@ -100,8 +100,8 @@ html.sap-desktop .sapUxAPHierarchicalSelect {
 .sapUxAPObjectPageLayout-Std-Phone, html.sap-phone {
 
 	.sapMSlt.sapUxAPHierarchicalSelect.sapMBarChild {
-		height: @sapElement_LineHeight;
-		line-height: @sapElement_LineHeight;
+		height: @sapUiElementLineHeight;
+		line-height: @sapUiElementLineHeight;
 		box-shadow: @sapUiFiori3HSBottomShadow, @sapUiFiori3HSTopShadow;
 		background-color: transparent;
 	}
@@ -154,7 +154,7 @@ html.sap-desktop .sapUxAPHierarchicalSelect {
 .sapUiSizeCompact .sapUxAPObjectPageLayout-Std-Desktop,
 .sapUiSizeCompact .sapUxAPObjectPageLayout-Std-Desktop-XL {
 	.sapUxAPHierarchicalSelect.sapMSltIconOnly {
-		height: @sapElement_LineHeight;
+		height: @sapUiElementLineHeight;
 	}
 }
 

package/src/sap/uxap/themes/sap_horizon/ObjectPageLayout.less

@@ -26,7 +26,7 @@
 .sapUiSizeCompact .sapUxAPObjectPageNavigation,
 .sapUxAPObjectPageNavigation {
 	.sapUxAPObjectChildPage {
-		height: @sapElement_LineHeight;
+		height: @sapUiElementLineHeight;
 	}
 }
 
@@ -64,6 +64,7 @@
 	color: @sapUiPageFooterTextColor;
 	box-shadow: @sapUiShadowLevel1;
 	border: none;
+	border-radius: @sapUiElementBorderCornerRadius;
 }
 
 .title-hover(@backgroundColor) {
@@ -76,12 +77,8 @@
 // Delta Styles for Horizon
 // =====================================
 
-.sapUxAPObjectPageLayout:not(.sapUxAPObjectPageLayoutNoAnchorBar) .sapFDynamicPageHeader.sapFDynamicPageHeaderWithContent {
-    box-shadow: inset 0 -0.0625rem 0 0 @sapObjectHeader_BorderColor;
-}
-
 .sapUxAPObjectPageLayout:not(.sapUxAPObjectPageLayoutNoAnchorBar)>.sapUxAPObjectPageHeaderStickied>.sapFDynamicPageTitle {
-    box-shadow: inset 0 -0.0625rem 0 0 @sapObjectHeader_BorderColor;
+    box-shadow: none;
 }
 
 .sapUxAPObjectPageLayout .sapMList {
@@ -90,8 +87,8 @@
 
 
 .sapUxAPObjectPageLayout-Std-Phone .sapMSltPressed>.sapMSltArrow, html.sap-phone .sapMSltPressed>.sapMSltArrow {
-    border-radius: @sapButton_BorderCornerRadius;
-    background: @sapButton_Active_Background        ;
+    border-radius: @sapUiButtonBorderCornerRadius;
+    background: @sapUiButtonActiveBackground;
 }
 
 // =====================================
@@ -99,7 +96,7 @@
 // =====================================
 
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageContactsImage {
-    color: @sapContent_NonInteractiveIconColor;
+    color: @sapUiContentNonInteractiveIconColor;
 }
 
 // =====================================

package/src/sap/uxap/themes/sap_horizon/ObjectPageSection.less

@@ -57,16 +57,16 @@
     padding-top: 0.5rem;
     padding-left: 0;
     padding-right: 0;
-    background: @sapGroup_ContentBackground;
+    background: @sapUiGroupContentBackground;
     margin-left: 2rem;
     margin-right: 2rem;
-    border-radius: @sapElement_BorderCornerRadius;
+    border-radius: @sapUiElementBorderCornerRadius;
 }
 
 // Page Section Focus - Experimental
 .sapUxAPObjectPageSection:focus {
     outline: none;
-    box-shadow: inset 0px 0px 0px 2px @sapContent_ContrastFocusColor, 0px 0px 0px 2px @sapContent_FocusColor;
+    box-shadow: inset 0px 0px 0px 2px @sapUiContentContrastFocusColor, 0px 0px 0px 2px @sapUiContentFocusColor;
 }
 
 .sapUiSizeCompact .sapUxAPObjectPageSectionTitle {

package/src/sap/uxap/themes/sap_horizon/ObjectPageSubSection.less

@@ -15,11 +15,7 @@
 }
 
 .sapUxAPObjectPageLayout-Std-Desktop .sapUxAPBlockContainer {
-	padding: 1rem 1rem 2rem 1rem;
-}
-
-.sapUxAPObjectPageLayout-Std-Tablet .sapUxAPBlockContainer {
-	padding-bottom: 1rem;
+	padding: 0 1rem;
 }
 
 /* responsive paddings */
@@ -37,9 +33,6 @@
 
 /* compact size */
 .sapUiSizeCompact {
-	.sapUxAPObjectPageLayout-Std-Tablet .sapUxAPBlockContainerr{
-		padding-bottom: 1rem;
-	}
 	.sapUxAPObjectPageSubSectionHeaderTitle {
 		height: 1.125rem;
 		line-height: normal;
@@ -55,7 +48,7 @@
 // Page Sub Section Focus - Experimental
 .sapUxAPObjectPageSubSection:focus {
     outline: none;
-    box-shadow: inset 0px 0px 0px 2px @sapContent_ContrastFocusColor, 0px 0px 0px 2px @sapContent_FocusColor;
+    box-shadow: inset 0px 0px 0px 2px @sapUiContentContrastFocusColor, 0px 0px 0px 2px @sapUiContentFocusColor;
 }
 
 .sapUxAPObjectPageLayout-Std-Phone .sapUxAPObjectPageSubSection .sapUiRespGrid.sapUiRespGridHSpace1 {
@@ -74,11 +67,11 @@
 // =====================================
 .sapUxAPObjectPageLayout-Std-Tablet .sapUxAPBlockContainer,
 .sapUiSizeCompact .sapUxAPObjectPageLayout-Std-Phone .sapUxAPBlockContainer {
-    padding: 0.5rem 0.5rem 0rem 0rem;
+    padding: 0 0.5rem 0rem 0rem;
 }
 
 .sapUiSizeCompact .sapUxAPObjectPageLayout-Std-Desktop .sapUxAPBlockContainer {
-    padding: 0.5rem 0.5rem 0.5rem 0.5rem;
+    padding: 0 0.5rem;
 }
 
 .sapUxAPObjectPageLayout-Std-Desktop .sapUxAPBlockContainer {

package/src/sap/uxap/themes/sap_horizon_dark/AnchorBar.less

@@ -12,7 +12,7 @@ Common compact/cozy
 @sapUiFiori3ABUnderlineTopRadius: 0.125rem;
 
 .sapUxAPAnchorBarFiori3Height {
-	height: @sapElement_LineHeight;
+	height: @sapUiElementLineHeight;
 }
 
 .sapUiSizeCompact .sapUxAPAnchorBar,
@@ -54,7 +54,7 @@ Common compact/cozy
 				font-family: @sapUiFontFamily;
 				font-size: @sapMFontMediumSize;
 				height: 2.5rem;
-				line-height: @sapElement_LineHeight;
+				line-height: @sapUiElementLineHeight;
 			}
 		}
 	}
@@ -106,7 +106,7 @@ html .sapUxAPObjectPageLayout-Std-Desktop .sapUxAPAnchorBar.sapMTB
 	&.sapMMenuBtn .sapMSBActive:not(.sapMBtnDisabled) > .sapMBtnInner .sapMBtnIcon,
 	&.sapMMenuBtn .sapMSBArrow:not(.sapMBtnDisabled) > .sapMBtnInner.sapMBtnActive .sapMBtnIcon,
 	&.sapMMenuBtn.sapMMenuBtnSplit .sapMSBText:not(.sapMBtnDisabled) > .sapMBtnInner.sapMBtnActive .sapMBtnContent {
-		color: @sapContent_Selected_TextColor;
+		color: @sapUiContentSelectedTextColor;
 	}
 
 	&.sapMMenuBtn .sapMSBArrow:not(.sapMBtnDisabled) > .sapMBtnInner.sapMBtnActive {
@@ -131,7 +131,7 @@ html .sapUxAPObjectPageLayout-Std-Desktop .sapUxAPAnchorBar.sapMTB
 
 		.sapMBtnContent,
 		.sapUiIcon {
-			color: @sapContent_Selected_TextColor;
+			color: @sapUiContentSelectedTextColor;
 		}
 
 		&::after {
@@ -149,13 +149,13 @@ html .sapUxAPObjectPageLayout-Std-Desktop .sapUxAPAnchorBar.sapMTB
 			padding: (@sapUiFiori3ABUnderlineOffsetAndHeight / 2) @sapUiFiori3ABUnderlineOffsetAndHeight;
 			border-top-left-radius: @sapUiFiori3ABUnderlineTopRadius;
 			border-top-right-radius: @sapUiFiori3ABUnderlineTopRadius;
-			background-color: @sapContent_Selected_ForegroundColor;
+			background-color: @sapUiContentSelectedForegroundColor;
 		}
 	}
 
 	.sapMBtnDefault .sapMBtnContent {
 		overflow: visible;
-		color: @sapContent_Selected_TextColor;
+		color: @sapUiContentSelectedTextColor;
 
 		&::after {
 			content: "";
@@ -166,7 +166,7 @@ html .sapUxAPObjectPageLayout-Std-Desktop .sapUxAPAnchorBar.sapMTB
 			padding: (@sapUiFiori3ABUnderlineOffsetAndHeight / 2) @sapUiFiori3ABUnderlineOffsetAndHeight;
 			border-top-left-radius: @sapUiFiori3ABUnderlineTopRadius;
 			border-top-right-radius: @sapUiFiori3ABUnderlineTopRadius;
-			background-color: @sapContent_Selected_ForegroundColor;
+			background-color: @sapUiContentSelectedForegroundColor;
 		}
 	}
 }
@@ -303,7 +303,7 @@ html.sap-desktop .sapMBtnBase.sapMBtn.sapUxAPAnchorBarButton:focus::after {
 	right: 0;
 	bottom: 0.25rem;
 	left: 0;
-	border: @sapContent_FocusWidth @sapContent_FocusStyle @sapContent_FocusColor;
+	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
 	border-radius: 0.5rem;
 }
 
@@ -320,5 +320,5 @@ html.sap-desktop .sapUxAPAnchorBarButton .sapMBtn:focus .sapMBtnInner::before {
 .sapUxAPAnchorBar .sapUxAPAnchorBarButton:hover .sapMBtn > .sapMBtnTransparent.sapMBtnHoverable:not(.sapMBtnActive):not(.sapMToggleBtnPressed) bdi,
 .sapUxAPAnchorBar .sapUxAPAnchorBarButton:hover .sapMBtn + .sapMBtn .sapMBtnInner *,
 .sapUxAPAnchorBar .sapMBtn:hover:not(.sapMBtnDisabled):not(.sapMSBActive) > .sapMBtnHoverable:not(.sapMBtnDisabled):not(.sapMBtnActive):not(.sapMToggleBtnPressed):not(.sapMBtnTransparent).sapMBtnDefault .sapMBtnContent{
-	color: @sapContent_Selected_TextColor;
+	color: @sapUiContentSelectedTextColor;
 }

package/src/sap/uxap/themes/sap_horizon_dark/HierarchicalSelect.less

@@ -100,8 +100,8 @@ html.sap-desktop .sapUxAPHierarchicalSelect {
 .sapUxAPObjectPageLayout-Std-Phone, html.sap-phone {
 
 	.sapMSlt.sapUxAPHierarchicalSelect.sapMBarChild {
-		height: @sapElement_LineHeight;
-		line-height: @sapElement_LineHeight;
+		height: @sapUiElementLineHeight;
+		line-height: @sapUiElementLineHeight;
 		box-shadow: @sapUiFiori3HSBottomShadow, @sapUiFiori3HSTopShadow;
 		background-color: transparent;
 	}
@@ -154,7 +154,7 @@ html.sap-desktop .sapUxAPHierarchicalSelect {
 .sapUiSizeCompact .sapUxAPObjectPageLayout-Std-Desktop,
 .sapUiSizeCompact .sapUxAPObjectPageLayout-Std-Desktop-XL {
 	.sapUxAPHierarchicalSelect.sapMSltIconOnly {
-		height: @sapElement_LineHeight;
+		height: @sapUiElementLineHeight;
 	}
 }
 

package/src/sap/uxap/themes/sap_horizon_dark/ObjectPageLayout.less

@@ -26,7 +26,7 @@
 .sapUiSizeCompact .sapUxAPObjectPageNavigation,
 .sapUxAPObjectPageNavigation {
 	.sapUxAPObjectChildPage {
-		height: @sapElement_LineHeight;
+		height: @sapUiElementLineHeight;
 	}
 }
 
@@ -64,6 +64,7 @@
 	color: @sapUiPageFooterTextColor;
 	box-shadow: @sapUiShadowLevel1;
 	border: none;
+	border-radius: @sapUiElementBorderCornerRadius;
 }
 
 .title-hover(@backgroundColor) {
@@ -76,12 +77,8 @@
 // Delta Styles for Horizon
 // =====================================
 
-.sapUxAPObjectPageLayout:not(.sapUxAPObjectPageLayoutNoAnchorBar) .sapFDynamicPageHeader.sapFDynamicPageHeaderWithContent {
-    box-shadow: inset 0 -0.0625rem 0 0 @sapObjectHeader_BorderColor;
-}
-
 .sapUxAPObjectPageLayout:not(.sapUxAPObjectPageLayoutNoAnchorBar)>.sapUxAPObjectPageHeaderStickied>.sapFDynamicPageTitle {
-    box-shadow: inset 0 -0.0625rem 0 0 @sapObjectHeader_BorderColor;
+    box-shadow: none;
 }
 
 .sapUxAPObjectPageLayout .sapMList {
@@ -90,8 +87,8 @@
 
 
 .sapUxAPObjectPageLayout-Std-Phone .sapMSltPressed>.sapMSltArrow, html.sap-phone .sapMSltPressed>.sapMSltArrow {
-    border-radius: @sapButton_BorderCornerRadius;
-    background: @sapButton_Active_Background        ;
+    border-radius: @sapUiButtonBorderCornerRadius;
+    background: @sapUiButtonActiveBackground;
 }
 
 // =====================================
@@ -99,7 +96,7 @@
 // =====================================
 
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageContactsImage {
-    color: @sapContent_NonInteractiveIconColor;
+    color: @sapUiContentNonInteractiveIconColor;
 }
 
 // =====================================

package/src/sap/uxap/themes/sap_horizon_dark/ObjectPageSection.less

@@ -57,16 +57,16 @@
     padding-top: 0.5rem;
     padding-left: 0;
     padding-right: 0;
-    background: @sapGroup_ContentBackground;
+    background: @sapUiGroupContentBackground;
     margin-left: 2rem;
     margin-right: 2rem;
-    border-radius: @sapElement_BorderCornerRadius;
+    border-radius: @sapUiElementBorderCornerRadius;
 }
 
 // Page Section Focus - Experimental
 .sapUxAPObjectPageSection:focus {
     outline: none;
-    box-shadow: inset 0px 0px 0px 2px @sapContent_ContrastFocusColor, 0px 0px 0px 2px @sapContent_FocusColor;
+    box-shadow: inset 0px 0px 0px 2px @sapUiContentContrastFocusColor, 0px 0px 0px 2px @sapUiContentFocusColor;
 }
 
 .sapUiSizeCompact .sapUxAPObjectPageSectionTitle {

package/src/sap/uxap/themes/sap_horizon_dark/ObjectPageSubSection.less

@@ -55,7 +55,7 @@
 // Page Sub Section Focus - Experimental
 .sapUxAPObjectPageSubSection:focus {
     outline: none;
-    box-shadow: inset 0px 0px 0px 2px @sapContent_ContrastFocusColor, 0px 0px 0px 2px @sapContent_FocusColor;
+    box-shadow: inset 0px 0px 0px 2px @sapUiContentContrastFocusColor, 0px 0px 0px 2px @sapUiContentFocusColor;
 }
 
 .sapUxAPObjectPageLayout-Std-Phone .sapUxAPObjectPageSubSection .sapUiRespGrid.sapUiRespGridHSpace1 {

package/src/sap/uxap/themes/sap_horizon_hcb/ObjectPageLayout.less

@@ -26,7 +26,7 @@
 .sapUiSizeCompact .sapUxAPObjectPageNavigation,
 .sapUxAPObjectPageNavigation {
 	.sapUxAPObjectChildPage {
-		height: @sapElement_LineHeight;
+		height: @sapUiElementLineHeight;
 	}
 }
 
@@ -68,6 +68,7 @@
 	color: @sapUiPageFooterTextColor;
 	box-shadow: @sapUiShadowLevel1;
 	border: none;
+	border-radius: @sapUiElementBorderCornerRadius;
 }
 
 .title-hover(@backgroundColor) {

package/src/sap/uxap/themes/sap_horizon_hcw/ObjectPageLayout.less

@@ -26,7 +26,7 @@
 .sapUiSizeCompact .sapUxAPObjectPageNavigation,
 .sapUxAPObjectPageNavigation {
 	.sapUxAPObjectChildPage {
-		height: @sapElement_LineHeight;
+		height: @sapUiElementLineHeight;
 	}
 }
 
@@ -68,6 +68,7 @@
 	color: @sapUiPageFooterTextColor;
 	box-shadow: @sapUiShadowLevel1;
 	border: none;
+	border-radius: @sapUiElementBorderCornerRadius;
 }
 
 .title-hover(@backgroundColor) {

package/src/sap/m/themes/sap_horizon/NotificationListItem.less

@@ -1,27 +0,0 @@
-/* =========================================== */
-/* CSS for control sap.m/NotificationListBase  */
-/* Horizon theme                               */
-/* =========================================== */
-
-.sapMListItems {
-	>.sapMNLI:first-of-type,
-	>.sapMNLI:first-of-type:focus::before {
-		border-top-left-radius: @sapUiElementBorderCornerRadius;
-		border-top-right-radius: @sapUiElementBorderCornerRadius;
-	}
-
-	>.sapMNLI:last-of-type,
-	>.sapMNLI:last-of-type:focus::before {
-		border-bottom-left-radius: @sapUiElementBorderCornerRadius;
-		border-bottom-right-radius: @sapUiElementBorderCornerRadius;
-	}
-}
-
-html.sap-desktop {
-	.sapMNLIB:focus::before {
-		top: 0px;
-		right: 0px;
-		bottom: 0px;
-		left: 0px;
-	}
-}

package/src/sap/m/themes/sap_horizon/ScrollContainer.less

@@ -1,19 +0,0 @@
-/* ====================================== */
-/* CSS for control sap.m/ScrollContainer  */
-/* Horizon theme                          */
-/* ====================================== */
-
-html.sap-desktop:not(.sapUiNativeScrollbars) .sapMScrollContV::-webkit-scrollbar {
-    width: 0.75rem;
-    height: 100%;
-}
-
-html.sap-desktop:not(.sapUiNativeScrollbars) .sapMScrollContH::-webkit-scrollbar {
-    width: 100%;
-    height: 0.75rem;
-}
-
-html.sap-desktop:not(.sapUiNativeScrollbars) .sapMScrollContVH::-webkit-scrollbar {
-    width: 0.75rem;
-    height: 0.75rem;
-}

package/src/sap/m/themes/sap_horizon_dark/NotificationListItem.less

@@ -1,27 +0,0 @@
-/* =========================================== */
-/* CSS for control sap.m/NotificationListBase  */
-/* Evening Horizon theme                       */
-/* =========================================== */
-
-.sapMListItems {
-	>.sapMNLI:first-of-type,
-	>.sapMNLI:first-of-type:focus::before {
-		border-top-left-radius: @sapUiElementBorderCornerRadius;
-		border-top-right-radius: @sapUiElementBorderCornerRadius;
-	}
-
-	>.sapMNLI:last-of-type,
-	>.sapMNLI:last-of-type:focus::before {
-		border-bottom-left-radius: @sapUiElementBorderCornerRadius;
-		border-bottom-right-radius: @sapUiElementBorderCornerRadius;
-	}
-}
-
-html.sap-desktop {
-	.sapMNLIB:focus::before {
-		top: 0px;
-		right: 0px;
-		bottom: 0px;
-		left: 0px;
-	}
-}

package/src/sap/m/themes/sap_horizon_dark/ScrollContainer.less

@@ -1,19 +0,0 @@
-/* ====================================== */
-/* CSS for control sap.m/ScrollContainer  */
-/* Evening Horizon theme                  */
-/* ====================================== */
-
-html.sap-desktop:not(.sapUiNativeScrollbars) .sapMScrollContV::-webkit-scrollbar {
-    width: 0.75rem;
-    height: 100%;
-}
-
-html.sap-desktop:not(.sapUiNativeScrollbars) .sapMScrollContH::-webkit-scrollbar {
-    width: 100%;
-    height: 0.75rem;
-}
-
-html.sap-desktop:not(.sapUiNativeScrollbars) .sapMScrollContVH::-webkit-scrollbar {
-    width: 0.75rem;
-    height: 0.75rem;
-}

package/src/sap/m/themes/sap_horizon_hcb/BrowserScrollbar.less

@@ -1,35 +0,0 @@
-/* ======================================= */
-/* CSS for control sap.m/BrowserScrollbar  */
-/* Horizon High Contrast Black theme       */
-/* ======================================= */
-
-html.sap-desktop ::-webkit-scrollbar {
-	border: 1px solid @sapUiScrollBarBorderColor;
-}
-
-html.sap-desktop ::-webkit-scrollbar-thumb:horizontal {
-	border-left: none;
-	border-top: 1px solid @sapUiScrollBarBorderColor;
-	border-bottom: 1px solid @sapUiScrollBarBorderColor;
-}
-
-html.sap-desktop ::-webkit-scrollbar-thumb:vertical {
-	border-left: 1px solid @sapUiScrollBarBorderColor;
-	border-right: 1px solid @sapUiScrollBarBorderColor;
-}
-
-::-webkit-scrollbar-button:vertical {
-	background-color: @sapUiScrollBarFaceColor;
-	height: 1px;
-}
-
-::-webkit-scrollbar-button:horizontal {
-	background-color: @sapUiScrollBarFaceColor;
-	width: 1px;
-}
-
-::-webkit-scrollbar-corner {
-	background-color: @sapUiHcStandardBackground;
-	border-right: 1px solid @sapUiScrollBarBorderColor;
-	border-bottom: 1px solid @sapUiScrollBarBorderColor;
-}