@openui5/themelib_sap_horizon 1.127.1 → 1.129.0

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

@@ -7,7 +7,7 @@
 	text-shadow: none;
 }
 
-.sapMBarLeft{
+.sapMBarLeft {
 	padding-left: 1rem;
 	padding-right: 0.25rem;
 }
@@ -24,25 +24,25 @@
 
 .sapMBar .sapMBarRight.sapMBarContainer > *:first-child,
 .sapMBar .sapMBarLeft.sapMBarContainer > *:first-child,
-.sapMBar .sapMBarMiddle .sapMBarContainer > *:first-child{
+.sapMBar .sapMBarMiddle .sapMBarContainer > *:first-child {
 	margin: 0 0.25rem 0 0;
 }
 
 .sapMBar .sapMBarRight.sapMBarContainer > *:last-child,
 .sapMBar .sapMBarLeft.sapMBarContainer > *:last-child,
-.sapMBar .sapMBarMiddle .sapMBarContainer > *:last-child{
+.sapMBar .sapMBarMiddle .sapMBarContainer > *:last-child {
 	margin: 0 0 0 0.25rem;
 }
 
 .sapMBar .sapMBarRight.sapMBarContainer > *:not(:first-child):not(:last-child),
 .sapMBar .sapMBarLeft.sapMBarContainer > *:not(:first-child):not(:last-child),
-.sapMBar .sapMBarMiddle .sapMBarContainer > *:not(:first-child):not(:last-child){
+.sapMBar .sapMBarMiddle .sapMBarContainer > *:not(:first-child):not(:last-child) {
 	margin: 0 0.5rem;
 }
 
 .sapMBar .sapMBarRight.sapMBarContainer > *:first-child:last-child,
 .sapMBar .sapMBarLeft.sapMBarContainer > *:first-child:last-child,
-.sapMBar .sapMBarMiddle .sapMBarContainer > *:first-child:last-child{
+.sapMBar .sapMBarMiddle .sapMBarContainer > *:first-child:last-child {
 	margin: 0;
 }
 
@@ -51,7 +51,9 @@
 	line-height: 2.75rem;
 }
 
-.sapMBarLeft, .sapMBarRight, .sapMBarPH {
+.sapMBarLeft,
+.sapMBarRight,
+.sapMBarPH {
 	height: 2.75rem;
 	line-height: 2.75rem;
 }
@@ -59,17 +61,17 @@
 /* in Master page the bar should have different color */
 .sapMSplitContainerMaster .sapMIBar .sapMHeader-CTX,
 .sapMSplitContainerMaster .sapMIBar.sapMSubHeader-CTX {
-	background-color: @sapUiGroupContentBackground;
+	background-color: var(--sapGroup_ContentBackground);
 }
 
 /* in Master page the bar should have a different color shadow only if we don't have subHeader (e.g. another bar) */
 .sapMSplitContainerMaster .sapMIBar .sapMHeader-CTX:only-of-type {
-	box-shadow: inset 0 -0.0625rem @sapUiGroupContentBorderColor;
+	box-shadow: inset 0 -0.0625rem var(--sapGroup_ContentBorderColor);
 }
 
 /* in Master page the bar should have a different color shadow */
 .sapMSplitContainerMaster .sapMIBar.sapMSubHeader-CTX {
-	box-shadow: inset 0 -0.0625rem @sapUiGroupContentBorderColor;
+	box-shadow: inset 0 -0.0625rem var(--sapGroup_ContentBorderColor);
 }
 
 /* Bar Title Alignment */
@@ -82,5 +84,5 @@ html[data-sap-ui-browser^="ff"].sap-desktop .sapMBarTitleAlignAuto .sapMBarPH {
 }
 
 .sapMIBar-CTX.sapMFooter-CTX {
-	border-top: 0.0625rem solid @sapUiPageFooterBorderColor;
+	border-top: 0.0625rem solid var(--sapPageFooter_BorderColor);
 }

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

@@ -24,12 +24,11 @@
 		background: transparent;
 		border: none;
 
-		// Default styles
+		/* Default styles */
 		.sapMSltIcon {
 			display: flex;
 			align-items: center;
 			gap: 0.2rem;
-
 			margin-top: 0.1rem;
 
 			&::before,
@@ -38,15 +37,15 @@
 			}
 
 			&::before {
-				content: "••• ";
-				font-family: @sapUiFontLightFamily;
+				content: '••• ';
+				font-family: var(--sapFontLightFamily);
 			}
 
 			&::after {
-				content: "\e1ef";
-				font-family: @sapUiContentIconFontFamily;
+				content: '\e1ef';
+				font-family: var(--sapContent_IconFontFamily);
 				font-size: @sapMFontMediumSize;
-				color: @sapUiLink;
+				color: var(--sapLinkColor);
 				speak: none;
 			}
 		}

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

@@ -5,11 +5,11 @@
 
 /* Background animation element */
 .sapUiLocalBusyIndicatorAnimation > div::before {
-	background: @sapUiContentBusyColor;
+	background: var(--sapContent_BusyColor);
 	animation-duration: 0ms;
 }
 
 /* Shadow animation element */
 .sapUiLocalBusyIndicatorAnimation > div::after {
-	box-shadow: inset 0px 0px 0px 0px @sapUiContentBusyColor;
+	box-shadow: inset 0 0 0 0 var(--sapContent_BusyColor);
 }

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

@@ -3,15 +3,16 @@
 /* Horizon High Contrast Black theme  */
 /* ================================== */
 
-@_sap_m_Button_EmphasizedFocusColor: @sapUiContentFocusColor;
+@_sap_m_Button_EmphasizedFocusColor: var(--sapContent_FocusColor);
 
 .sapMBtn {
 	height: 2.75rem;
 }
 
 .sapMBtnEmphasized {
-	font-weight: @sapUiButtonEmphasizedFontWeight;
+	font-weight: var(--sapButton_Emphasized_FontWeight);
 	border: 0.125rem solid;
+
 	.sapMBtnContent {
 		line-height: 2rem;
 	}
@@ -22,14 +23,15 @@
 /* --------------------- */
 .sapMBtnInner {
 	font-size: @sapMFontMediumSize;
-	height: @sapUiElementHeight;
+	height: var(--sapElement_Height);
 	min-width: 2.25rem;
 	margin: 0;
 	padding: 0;
 	text-align: center;
 	position: relative;
-	border-radius: @sapUiButtonBorderCornerRadius;
+	border-radius: var(--sapButton_BorderCornerRadius);
 	text-shadow: none;
+
 	&.sapMBtnCritical,
 	&.sapMBtnNegative,
 	&.sapMBtnSuccess,
@@ -47,7 +49,7 @@
 	line-height: 2.125rem;
 }
 
-.sapMBtnInner.sapMBtnText .sapMBtnIcon:before {
+.sapMBtnInner.sapMBtnText .sapMBtnIcon::before {
 	width: 1rem;
 	text-align: center;
 	display: inline-block;
@@ -95,23 +97,24 @@
 }
 
 .sapMBtnGhost {
-	color: @sapUiButtonTextColor;
-	border: 0.0625rem solid @sapUiButtonBorderColor;
-	background: @sapUiButtonLiteBackground;
+	color: var(--sapButton_TextColor);
+	border: 0.0625rem solid var(--sapButton_BorderColor);
+	background: var(--sapButton_Lite_Background);
 }
 
 .sapMBtnGhost.sapMBtnHoverable.sapMBtnActive {
-	color: @sapUiButtonActiveTextColor;
-	border-color: @sapUiButtonActiveBorderColor;
-	background: @sapUiButtonActiveBackground;
+	color: var(--sapButton_Active_TextColor);
+	border-color: var(--sapButton_Active_BorderColor);
+	background: var(--sapButton_Active_Background);
 }
 
 .sapMBtn:hover > .sapMBtnGhost.sapMBtnHoverable:not(.sapMBtnActive) {
-	background: @sapUiButtonHoverBackground;
-	border-color: @sapUiButtonHoverBorderColor;
+	background: var(--sapButton_Hover_Background);
+	border-color: var(--sapButton_Hover_BorderColor);
 }
 
 .sapUiSizeCompact {
+
 	.sapMBtnIcon {
 		margin-left: 0;
 		margin-right: 0;
@@ -122,7 +125,7 @@
 		padding-right: 0.4375rem;
 	}
 
-	.sapMBtnBack.sapMBtnIconFirst:not(.sapMBtnText) > .sapMBtnIconLeft:not(:last-child)
+	.sapMBtnBack.sapMBtnIconFirst:not(.sapMBtnText) > .sapMBtnIconLeft:not(:last-child),
 	.sapMBtnIconLeft + .sapMBtnIconRight,
 	.sapMBtnIconLeft + .sapMBtnIconLeft,
 	.sapMBtnInner .sapMBtnIcon :not(img) {
@@ -144,12 +147,12 @@
 /* ---------------------------------------------------------------------*/
 
 html.sap-desktop .sapMBtn:focus > .sapMFocusable {
-	outline:          @sapUiContentFocusWidth dotted @sapUiContentFocusColor;
-	outline-offset:   -0.25rem;
+	outline: var(--sapContent_FocusWidth) dotted var(--sapContent_FocusColor);
+	outline-offset: -0.25rem;
 }
 
 html.sap-desktop .sapMBtn:focus > .sapMBtnActive.sapMFocusable {
-	outline-color:    @sapUiContentContrastFocusColor;
+	outline-color: var(--sapContent_ContrastFocusColor);
 }
 
 html.sap-desktop .sapMBtn:focus > .sapMBtnEmphasized.sapMFocusable,
@@ -157,15 +160,15 @@ html.sap-desktop .sapMBtn:focus > .sapMBtnCritical.sapMFocusable,
 html.sap-desktop .sapMBtn:focus > .sapMBtnNegative.sapMFocusable,
 html.sap-desktop .sapMBtn:focus > .sapMBtnSuccess.sapMFocusable,
 html.sap-desktop .sapMBtn:focus > .sapMBtnNeutral.sapMFocusable {
-	outline-color:     @sapUiContentContrastFocusColor;
+	outline-color: var(--sapContent_ContrastFocusColor);
 }
 
 html.sap-desktop .sapMBtn:focus > .sapMBtnActive.sapMBtnEmphasized.sapMFocusable {
-	outline-color:    @sapUiContentContrastFocusColor;
+	outline-color: var(--sapContent_ContrastFocusColor);
 }
 
 .sapMTB-Transparent-CTX .sapMBtnInner:not(.sapMToggleBtnPressed):not(.sapMBtnEmphasized):not(.sapMBtnAccept):not(.sapMBtnAttention):not(.sapMBtnReject):not(.sapMBtnActive):not(.sapMBtnGhost) {
-	border-color: @sapUiButtonLiteBorderColor;
+	border-color: var(--sapButton_Lite_BorderColor);
 }
 
 /* ---------------------------------------------------------------------*/
@@ -173,7 +176,7 @@ html.sap-desktop .sapMBtn:focus > .sapMBtnActive.sapMBtnEmphasized.sapMFocusable
 /* ---------------------------------------------------------------------*/
 
 .sapMBtnDisabled {
-	opacity: @sapUiContentDisabledOpacity;
+	opacity: var(--sapContent_DisabledOpacity);
 }
 
 /* ------------------------------------------------ */
@@ -182,65 +185,68 @@ html.sap-desktop .sapMBtn:focus > .sapMBtnActive.sapMBtnEmphasized.sapMFocusable
 /* ------------------------------------------------ */
 
 .sapUiSizeCompact .sapMBar-CTX .sapMBtnInner.sapMBtnGhost:not(.sapMBtnDisabled) {
-	background: @sapUiButtonLiteBackground;
-	border: 0.0625rem solid @sapUiButtonBorderColor;
+	background: var(--sapButton_Lite_Background);
+	border: 0.0625rem solid var(--sapButton_BorderColor);
 }
 
 .sapMIBar-CTX .sapMBtn:hover > .sapMBtnGhost.sapMBtnHoverable:not(.sapMBtnActive):not(.sapMToggleBtnPressed) {
-	background: @sapUiButtonHoverBackground;
-	border-color: @sapUiButtonHoverBorderColor;
+	background: var(--sapButton_Hover_Background);
+	border-color: var(--sapButton_Hover_BorderColor);
 }
 
 html.sap-desktop .sapMFooter-CTX .sapMBtnInner.sapMBtnAccept {
-	border-color: @sapUiButtonAcceptBorderColor;
+	border-color: var(--sapButton_Accept_BorderColor);
 }
 
 html.sap-desktop .sapMFooter-CTX .sapMBtnInner.sapMBtnAttention {
-	border-color: @sapUiButtonAttentionBorderColor;
+	border-color: var(--sapButton_Attention_BorderColor);
 }
 
 html.sap-desktop .sapMFooter-CTX .sapMBtnInner.sapMBtnReject {
-	border-color: @sapUiButtonRejectBorderColor;
+	border-color: var(--sapButton_Reject_BorderColor);
 }
 
 .sapMBar-CTX,
 .sapMTB-Transparent-CTX {
+
 	& :not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnTransparent.sapMBtnActive {
+
 		& > .sapMBtnContent,
 		& > .sapMBtnIcon {
-			color: @sapUiButtonActiveTextColor;
+			color: var(--sapButton_Active_TextColor);
 		}
 	}
 }
 
 .sap-desktop .sapMIBar-CTX, .sap-desktop .sapMTB-Transparent-CTX {
+
 	.sapMBtn:not(.sapMBtnDisabled):hover > .sapMBtnInner:not(.sapMToggleBtnPressed):not(.sapMBtnEmphasized):not(.sapMBtnAccept):not(.sapMBtnReject):not(.sapMBtnActive):not(.sapMBtnGhost):not(.sapMBtnCritical):not(.sapMBtnNegative):not(.sapMBtnNeutral):not(.sapMBtnSuccess) {
-		border-color: @sapUiButtonHoverBorderColor;
+		border-color: var(--sapButton_Hover_BorderColor);
 	}
 }
 
 .sapMTB-Transparent-CTX .sapMBtn:not(.sapMBtnDisabled) > .sapMBtnDefault.sapMBtnActive {
-	background-color: @sapUiButtonActiveBackground;
+	background-color: var(--sapButton_Active_Background);
 }
 
 :not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnIconFirst.sapMBtnTransparent.sapMBtnActive,
 :not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnIconLast.sapMBtnTransparent.sapMBtnActive {
-	background-color: @sapUiButtonLiteActiveBackground;
-	border-color: @sapUiButtonLiteActiveBorderColor;
+	background-color: var(--sapButton_Lite_Active_Background);
+	border-color: var(--sapButton_Lite_Active_BorderColor);
 }
 
 /* ----------------------*/
 /* Badges                */
 /* ----------------------*/
 
-.sapMBtn .sapMBadge .sapMBadgeIndicator:after {
-	background-color: @sapContent_BadgeBackground;
-	border-color: @sapGroup_ContentBorderColor;
-	color: @sapContent_BadgeTextColor;
-	font-size: @sapFontSmallSize;
+.sapMBtn .sapMBadge .sapMBadgeIndicator::after {
+	background-color: var(--sapContent_BadgeBackground);
+	border-color: var(--sapGroup_ContentBorderColor);
+	color: var(--sapContent_BadgeTextColor);
+	font-size: var(--sapFontSmallSize);
 	text-align: center;
 }
 
 .sapUiSizeCompact .sapMBar-CTX .sapMBtnDefault.sapMBtnInner:not(.sapMBtnDisabled) {
-	border-color: @sapUiButtonSelectedBorderColor;
+	border-color: var(--sapButton_Selected_BorderColor);
 }

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

@@ -3,14 +3,14 @@
 /* Horizon High Contrast Black theme  */
 /* ================================== */
 
-// ==========================================================================
-// Variables overriding
-// ==========================================================================
+/* ========================================================================== */
+/* Variables overriding */
+/* ========================================================================== */
 
-@_sap_m_Carousel_BackgroundColor: @sapUiBaseBG;
+@_sap_m_Carousel_BackgroundColor: var(--sapBackgroundColor);
 @_sap_m_Carousel_MinWidth: 15.5rem;
 @_sap_m_Carousel_ControlsNoArrowsHeight: 2.75rem;
-@_sap_m_Carousel_NumericIndicatorTextColor: @sapUiPageFooterTextColor;
+@_sap_m_Carousel_NumericIndicatorTextColor: var(--sapPageFooter_TextColor);
 @_sap_m_Carousel_PrevAndNextSize: 2.125rem;
 @_sap_m_Carousel_PrevAndNextPosition: 0.5rem;
 @_sap_m_Carousel_PageIndicatorWidthSizeS: 9rem;
@@ -18,12 +18,12 @@
 @_sap_m_Carousel_PageIndicatorWidthSizeL: @_sap_m_Carousel_PageIndicatorWidthSizeS;
 @_sap_m_Carousel_PageIndicatorWidthSizeXL: @_sap_m_Carousel_PageIndicatorWidthSizeS;
 @_sap_m_Carousel_PageIndicatorContainerPadding: 0.5rem;
-@_sap_m_Carousel_ContentArrowBoxShadow: @sapUiContentShadow1;
+@_sap_m_Carousel_ContentArrowBoxShadow: var(--sapContent_Shadow1);
 @_sap_m_Carousel_BulletInactiveBackground: transparent;
-@_sap_m_Carousel_BulletInactiveBorderColor: @sapUiContentForegroundBorderColor;
-@_sap_m_Carousel_BulletActiveBackground: @sapUiContentSelectedForegroundColor;
-@_sap_m_Carousel_BulletActiveBorder: @sapUiContentSelectedForegroundColor;
+@_sap_m_Carousel_BulletInactiveBorderColor: var(--sapContent_ForegroundBorderColor);
+@_sap_m_Carousel_BulletActiveBackground: var(--sapContent_Selected_ForegroundColor);
+@_sap_m_Carousel_BulletActiveBorder: var(--sapContent_Selected_ForegroundColor);
 @_sap_m_Carousel_BulletInactiveWidth: 0.375rem;
 @_sap_m_Carousel_BulletInactiveMargin: 0 0.25rem;
 @_sap_m_Carousel_FocusBorderOffsetArrow: -0.3125rem;
-@_sap_m_Carousel_ContrastFocusBorder: @sapUiContentFocusWidth solid @sapUiBaseBG;
+@_sap_m_Carousel_ContrastFocusBorder: var(--sapContent_FocusWidth) solid var(--sapBackgroundColor);

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

@@ -17,61 +17,71 @@ html:not(.sap-phone) .sapMColorPalette .sapMColorPaletteSquare {
 }
 
 html:not(.sap-phone) .sapMColorPalette .sapMColorPaletteSquare {
-	&:focus:before {
-		content: "";
+
+	&:focus::before {
+		content: '';
 		box-sizing: border-box;
 		position: absolute;
 		left: 0.125rem;
 		top: 0.125rem;
 		right: 0.125rem;
 		bottom: 0.125rem;
-		border: 0.125rem solid @sapUiButtonLiteBackground;
+		border: 0.125rem solid var(--sapButton_Lite_Background);
 		pointer-events: none;
 	}
+
 	&:hover,
 	&.sapMColorPaletteSquareSelected {
 		border: 0;
+
 		> div {
-			border: 0.125rem solid @sapUiContentForegroundBorderColor;
+			border: 0.125rem solid var(--sapContent_ForegroundBorderColor);
 		}
 	}
-	&:focus:after {
-		content: "";
+
+	&:focus::after {
+		content: '';
 		position: absolute;
 		box-sizing: border-box;
 		left: 0.125rem;
 		top: 0.125rem;
 		right: 0.125rem;
 		bottom: 0.125rem;
-		border: 0.125rem dotted @sapUiContentContrastFocusColor;
+		border: 0.125rem dotted var(--sapContent_ContrastFocusColor);
 		pointer-events: none;
 	}
 }
+
 .sap-desktop .sapMColorPalette .sapMBtn:focus {
-	&:after {
+
+	&::after {
 		border-width: 0.125rem;
-		border-color: @sapUiContentFocusColor;
+		border-color: var(--sapContent_FocusColor);
 	}
 }
-html:not(.sap-phone) .sapMColorPalette
-.sap-desktop .sapContrast,
+
+html:not(.sap-phone) .sapMColorPalette .sap-desktop .sapContrast,
 .sap-desktop.sapContrast {
+
 	.sapMColorPalette .sapMBtn {
-		&:focus:after {
-			border-color: @sapUiContentFocusColor;
+
+		&:focus::after {
+			border-color: var(--sapContent_FocusColor);
 
 		}
+
 		&:active,
 		> .sapMBtnActive,
 		&:hover > .sapMBtnActive,
 		&:active > .sapMBtnActive {
-			color: @sapUiListTextColor;
+			color: var(--sapList_TextColor);
 		}
 	}
 }
 
 .sap-phone .sapMColorPaletteSquare {
+
 	&:active > div {
-		box-shadow: inset 0 0 0 0.125rem @sapUiContentForegroundBorderColor;
+		box-shadow: inset 0 0 0 0.125rem var(--sapContent_ForegroundBorderColor);
 	}
 }

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

@@ -4,26 +4,26 @@
 /* =================================== */
 
 .sapMInputBaseIconPressed .sapMComboBoxBaseClearIcon {
-	color: @sapUiContentIconColor;
+	color: var(--sapContent_IconColor);
 	background: transparent;
 	border-left-color: transparent;
 
 	&:hover {
-		background: @sapUiButtonLiteHoverBackground;
-		border-left-color: @sapUiButtonSelectedBorderColor;
+		background: var(--sapButton_Lite_Hover_Background);
+		border-left-color: var(--sapButton_Selected_BorderColor);
 	}
 
 	&:active {
-		background-color: @sapUiButtonLiteActiveBackground;
-		color: @sapUiButtonActiveTextColor;
-		border-left-color: @sapUiButtonSelectedBorderColor;
+		background-color: var(--sapButton_Lite_Active_Background);
+		color: var(--sapButton_Active_TextColor);
+		border-left-color: var(--sapButton_Selected_BorderColor);
 
 		&::before {
-			color: @sapUiButtonActiveTextColor;
+			color: var(--sapButton_Active_TextColor);
 		}
 	}
 }
 
 .sapMInputBaseIconPressed .sapMComboBoxBaseClearIcon::before {
-	color: @sapUiContentIconColor;
+	color: var(--sapContent_IconColor);
 }

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

@@ -3,15 +3,15 @@
 /* Horizon High Contrast Black theme  */
 /* ================================== */
 
-// ==========================================================================
-// Variables
-// ==========================================================================
+/* ========================================================================== */
+/* Variables */
+/* ========================================================================== */
 
 @_sap_m_Dialog_VerticalMargin: 3%;
 @_sap_m_Dialog_BarHeight: 2.75rem;
 @_sap_m_Dialog_SubHeaderCompactHeight: 2.25rem;
 
-@_sap_m_Dialog_NoStateHeaderShadow: @sapUiContentHeaderShadow;
+@_sap_m_Dialog_NoStateHeaderShadow: var(--sapContent_HeaderShadow);
 
 .sapMDialogSubHeader .sapMIBar {
 	height: 100%;
@@ -23,36 +23,28 @@
 	font-size: 1rem;
 }
 
-.sapMDialogResizeHandler {
-	right: 6px;
-	bottom: 3px;
-
-	&::before {
-		content: attr(data-sap-ui-icon-content);
-		color: @sapUiButtonLiteTextColor;
-	}
-}
-
 .sapMDialogBeginButton, .sapMDialogEndButton {
 	min-width: 4rem;
 }
 
 .sapMDialogTitleGroup {
-	z-index: 3; // to hide the shadow from the header when there is sub-header
+	z-index: 3; /* to hide the shadow from the header when there is sub-header */
 }
 
-// buttons on phone must be to the right side (in LTR mode)
+/* buttons on phone must be to the right side (in LTR mode) */
 html.sap-phone .sapMDialog {
+
 	& > footer .sapMFooter-CTX {
 		justify-content: flex-end;
 	}
 }
 
-// ==========================================================================
-// header, sub-header, footer
-// ==========================================================================
+/* ========================================================================== */
+/* header, sub-header, footer */
+/* ========================================================================== */
 
 .sapMDialog {
+
 	header .sapMBarLeft,
 	header .sapMBarPH {
 		padding-left: 1rem;
@@ -69,11 +61,17 @@ html.sap-phone .sapMDialog {
 	}
 }
 
-// Responsive paddings
-.sapMDialogTitleGroup, .sapMDialogSubHeader {
-	.sapUi-Std-PaddingS, .sapUi-Std-PaddingM,
-	.sapUi-Std-PaddingL, .sapUi-Std-PaddingXL {
+/* Responsive paddings */
+.sapMDialogTitleGroup,
+.sapMDialogSubHeader {
+
+	.sapUi-Std-PaddingS,
+	.sapUi-Std-PaddingM,
+	.sapUi-Std-PaddingL,
+	.sapUi-Std-PaddingXL {
+
 		&.sapMIBar {
+
 			.sapMBarMiddle .sapMBarPH {
 				padding-left: 0;
 				padding-right: 0;
@@ -99,6 +97,7 @@ html.sap-phone .sapMDialog {
 }
 
 .sapMDialog:not(.sapUiResponsiveContentPadding):not(.sapUiContentPadding) {
+
 	&.sapMDialog-NoHeader .sapMDialogScroll {
 		padding-top: 0.25rem;
 

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

@@ -4,7 +4,7 @@
 /* ======================================= */
 
 .sapUiIcon.sapMDDRDateOption {
-	color: @sapUiButtonActiveTextColor;
+	color: var(--sapButton_Active_TextColor);
 }
 
 .sapMDynamicDateRangePopover section > .sapMLabel {

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

@@ -108,7 +108,7 @@
 	}
 }
 
-.sap-desktop.sapUiMedia-GenericTileDeviceSet-large .sapMGT.sapMGTLineMode {
+.sapUiMedia-GenericTileDeviceSet-large .sapMGT.sapMGTLineMode {
 
 	&:not(.sapMGTDisabled):not(.sapMGTFailed):hover .sapMGTLineStyleHelperInner {
 		box-shadow: 0 0 0 0.1875rem @sapUiContentShadowColor;
@@ -136,11 +136,6 @@
 	color: @sapUiTileTextColor;
 }
 
-html.sap-desktop .sapFGridContainer .sapFGridContainerItemWrapperNoVisualFocus:focus .sapMGTFocusDiv, // focus inside GridContainer
-html.sap-desktop .sapMGT:focus .sapMGTFocusDiv,
-html.sap-desktop .sapMGT:active .sapMGTFocusDiv {
-	border: 0.125rem dotted @sapUiContentFocusColor;
-}
 
 .sapMGTOverlay {
 	opacity: 1;
@@ -157,7 +152,7 @@ html.sap-desktop .sapMGT:active .sapMGTFocusDiv {
 	box-shadow: none;
 }
 
-html.sap-desktop .sapMGT:not(.sapMGTStateDisabled):hover,
+.sapMGT:not(.sapMGTStateDisabled):hover,
 html.sap-phone .sapMGTHvrOutln:not(.sapMGTStateDisabled):active,
 html.sap-tablet .sapMGTHvrOutln:not(.sapMGTStateDisabled):active,
 html.sap-phone .sapMGTBackgroundHvrOutln:not(.sapMGTStateDisabled):active,
@@ -165,8 +160,8 @@ html.sap-tablet .sapMGTBackgroundHvrOutln:not(.sapMGTStateDisabled):active {
 	box-shadow: 0 0 0 0.125rem @sapUiContentShadowColor;
 }
 
-html.sap-desktop .sapMGT:not(.sapMGTStateDisabled,.sapMGTLineMode,.TwoByHalf.sapMGTIconMode):hover,
-html.sap-desktop .sapMGT:not(.sapMGTStateDisabled,.sapMGTLineMode,.TwoByHalf.sapMGTIconMode):active {
+.sapMGT:not(.sapMGTStateDisabled,.sapMGTLineMode,.TwoByHalf.sapMGTIconMode):hover,
+.sapMGT:not(.sapMGTStateDisabled,.sapMGTLineMode,.TwoByHalf.sapMGTIconMode):active {
 	box-shadow: none;
 	border-color: transparent !important;
 	.sapMGTFocusDiv{
@@ -182,7 +177,7 @@ html.sap-desktop .sapMGT:not(.sapMGTStateDisabled,.sapMGTLineMode,.TwoByHalf.sap
 	}
 }
 
-html.sap-desktop .sapMGT.sapMGTLineMode:hover{
+.sapMGT.sapMGTLineMode:hover{
 	box-shadow: none !important;
 	border: none !important;
 	.sapMGTFocusDiv {

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

@@ -20,11 +20,6 @@
     border: 2px solid transparent;
 }
 
-html.sap-desktop .sapMHrdrCntrInner:focus {
-    outline: none;
-    border: 2px dotted @sapUiContentFocusColor;
-}
-
 .sapMHdrCntrBtnIcon{
 	color: @sapContent_NonInteractiveIconColor;
 }