@openui5/sap.m 1.99.1 → 1.102.0

package/src/sap/m/themes/base/IconTabBar.less

@@ -10,6 +10,12 @@
 @_sap_m_IconTabBar_TextColor: @sapUiGroupTitleTextColor;
 @_sap_m_IconTabBar_TextShadow: @sapUiShadowText;
 @_sap_m_IconTabBar_DisabledOpacity: @sapUiContentDisabledOpacity;
+@_sap_m_IconTabBar_Separator_Icon: @sapUiContentNonInteractiveIconColor;
+@_sap_m_IconTabBar_Separator_Font_Size: 1rem;
+@_sap_m_IconTabBar_More_Button_Font_size: 0.875rem;
+@_sap_m_IconTabBar_More_Button_Focus_Offset: 0.125rem;
+@_sap_m_IconTabBar_Arrow_SubItem_Left_Padding: 0.375rem;
+@_sap_m_IconTabBar_More_Button_Border_Radius: inherit;
 
 // ==================== Cozy size ====================
 
@@ -121,6 +127,7 @@
 @_sap_m_IconTabBar_Overflow_BackgroundColorHover: @sapUiButtonHoverBackground;
 @_sap_m_IconTabBar_Overflow_TextColorHover: @sapUiButtonHoverTextColor;
 @_sap_m_IconTabBar_Overflow_Icon_ColorHover: @sapUiButtonHoverTextColor;
+@_sap_m_IconTabBar_Overflow_BoxShadowHover: none;
 
 @_sap_m_IconTabBar_Overflow_BackgroundColorPressed: @sapUiButtonActiveBackground;
 @_sap_m_IconTabBar_Overflow_BorderColorPressed: @sapUiButtonActiveBorderColor;
@@ -150,6 +157,10 @@
 // ========== Badge ============
 @_sap_m_IconTabBar_FilterExpandButtonBadgeTop: 1.125rem;
 @_sap_m_IconTabBar_Compact_FilterExpandButtonBadgeTop: 1.125rem;
+@_sap_m_IconTabBar_Badge_Neutral_Background: @sapUiNeutralElement;
+@_sap_m_IconTabBar_Badge_Positive_Background: @sapUiPositiveElement;
+@_sap_m_IconTabBar_Badge_Critical_Background: @sapUiCriticalElement;
+@_sap_m_IconTabBar_Badge_Negative_Background: @sapUiNegativeElement;
 
 /* ------------------------------------------------ */
 /* IconTabBar main class                            */
@@ -268,7 +279,7 @@
 
 .sapMITHShowSubItemsIcon {
 	pointer-events: none;
-	padding-left: 0.375rem;
+	padding-left: @_sap_m_IconTabBar_Arrow_SubItem_Left_Padding;
 
 	.sapUiIcon {
 		cursor: pointer;
@@ -506,6 +517,7 @@
 			&:hover {
 				border-color: @_sap_m_IconTabBar_Overflow_BorderColorHover;
 				background-color: @_sap_m_IconTabBar_Overflow_BackgroundColorHover;
+				box-shadow: @_sap_m_IconTabBar_Overflow_BoxShadowHover;
 
 				.sapMITBText {
 					color: @_sap_m_IconTabBar_Overflow_TextColorHover;
@@ -531,7 +543,7 @@
 		}
 
 		.sapMITBText {
-			font-size: 0.875rem;
+			font-size: @_sap_m_IconTabBar_More_Button_Font_size;
 			padding: 0;
 			margin: 0 0.5rem;
 			text-align: left;
@@ -786,11 +798,11 @@
 }
 
 .sapMITBSepIcon {
-	font-size: 1rem;
+	font-size: @_sap_m_IconTabBar_Separator_Font_Size;
 	height: @_sap_m_IconTabBar_SeparatorIconHeight;
 	line-height: @__sap_m_IconTabBar_SeparatorIconLineHeight;
 	padding: 0 0.25rem;
-	color: @sapUiContentNonInteractiveIconColor;
+	color: @_sap_m_IconTabBar_Separator_Icon;
 
 	&::before {
 		text-shadow: @_sap_m_IconTabBar_TextShadow;
@@ -880,11 +892,11 @@ html.sap-desktop {
 			&::after {
 				content: "";
 				position: absolute;
-				top: 0.125rem;
-				bottom: 0.125rem;
-				right: 0.125rem;
-				left: 0.125rem;
-				border-radius: inherit;
+				top: @_sap_m_IconTabBar_More_Button_Focus_Offset;
+				bottom: @_sap_m_IconTabBar_More_Button_Focus_Offset;
+				right: @_sap_m_IconTabBar_More_Button_Focus_Offset;
+				left: @_sap_m_IconTabBar_More_Button_Focus_Offset;
+				border-radius: @_sap_m_IconTabBar_More_Button_Border_Radius;
 				border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
 				pointer-events: none;
 			}
@@ -1214,6 +1226,7 @@ html.sap-desktop {
 			.sapMITBContentArrow {
 				height: @_sap_m_IconTabBar_Compact_ContentArrowHeight;
 				width: 2rem;
+				margin: 0;
 			}
 
 			.sapMITBTab {
@@ -1562,23 +1575,23 @@ html[dir=rtl] {
 	}
 
 	.sapMITHOverflowVisible .sapMITFExpandButtonBadge {
-		top: 0.4375rem;
+		top: 0;
 	}
 
 	.sapMITBFilterNeutral .sapMBadgeAttention {
-		background-color: @sapUiNeutralElement;
+		background-color: @_sap_m_IconTabBar_Badge_Neutral_Background;
 	}
 
 	.sapMITBFilterPositive .sapMBadgeAttention {
-		background-color: @sapUiPositiveElement;
+		background-color: @_sap_m_IconTabBar_Badge_Positive_Background;
 	}
 
 	.sapMITBFilterCritical .sapMBadgeAttention {
-		background-color: @sapUiCriticalElement;
+		background-color: @_sap_m_IconTabBar_Badge_Critical_Background;
 	}
 
 	.sapMITBFilterNegative .sapMBadgeAttention {
-		background-color: @sapUiNegativeElement;
+		background-color: @_sap_m_IconTabBar_Badge_Negative_Background;
 	}
 }
 
@@ -1591,6 +1604,24 @@ html[data-sap-ui-animation='off'] {
 	}
 }
 
+.sapMITH {
+	.sapMITHStartOverflow,
+	.sapMITHEndOverflow {
+
+		.sapMITFExpandButtonBadge {
+			left: 0;
+
+			.sapMBadgeAttention {
+				top: -1px;
+				right: -4px;
+				width: 0.5rem;
+				height: 0.5rem;
+				border-width: 0.125rem;
+			}
+		}
+	}
+}
+
 /* Responsive paddings when the IconTabBar is inside a DynamicPage */
 
 .sapFDynamicPage-Std-Phone {

package/src/sap/m/themes/base/IconTabBarSelectList.less

@@ -6,6 +6,7 @@
 @_sap_m_IconTabBar_SelectListItem_PaddingLeft: 0.5rem;
 @_sap_m_IconTabBar_SelectListItem_PaddingLeftAdditional: 0;
 @_sap_m_IconTabBar_ListBorderRadius: 0px;
+@_sap_m_IconTabBar_List_Focus_Offset: 1px;
 
 .sapMITBSelectList {
 	margin: 0;
@@ -182,10 +183,10 @@
 	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
 	position: absolute;
 	content: " ";
-	top: 1px;
-	right: 1px;
-	bottom: 1px;
-	left: 1px;
+	top: @_sap_m_IconTabBar_List_Focus_Offset;
+	right:  @_sap_m_IconTabBar_List_Focus_Offset;
+	bottom:  @_sap_m_IconTabBar_List_Focus_Offset;
+	left:  @_sap_m_IconTabBar_List_Focus_Offset;
 	z-index: 2;
 	border-radius: @_sap_m_IconTabBar_ListBorderRadius;
 	pointer-events: none;

package/src/sap/m/themes/base/Input.less

@@ -10,7 +10,7 @@
 
 .sapMInputDescriptionText {
 	padding-left: 0.5rem;
-	font-size: @sapMFontMediumSize;
+	font-size: @sapFontSize;
 	line-height: normal;
 	color: @sapUiFieldTextColor;
 	font-family: @sapUiFontFamily;

package/src/sap/m/themes/base/InputBase.less

@@ -15,6 +15,9 @@
 @_sap_m_InputBase_InnerMinWidth_Compact: 2rem;
 @_sap_m_InputBase_Compact_InnerPadding: 0 0.5rem;
 @_sap_m_InputBase_Compact_Height: 1.625rem;
+@_sap_m_InputBase_FocusOffset: 1px;
+@_sap_m_InputBase_FocusBorderRadius: 0;
+
 
 /*MIN-WIDTH variables*/
 /* rounding values to 2 symbols, because of IE and Edge */
@@ -81,8 +84,9 @@
 	font-style: normal;
 	-webkit-appearance: none;
 	-moz-appearance: textfield;
-	font-size: @sapMFontMediumSize;
+	font-size: @sapFontSize;
 	font-family: @sapUiFontFamily;
+	color: @sapUiFieldTextColor;
 	line-height: normal;
 	padding: @_sap_m_InputBase_InnerPadding;
 	height: 100%;
@@ -122,6 +126,36 @@
 	border-radius: 0;
 	vertical-align: middle;
 	margin: 0;
+	background: @sapUiFieldBackgroundStyle;
+	background-color: @sapUiFieldBackground;
+	border: @sapUiFieldBorderWidth @sapUiFieldBorderStyle @sapUiFieldBorderColor;
+	border-radius: @sapUiFieldBorderCornerRadius;
+}
+
+.sapMILI-CTX .sapMInputBaseContentWrapperError,
+.sapMInputBaseContentWrapperError {
+	background: @sapUiFieldInvalidBackgroundStyle;
+	background-color: @sapUiFieldInvalidBackground;
+	border: @sapUiFieldInvalidBorderWidth @sapUiFieldInvalidBorderStyle @sapUiFieldInvalidColor;
+}
+
+.sapMInputBaseContentWrapperWarning {
+	background: @sapUiFieldWarningBackgroundStyle;
+	background-color: @sapUiFieldWarningBackground;
+	border: @sapUiFieldWarningBorderWidth @sapUiFieldWarningBorderStyle @sapUiFieldWarningColor;
+}
+
+.sapMInputBaseContentWrapperSuccess {
+	background: @sapUiFieldSuccessBackgroundStyle;
+	background-color: @sapUiFieldSuccessBackground;
+	border: @sapUiFieldSuccessBorderWidth @sapUiFieldSuccessBorderStyle @sapUiFieldSuccessColor;
+}
+
+.sapMInputBaseContentWrapperInformation {
+	background: @sapUiFieldInformationBackgroundStyle;
+	background-color: @sapUiFieldInformationBackground;
+	border: @sapUiFieldInformationBorderWidth @sapUiFieldInformationBorderStyle @sapUiFieldInformationColor;
+	
 }
 
 .sapMInputBaseIconContainer {
@@ -152,13 +186,18 @@
 	user-select: none;
 }
 
-.sapMFocus {
-	& .sapMInputBaseContentWrapper {
-		outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
-		outline-offset: -3px;
-	}
-	&.sapMInputBaseState .sapMInputBaseContentWrapper:not(.sapMInputBaseContentWrapperSuccess) {
-		outline-offset: -4px;
+.sapMFocus.sapMInputBase .sapMInputBaseContentWrapper:not(.sapMInputBaseDisabledWrapper) {
+	&::before {
+		border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+		border-radius: @_sap_m_InputBase_FocusBorderRadius;
+		content: '';
+		position: absolute;
+		top: @_sap_m_InputBase_FocusOffset;
+		left: @_sap_m_InputBase_FocusOffset;
+		right: @_sap_m_InputBase_FocusOffset;
+		bottom: @_sap_m_InputBase_FocusOffset;
+		z-index: 2;
+		pointer-events: none;
 	}
 }
 
@@ -219,24 +258,88 @@ input.sapMInputBaseInner:invalid {
 
 .sapMInputBaseReadonly .sapMInputBaseContentWrapper {
 	border-color: @sapUiFieldReadOnlyBorderColor;
-	background: @sapUiFieldReadOnlyBackground;
+	background:@sapField_ReadOnly_BackgroundStyle;
+	background-color: @sapUiFieldReadOnlyBackground;
 }
 
 .sapMInputBaseInner:not(.sapMInputBaseReadonlyWrapper):not(.sapMInputBaseContentWrapperState):focus {
 	border-color: @sapUiFieldFocusBorderColor;
 }
 
+.sapMInputBase:not(.sapMFocus) .sapMInputBaseContentWrapper:not(.sapMInputBaseReadonlyWrapper):not(.sapMInputBaseContentWrapperState):not(.sapMInputBaseDisabledWrapper) {
+	&:hover {
+		background: @sapUiFieldHoverBackgroundStyle;
+		background-color: @sapUiFieldHoverBackground;
+		border-color: @sapUiFieldHoverBorderColor;
+		box-shadow: @sapUiContentInteractionShadow;
+	}
+}
+
 .sapMInputBaseContentWrapper:not(.sapMInputBaseReadonlyWrapper):not(.sapMInputBaseContentWrapperState):not(.sapMInputBaseDisabledWrapper) {
 	&:hover {
-		background: @sapUiFieldHoverBackground;
 		border-color: @sapUiFieldHoverBorderColor;
 	}
 	&:active {
-		background: @sapUiFieldHoverBackground;
+		background: @sapUiFieldFocusBackground;
 		border-color: @sapUiFieldHoverBorderColor;
 	}
 }
 
+.sapMInputBase:not(.sapMFocus) .sapMInputBaseContentWrapperState:hover,
+.sapMInputBase:not(.sapMFocus).sapMInputBaseIconPressed .sapMInputBaseContentWrapperState {
+	&.sapMInputBaseContentWrapperWarning:hover,
+	&.sapMInputBaseContentWrapperWarning {
+		box-shadow: @sapUiContentCriticalShadow;
+	}
+
+	&.sapMInputBaseContentWrapperSuccess:hover,
+	&.sapMInputBaseContentWrapperSuccess {
+		box-shadow: @sapUiContentPositiveShadow;
+	}
+
+	&.sapMInputBaseContentWrapperError:hover,
+	&.sapMInputBaseContentWrapperError {
+		box-shadow: @sapUiContentNegativeShadow;
+	}
+
+	&.sapMInputBaseContentWrapperInformation:hover,
+	&.sapMInputBaseContentWrapperInformation {
+		box-shadow: @sapUiContentInformativeShadow;
+	}
+}
+
+.sapMInputBase:not(.sapMInputBaseDisabled) {
+	&.sapMInputBaseIconPressed .sapMInputBaseIcon,
+	.sapMInputBaseIcon:active,
+	.sapMInputBaseIcon:hover  {
+		box-shadow: @sapUiContentInteractionShadow;
+	}
+
+	&.sapMInputBaseIconPressed .sapMInputBaseContentWrapperError .sapMInputBaseIconContainer .sapMInputBaseIcon,
+	.sapMInputBaseContentWrapperError .sapMInputBaseIconContainer .sapMInputBaseIcon:active,
+	.sapMInputBaseContentWrapperError .sapMInputBaseIconContainer .sapMInputBaseIcon:hover {
+		box-shadow: @sapUiContentNegativeShadow;
+	}
+
+	&.sapMInputBaseIconPressed .sapMInputBaseContentWrapperWarning .sapMInputBaseIconContainer .sapMInputBaseIcon,
+	.sapMInputBaseContentWrapperWarning .sapMInputBaseIconContainer .sapMInputBaseIcon:active,
+	.sapMInputBaseContentWrapperWarning .sapMInputBaseIconContainer .sapMInputBaseIcon:hover {
+		box-shadow: @sapUiContentCriticalShadow;
+	}
+
+	&.sapMInputBaseIconPressed .sapMInputBaseContentWrapperSuccess .sapMInputBaseIconContainer .sapMInputBaseIcon,
+	.sapMInputBaseContentWrapperSuccess .sapMInputBaseIconContainer .sapMInputBaseIcon:active,
+	.sapMInputBaseContentWrapperSuccess .sapMInputBaseIconContainer .sapMInputBaseIcon:hover {
+		box-shadow: @sapUiContentPositiveShadow;
+	}
+
+	&.sapMInputBaseIconPressed .sapMInputBaseContentWrapperInformation .sapMInputBaseIconContainer .sapMInputBaseIcon,
+	.sapMInputBaseContentWrapperInformation .sapMInputBaseIconContainer .sapMInputBaseIcon:active,
+	.sapMInputBaseContentWrapperInformation .sapMInputBaseIconContainer .sapMInputBaseIcon:hover {
+		box-shadow: @sapUiContentInformativeShadow;
+	}
+}
+
 /* Compact size */
 
 .sapUiSizeCompact {

package/src/sap/m/themes/base/Label.less

@@ -180,6 +180,9 @@ td.sapUiFormElementLbl:not(.sapUiGridLabelFull) > .sapMLabel{
 			&:lang(zh-TW) {
 				padding-right: 1.59em;
 			}
+			&:lang(zh-CN) {
+				padding-right: 1.59em;
+			}
 
 			.sapMLabelColonAndRequired {
 				position: absolute;
@@ -288,7 +291,7 @@ td.sapUiFormElementLbl:not(.sapUiGridLabelFull) > .sapMLabel{
 
 .sapUiSizeCompact,
 .sapUiSizeCondensed {
-	.sapUiTableCell .sapMLabel {
+	.sapUiTableCell:not(.sapUiTableHeaderDataCell) .sapMLabel {
 		font-weight: normal;
 		font-size: @sapMFontHeader6Size;
 	}

package/src/sap/m/themes/base/LightBox.less

@@ -15,6 +15,8 @@
 @_sap_m_LightBox_OverlayBackground: @sapUiBlockLayerBackground;
 @_sap_m_LightBox_ContainerBackground: @sapUiGlobalBackgroundColor;
 @_sap_m_LightBox_ErrorIconColor: @sapUiContentNonInteractiveIconColor;
+@_sap_m_LightBox_OverlayOpacity: 0.9;
+@_sap_m_LightBox_FontFamily: @sapUiFontFamily;
 
 /* ==========================================================================
    Container
@@ -60,7 +62,7 @@ html[data-sap-ui-browser^='sf'] .sapMLightBox {
   ========================================================================== */
 .sapMLightBox + .sapUiBLy {
 	background: @_sap_m_LightBox_OverlayBackground;
-	opacity: 0.9;
+	opacity: @_sap_m_LightBox_OverlayOpacity;
 }
 
 /* ==========================================================================
@@ -103,7 +105,7 @@ html[data-sap-ui-browser^='sf'] .sapMLightBox {
 	}
 }
 
-.sapMLightBoxSubtitle {
+.sapMLabel.sapMLightBoxSubtitle  {
 	margin-top: @_sap_m_LightBox_SubtitleMarginTop;
 }
 
@@ -124,20 +126,20 @@ html[data-sap-ui-browser^='sf'] .sapMLightBox {
 	padding-right: 0.25rem;
 }
 
-.sapMText.sapMLightBoxTitle {
+.sapMTitle.sapMLightBoxTitle {
   color: @sapUiBaseText;
-  font-family: @sapUiFontFamily;
+  font-family: @_sap_m_LightBox_FontFamily;
   font-size: @sapMFontMediumSize;
 }
 
-.sapMText.sapMLightBoxSubtitle {
+.sapMLabel.sapMLightBoxSubtitle  {
   color: @sapUiContentLabelColor;
   font-family: @sapUiFontFamily;
   font-size: @sapMFontMediumSize;
 }
 
-.sapMText.sapMLightBoxTitle,
-.sapMText.sapMLightBoxSubtitle {
+.sapMTitle.sapMLightBoxTitle,
+.sapMLabel.sapMLightBoxSubtitle {
 	white-space: nowrap;
 	overflow: hidden;
 	text-align: left;

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

@@ -18,17 +18,17 @@
 
 .sapMLnk:active:not(.sapMLnkDsbl),
 .sapMLnk:focus:not(.sapMLnkDsbl) {
-	color: @sapUiLinkActive;
+	color: @sapUiLinkActiveColor;
 }
 .sapMLnk:visited {
-	color: @sapUiLinkVisited;
+	color: @sapUiLinkVisitedColor;
 }
 .sapMLnk:hover:not(.sapMLnkDsbl) {
-	color: @sapUiLinkHover;
+	color: @sapUiLinkHoverColor;
 }
 
 .sapUiInverted-CTX .sapUiLnk {
-	color: @sapUiLinkInverted;
+	color: @sapUiLinkInvertedColor;
 }
 
 .sapMLnk.sapMLnkWrapping {
@@ -113,6 +113,14 @@ html.sap-desktop .sapMLnk:focus:not(.sapMLnkDsbl) {
 	color: @sapUiBaseText;
 }
 
+
+.sapMListTblRow.sapMLIBActive .sapMLnk,
+.sapMListTblSubRow.sapMLIBActive .sapMLnk,
+.sapMLIB.sapMLIBActive .sapMLink {
+	text-decoration: none;
+	text-shadow: none;
+ }
+
 /* Compact size */
 .sapUiSizeCompact .sapUiFormEdit .sapMLnk {
 	margin-top: 0.5rem;

package/src/sap/m/themes/base/ListBase.less

@@ -116,6 +116,10 @@
 	text-align: center;
 }
 
+.sapMListNoDataContent {
+	flex: 1 1 auto;
+}
+
 .sapMListShowSeparatorsAll {
 	/*class will be added for others, just a reminder*/
 }

package/src/sap/m/themes/base/ListItemBase.less

@@ -5,9 +5,6 @@
 
 @_sap_m_ListItemBase_DeleteIcon: sys-cancel;
 @_sap_m_ListItemBase_ButtonMarginTop: auto;
-@_sap_m_ListItemBase_SelectionControlWidth: 3rem;
-@_sap_m_ListItemBase_SelectionControlHeight: 3rem;
-@_sap_m_ListItemBase_compact_SelectionControlHeight: 2rem;
 @_sap_m_ListItemBase_Highlight_InformationColor: @sapUiInformationBorder;
 @_sap_m_ListItemBase_Navigated: @sapUiListSelectionBorderColor;
 @_sap_m_ListItemBase_Detail_Delete_MarginLeft: 0.125rem;
@@ -98,10 +95,7 @@
 
 .sapMLIBSelectS,
 .sapMLIBSelectM {
-	width: @_sap_m_ListItemBase_SelectionControlWidth;
-	height: @_sap_m_ListItemBase_SelectionControlHeight;
-	margin-left: 0;
-	padding-left: 0;
+	margin-right: 0.75rem;
 }
 
 .sapMLIBHighlight + .sapMLIBSelectS,
@@ -333,11 +327,6 @@
 }
 
 /* Compact size */
-.sapUiSizeCompact .sapMLIBSelectS,
-.sapUiSizeCompact .sapMLIBSelectM {
-	height: @_sap_m_ListItemBase_compact_SelectionControlHeight;
-}
-
 .sapUiSizeCompact .sapMLIB > .sapMLIBSelectS:first-child,
 .sapUiSizeCompact .sapMLIB > .sapMLIBSelectM:first-child {
 	margin-left: -0.5rem;

package/src/sap/m/themes/base/MenuButton.less

@@ -28,8 +28,8 @@
 	content: '\e1ef';
 	display: inline-block;
 	font-size: 0.75rem;
-	height: 38px; //ie does not accept rem for height in pseudo elements, but it works with px when you zoom
-	line-height: 38px;
+	height: 2.125rem;
+	line-height: 2.125rem;
 	padding-right: 0.75rem;
 	padding-left: 0.5625rem;
 	color: @sapUiButtonIconColor;
@@ -53,8 +53,8 @@
 	}
 
 	.sapMMenuBtn.sapMMenuBtnRegular .sapMBtnInner::after {
-		height: 24px; //ie does not accept rem for height in pseudo elements, but it works with px when you zoom
-		line-height: 24px;
+		height: 1.5rem;
+		line-height: 1.5rem;
 		padding-right: 0.5rem;
 		padding-left: 0.375rem;
 	}
@@ -138,4 +138,20 @@
 
 .sapMMenuBtn .sapMBtn .sapMBtnInner.sapMBtnText:not(.sapMBtnIconFirst) .sapMBtnContent{
 	width: 100%;
+}
+
+.sapMMenuBtn.sapMMenuBtnRegular .sapMBtnInner.sapMBtnCritical::after {
+	color: @sapUiButtonCriticalTextColor;
+}
+
+.sapMMenuBtn.sapMMenuBtnRegular .sapMBtnInner.sapMBtnNegative::after {
+	color: @sapUiButtonNegativeTextColor;
+}
+
+.sapMMenuBtn.sapMMenuBtnRegular .sapMBtnInner.sapMBtnSuccess::after {
+	color: @sapUiButtonSuccessTextColor;
+}
+
+.sapMMenuBtn.sapMMenuBtnRegular .sapMBtnInner.sapMBtnNeutral::after {
+	color: @sapUiButtonNeutralTextColor;
 }

package/src/sap/m/themes/base/MessageBox.less

@@ -5,11 +5,11 @@
 
 // header shadow - different states
 @_sap_m_MessageBox_HeaderShadow: inset 0 -0.125rem;
-@_sap_m_MessageBox_InformationShadow: @_sap_m_MessageBox_HeaderShadow @sapUiNeutralElement;
-@_sap_m_MessageBox_WarningShadow: @_sap_m_MessageBox_HeaderShadow @sapUiCriticalElement;
-@_sap_m_MessageBox_ErrorShadow: @_sap_m_MessageBox_HeaderShadow @sapUiNegativeElement;
-@_sap_m_MessageBox_SuccessShadow: @_sap_m_MessageBox_HeaderShadow @sapUiPositiveElement;
-@_sap_m_MessageBox_QuestionShadow: @_sap_m_MessageBox_HeaderShadow @_sap_m_MessageBox_HeaderShadow @sapUiNeutralElement;
+@_sap_m_MessageBox_InformationShadow: @_sap_m_MessageBox_HeaderShadow @sapUiInformationBorder;
+@_sap_m_MessageBox_WarningShadow: @_sap_m_MessageBox_HeaderShadow @sapUiWarningBorder;
+@_sap_m_MessageBox_ErrorShadow: @_sap_m_MessageBox_HeaderShadow @sapUiErrorBorder;
+@_sap_m_MessageBox_SuccessShadow: @_sap_m_MessageBox_HeaderShadow @sapUiSuccessBorder;
+@_sap_m_MessageBox_QuestionShadow: @_sap_m_MessageBox_HeaderShadow @sapUiContentHeaderShadow;
 
 .sapMMessageBoxLinkText {
 	margin-top: 1rem;

package/src/sap/m/themes/base/MessageToast.less

@@ -13,12 +13,12 @@
 	text-overflow: ellipsis;
 	overflow: hidden;
 	white-space: pre-line;
-	font-size: @sapMFontMediumSize;
+	font-size: @sapFontSize;
 	font-family: @sapUiFontFamily;
 	font-weight: normal;
 	padding: 1rem;
 	background: @sapUiListBackground;
 	color: @sapUiListTextColor;
-	box-shadow: @sapUiShadowLevel2;
+	box-shadow: @sapUiContentShadow2;
 	border-radius: @sapUiElementBorderCornerRadius;
 }

package/src/sap/m/themes/base/MultiInput.less

@@ -110,7 +110,7 @@
 		line-height: 1rem;
 	}
 
-	.sapMTokenIcon {
+	.sapMToken .sapMTokenIcon {
 		line-height: 1rem;
 	}
 

package/src/sap/m/themes/base/NewsContent.less

@@ -42,16 +42,7 @@
 
 .Stretch{
 	.sapMTileCnt.News .sapMNwC{
-		.sapMNwCCTxt .sapMText {
-			font-size: @sapMFontLargeSize;
-			color: @sapUiText;
-		}
-		.sapMNwCCTxt .sapMFT {
-			font-size: 0.938rem;
-			color: @sapUiText;
-		}
 		.sapMNwCSbh{
-			color: @sapUiText;
 			max-width: none;
 			padding-top: 0.25rem;
 

package/src/sap/m/themes/base/NotificationListBase.less

@@ -6,13 +6,8 @@
 .sapMNLIB {
 	position: relative;
 
-	.sapMIBar.sapMTB .sapMBarChild:only-child,
-	.sapMTB {
-		padding-right: 0;
-	}
-
-	.sapMNLICloseBtn {
-		margin-left: 0.5rem
+	.sapMNLICloseBtn:not(:empty) {
+		margin: 0 0.5rem;
 	}
 }
 
@@ -37,7 +32,7 @@ html.sap-desktop {
 // Priority icons
 
 .sapMNLIBPriority {
-	padding-right: 0.5rem;
+	padding-right: 0.625rem;
 
 	.sapUiIcon {
 		font-size: 1rem;
@@ -69,12 +64,12 @@ html.sap-desktop {
 	}
 }
 
-.sap-phone {
-	.sapMNLIBPriority {
-		padding-right: 0.25rem;
-	}
+.sapMNLIBHiddenButton {
+	display: none;
+}
 
-	.sapMNLIBHiddenButton {
-		display: none;
+.sapUiSizeCompact {
+	.sapMNLIBPriority {
+		padding-right: 0.5rem;
 	}
 }