@openui5/themelib_sap_horizon 1.128.0 → 1.130.0

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

@@ -4,32 +4,34 @@
 /* =========================== */
 
 .sapMLnkDsbl {
-	opacity: @sapUiContentDisabledOpacity;
+	opacity: var(--sapContent_DisabledOpacity);
 	outline: none;
 	cursor: default;
 }
 
 .sapMLIBActive .sapMLnk {
-	color: @sapUiListActiveTextColor;
+	color: var(--sapList_Active_TextColor);
 	text-decoration: underline;
 }
 
 .sapMLnk.sapMLnkSubtle {
-	color: @sapUiLinkSubtleColor;
+	color: var(--sapLink_SubtleColor);
 	text-decoration: underline;
 
 	&:not(.sapMLnkDsbl) {
+
 		&:active {
-			color: @sapUiLinkSubtleColor;
+			color: var(--sapLink_SubtleColor);
 		}
 	}
 }
 
 html.sap-desktop .sapMLnk:not(.sapMLnkDsbl) {
+
 	&:focus {
 		border-radius: 0.125rem;
-		background-color: @sapUiContentFocusColor;
-		color: @sapUiContentContrastTextColor;
+		background-color: var(--sapContent_FocusColor);
+		color: var(--sapContent_ContrastTextColor);
 		text-shadow: none;
 		outline: none;
 
@@ -39,23 +41,24 @@ html.sap-desktop .sapMLnk:not(.sapMLnkDsbl) {
 	}
 
 	&.sapMLnkSubtle {
+
 		&:hover:not(:active):not(:focus) {
-			color: @sapUiLinkSubtleColor;
+			color: var(--sapLink_SubtleColor);
 			text-decoration: none;
 		}
 	}
 }
 
 .sapMLnk:not(.sapMLnkDsbl) {
-	text-shadow: @sapUiContentTextShadow;
+	text-shadow: var(--sapContent_TextShadow);
 }
 
 /* align Link in Form with Label */
 .sapUiFormEdit .sapMLnk {
 	margin-top: 0.875rem; /* don't use padding as this would stretch the focus outline */
-	margin-bottom: 0.625rem; /* for some reason browser adds 4px, display: block would lead to stretched focus outline*/
+	margin-bottom: 0.625rem; /* for some reason browser adds 4px, display: block would lead to stretched focus outline */
 }
 
 .sapMListTblRow.sapMLIBSelected .sapMLnk:not(.sapMLnkDsbl) {
-	text-shadow: @sapUiContentTextShadow;
+	text-shadow: var(--sapContent_TextShadow);
 }

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

@@ -3,7 +3,7 @@
 /* Evening Horizon theme            */
 /* ================================ */
 
-html.sap-desktop .sapMST:active{
+.sapMST:active{
 	background-color: @sapTile_Active_Background;
 	.sapMSTFocusDiv{
 		border: 1px solid @sapTile_Interactive_BorderColor;
@@ -17,8 +17,8 @@ html.sap-desktop .sapMST:active{
 }
 
 /* This part is used to achieve dotted white black interlace border*/
-html.sap-desktop .sapMST:focus .sapMSTFocusDiv:after,
-html.sap-desktop .sapMST:active .sapMSTFocusDiv:after {
+.sapMST:focus .sapMSTFocusDiv:after,
+.sapMST:active .sapMSTFocusDiv:after {
 	content: "";
 	position: absolute;
 	top: 0;
@@ -31,14 +31,14 @@ html.sap-desktop .sapMST:active .sapMSTFocusDiv:after {
 }
 
 /* Bulleted indicator of multiple tiles*/
-.sapMSTBulleted > span {
+.sapMSTBulleted .sapMSTIndicator {
 	border: solid 0.0625rem @sapTile_OverlayForegroundColor;
 	opacity: 0.6;
 	box-shadow : 0 0 0.125rem @sapContent_ShadowColor;
 	margin: 0 0.094rem;
 }
 
-.sapMSTBulleted > span.sapMSTActive {
+.sapMSTBulleted .sapMSTIndicator.sapMSTActive {
 	background: @sapTile_OverlayForegroundColor;
 	box-shadow: 0 0 0.063rem @sapContent_ShadowColor;
 }
@@ -74,19 +74,19 @@ html.sap-desktop .sapMST:active .sapMSTFocusDiv:after {
 	text-shadow: 0px 1px @sapUiButtonEmphasizedTextShadow;
 }
 
-html.sap-desktop .sapMST:focus .sapMSTFocusDiv {
+.sapMST:focus .sapMSTFocusDiv {
 	border-radius: @sapTile_BorderCornerRadius;
 	box-shadow: none;
 	inset: 0;
 }
 
-html.sap-desktop .sapMST:focus .sapMSTFocusDiv:after,
-html.sap-desktop .sapMST:active .sapMSTFocusDiv:after {
+.sapMST:focus .sapMSTFocusDiv:after,
+.sapMST:active .sapMSTFocusDiv:after {
 	border: none;
 	border-radius: @sapElement_BorderCornerRadius;
 }
 
-html.sap-desktop .sapMST:hover {
+.sapMST:hover {
 	box-shadow: @sapContent_Shadow2 !important;
 
 	.sapMGT:hover {
@@ -96,7 +96,7 @@ html.sap-desktop .sapMST:hover {
 
 }
 
-html.sap-desktop .sapMST:active{
+.sapMST:active{
 	.sapMGT{
 		opacity: 0.8;
 	}

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

@@ -277,6 +277,24 @@
 	border-color: @sapUiContentContrastFocusColor;
 }
 
+.sapMSB.sapMSBEmphasized:focus {
+	.sapMSBInner:has(.sapMBtn):has(.sapMBtnActive)::after {
+		border-color: transparent;
+	}
+	.sapMBtnActive.sapMFocusable:not(.sapMBadgeIndicator)::before {
+		content: '';
+		position: absolute;
+		box-sizing: border-box;
+		left: 0.0625rem;
+		top: 0.0625rem;
+		right: 0.0625rem;
+		bottom: 0.0625rem;
+		border: 0.125rem solid var(--sapContent_FocusColor);
+		pointer-events: none;
+		border-radius: 0.375rem;
+	}
+}
+
 .sapMSB .sapMSBText:not(.sapMBtnDisabled) > span.sapMBtnInner.sapMBtnEmphasized.sapMBtnActive {
 	margin-right: 2.25rem;
 }

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

@@ -3,17 +3,18 @@
 /* Evening Horizon theme        */
 /* ============================ */
 
-@_sap_m_Token_TokenPadding: 0.5rem;
-@_sap_m_Token_TokenCompactPadding: 0.25rem;
 @_sap_m_Token_LeftPadding: 0.3125rem;
-@_sap_m_Token_TokenSize: @sapMFontSmallSize + (2 * @_sap_m_Token_TokenPadding) - @_sap_m_Token_LeftPadding;
-@_sap_m_Token_TokenCompactSize: @sapMFontSmallSize  + @_sap_m_Token_TokenCompactPadding;
+@_sap_m_Token_IconWidth: 1.75rem;
+@_sap_m_Token_CompactIconWidth: 1.5rem;
+@_sap_m_Token_DeleteIconHeight: 2.25rem;
+@_sap_m_Token_DeleteIconCompactHeight: 1.625rem;
 
 .sapMToken {
 	padding-left: @_sap_m_Token_LeftPadding;
 	border-radius: 0.375rem;
 	color: @sapTextColor;
 	font-size: @sapFontSize;
+	overflow: visible;
 }
 
 .sapMTokenSelected,
@@ -24,6 +25,13 @@
 	font-family: @sapFontSemiboldDuplexFamily;
 }
 
+.sapMTokenIcon::before {
+	display: inline-block;
+	width: 0.75rem;
+	height: 0.75rem;
+	line-height: 1;
+}
+
 .sapMToken.sapMTokenSelected::before {
 	content: '';
 	position: absolute;
@@ -57,7 +65,7 @@ html.sap-desktop .sapMToken.sapMTokenSelected:not(.sapMTokenReadOnly):hover {
 }
 
 html.sap-desktop .sapMToken:focus {
-	outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiFieldActiveBorderColor;
+	outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
 	border-radius: 0.5rem;
 	outline-offset: 0.0625rem;
 }
@@ -83,7 +91,19 @@ html.sap-desktop .sapUiSizeCondensed .sapMToken:focus {
 	}
 }
 
-.sapUiSizeCompact .sapMToken .sapMTokenIcon {
-	line-height: 1.25rem;
-	padding: 0 0.375rem;
+.sapMTokenIcon {
+	box-sizing: border-box;
+	top: ~"calc((@{_sap_m_Token_TokenHeight} / 2) - (@{_sap_m_Token_DeleteIconHeight} / 2) - @{sapUiButtonBorderWidth})";
+	width: @_sap_m_Token_IconWidth;
+	height: @_sap_m_Token_DeleteIconHeight;
+	display: inline-flex;
+	justify-content: center;
+	align-items: center;
+	right: -@sapUiButtonBorderWidth;
+}
+
+.sapUiSizeCompact .sapMTokenIcon {
+	top: ~"calc((@{_sap_m_Token_TokenCompactHeight} / 2) - (@{_sap_m_Token_DeleteIconCompactHeight} / 2) - @{sapUiButtonBorderWidth})";
+	width: @_sap_m_Token_CompactIconWidth;
+	height: @_sap_m_Token_DeleteIconCompactHeight;
 }

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

@@ -8,6 +8,7 @@
 /* ----------------------------- */
 
 html.sap-desktop .sapMActionSelectPicker .sapMBtn {
+
 	.sapMBtnInner {
 		border-top: 1px solid @sapUiButtonActionSelectBorderColor;
 		border-bottom: 0;
@@ -34,7 +35,7 @@ html.sap-phone .sapMActionSelectPicker .sapUiSimpleFixFlexFlexContent .sapMBtn .
 
 .sapMActionSelectPicker .sapMBtnDefault {
 	background: @sapUiButtonActionSelectBackground;
-	border-color: @sapUiListBorderColor;
+	border-color: var(--sapList_BorderColor);
 
 	/* override the default text-shadow */
 	text-shadow: none;
@@ -42,7 +43,7 @@ html.sap-phone .sapMActionSelectPicker .sapUiSimpleFixFlexFlexContent .sapMBtn .
 
 .sapMActionSelectPicker .sapMBtn,
 .sapMActionSelectPicker .sapMBtn:hover > .sapMBtnHoverable:not(.sapMBtnActive) {
-	border-color: @sapUiListBorderColor;
+	border-color: var(--sapList_BorderColor);
 }
 
 html.sap-desktop .sapMActionSelectPicker .sapMBtn:not(.sapMBtnDisabled) .sapMBtnDefault:not(.sapMBtnActive):hover {
@@ -67,7 +68,7 @@ html.sap-desktop .sapUiSizeCompact.sapMActionSelectPicker .sapMBtnInner {
 	height: 2rem;
 	border-radius: 0;
 	border: 0;
-	border-top: 1px solid @sapUiListBorderColor;
+	border-top: 1px solid var(--sapList_BorderColor);
 
 	.sapMBtnContent {
 		line-height: 2rem;

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

@@ -4,26 +4,26 @@
 /* ================================== */
 
 .sapMActionSheetPopover.sapMPopover {
-	box-shadow: @sapUiContentShadow2;
+	box-shadow: var(--sapContent_Shadow2);
 }
 
 .sapMActionSheetDialog .sapMBar.sapMHeader-CTX > .sapMBarMiddle > .sapMBarPH > .sapMDialogTitle {
-	color: @sapUiPageHeaderTextColor;
-	font-size: @sapMFontHeader5Size;
-	font-family: @sapFontHeaderFamily;
+	color: var(--sapPageHeader_TextColor);
+	font-size: var(--sapFontHeader5Size);
+	font-family: var(--sapFontHeaderFamily);
 }
 
 .sapMDialog.sapMActionSheetDialog {
-	background-color: @sapUiPageHeaderBackground;
-	border-top-left-radius: @sapUiElementBorderCornerRadius;
-	border-top-right-radius: @sapUiElementBorderCornerRadius;
-	box-shadow: @sapUiContentShadow3;
+	background-color: var(--sapPageHeader_Background);
+	border-top-left-radius: var(--sapElement_BorderCornerRadius);
+	border-top-right-radius: var(--sapElement_BorderCornerRadius);
+	box-shadow: var(--sapContent_Shadow3);
 
 	&.sapMDialogPhone .sapMIBar.sapMHeader-CTX {
-		box-shadow: @sapUiContentHeaderShadow;
-		background-color: @sapUiPageHeaderBackground;
-		border-top-left-radius: @sapUiElementBorderCornerRadius;
-		border-top-right-radius: @sapUiElementBorderCornerRadius;
+		box-shadow: var(--sapContent_HeaderShadow);
+		background-color: var(--sapPageHeader_Background);
+		border-top-left-radius: var(--sapElement_BorderCornerRadius);
+		border-top-right-radius: var(--sapElement_BorderCornerRadius);
 	}
 
 	&.sapUiPopupWithPadding:not(.sapUiNoContentPadding) .sapMDialogScrollCont {

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

@@ -13,14 +13,14 @@
 .sapFAvatarImageContain,
 .sapFAvatarIcon,
 .sapFAvatarInitials {
-	border: 0.0625rem solid @sapUiFieldBorderColor;
+	border: 0.0625rem solid var(--sapField_BorderColor);
 }
 
 .sapFAvatarSquare {
-	border-radius: @sapUiElementBorderCornerRadius;
+	border-radius: var(--sapElement_BorderCornerRadius);
 
 	.sapFAvatarImageHolder {
-		border-radius: @sapUiElementBorderCornerRadius;
+		border-radius: var(--sapElement_BorderCornerRadius);
 	}
 }
 
@@ -29,7 +29,7 @@
 }
 
 .sapFAvatar:not(.sapMAvatarPressed):not(.sapMAvatarDisabled):hover {
-	background-color: @sapActiveColor;
+	background-color: var(--sapActiveColor);
 }
 
 .sapFAvatarFocusable:focus {
@@ -37,8 +37,8 @@
 }
 
 .sapFAvatarColorTileIcon {
-	background-color: @sapUiTileBackground;
-	color: @sapUiTileIconColor;
+	background-color: var(--sapTile_Background);
+	color: var(--sapTile_IconColor);
 
 	.sapFAvatarInitialsHolder {
 		color: currentColor;
@@ -46,8 +46,9 @@
 }
 
 .sapFAvatarColorPlaceholder {
-	background-color: @sapUiContentImagePlaceholderBackground;
-	color: @sapUiContentImagePlaceholderForegroundColor;;
+	background-color: var(--sapContent_ImagePlaceholderBackground);
+	color: var(--sapContent_ImagePlaceholderForegroundColor);
+
 	.sapFAvatarInitialsHolder {
 		color: currentColor;
 	}

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/Carousel.less

@@ -9,6 +9,8 @@
 
 @_sap_m_Carousel_BackgroundColor: var(--sapBackgroundColor);
 @_sap_m_Carousel_MinWidth: 15.5rem;
+@_sap_m_Carousel_PageIndicatorBarHeight: 2.75rem;
+@_sap_m_Carousel_BottomArrowsOffset: calc(~'2.75rem + 1px');
 @_sap_m_Carousel_ControlsNoArrowsHeight: 2.75rem;
 @_sap_m_Carousel_NumericIndicatorTextColor: var(--sapPageFooter_TextColor);
 @_sap_m_Carousel_PrevAndNextSize: 2.125rem;

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/ColumnListItem.less

@@ -10,19 +10,19 @@
 /* note: adding border-top to the sibling row is not suitable as the sibling row can be hidden and in such case the selection border is lost */
 .sapMTableTBody:not(.sapMListTblHasPopin) > .sapMLIBSelected,
 .sapMTableTBody.sapMListTblHasPopin > .sapMLIBSelected + .sapMListTblSubRow {
-	box-shadow: inset 0px -0.0625rem @sapUiListSelectionBorderColor;
+	box-shadow: inset 0px -0.0625rem var(--sapList_SelectionBorderColor);
 }
 
 /* selection border indicator was not visible on the last row as the td elements within the last row have a bottom border */
 /* hence applying -0.125rem so that the selection border is visible */
 .sapMTableTBody:not(.sapMListTblHasPopin) > .sapMLIBSelected:last-child,
 .sapMTableTBody.sapMListTblHasPopin > .sapMLIBSelected + .sapMListTblSubRow:last-child {
-	box-shadow: inset 0px -0.125rem @sapUiListSelectionBorderColor;
+	box-shadow: inset 0px -0.125rem var(--sapList_SelectionBorderColor);
 }
 
-// Safari work-around as box-shadow is not supported on the <tr> element,
-// hence adding the selection indicator box-shadow to the <td> element
+/* Safari work-around as box-shadow is not supported on the <tr> element, */
+/* hence adding the selection indicator box-shadow to the <td> element */
 html[data-sap-ui-browser^="sf"] .sapMTableTBody:not(.sapMListTblHasPopin) > .sapMLIBSelected > td,
 html[data-sap-ui-browser^="sf"] .sapMTableTBody.sapMListTblHasPopin > .sapMLIBSelected + .sapMListTblSubRow > td {
-	box-shadow: inset 0px -0.0625rem @sapUiListSelectionBorderColor;
+	box-shadow: inset 0px -0.0625rem var(--sapList_SelectionBorderColor);
 }

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%;
@@ -28,21 +28,23 @@
 }
 
 .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;
@@ -59,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;
@@ -89,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 {