@openui5/sap.m 1.120.6 → 1.121.0

package/src/sap/m/table/Util.js

@@ -5,15 +5,17 @@
  */
 
 sap.ui.define([
+	"sap/base/i18n/Localization",
 	"sap/m/library",
-	"sap/ui/core/Core",
+	"sap/ui/core/Lib",
+	"sap/ui/core/Locale",
 	"sap/ui/core/LocaleData",
 	"sap/ui/core/Theming",
 	"sap/ui/core/theming/Parameters",
 	"sap/m/IllustratedMessage",
 	"sap/m/Button",
 	"sap/ui/core/InvisibleMessage"
-], function(MLibrary, Core, LocaleData, Theming, ThemeParameters, IllustratedMessage, Button, InvisibleMessage) {
+], function(Localization, MLibrary, Library, Locale, LocaleData, Theming, ThemeParameters, IllustratedMessage, Button, InvisibleMessage) {
 	"use strict";
 	/*global Intl*/
 
@@ -21,9 +23,9 @@ sap.ui.define([
 	 * Provides utility functions for tables.
 	 *
 	 * @namespace
-	 * @alias module:sap/m/table/Util
+	 * @alias sap.m.table.Util
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.96.0
 	 * @private
 	 * @ui5-restricted sap.fe, sap.ui.mdc, sap.ui.comp
@@ -76,7 +78,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Util.calcTypeWidth = (function() {
-		const oTimezones = LocaleData.getInstance(Core.getConfiguration().getLocale()).getTimezoneTranslations();
+		const oTimezones = LocaleData.getInstance(new Locale(Localization.getLanguageTag())).getTimezoneTranslations();
 		let sLongestTimezone;
 		var fBooleanWidth = 0;
 		var aDateParameters = [2023, 9, 26, 22, 47, 58, 999];
@@ -105,7 +107,7 @@ sap.ui.define([
 
 			if (sType == "Boolean") {
 				if (!fBooleanWidth) {
-					var oResourceBundle = Core.getLibraryResourceBundle("sap.ui.core");
+					var oResourceBundle = Library.getResourceBundleFor("sap.ui.core");
 					var fYesWidth = Util.measureText(oResourceBundle.getText("YES"));
 					var fNoWidth = Util.measureText(oResourceBundle.getText("NO"));
 					fBooleanWidth = Math.max(fYesWidth, fNoWidth);
@@ -220,13 +222,9 @@ sap.ui.define([
 				return fHeaderWidth + fRequired;
 			}
 
-			fContentWidth = Math.max(fContentWidth, iMinWidth);
-			if (fContentWidth > iHeaderLength) {
-				return fContentWidth;
-			}
-
 			var fOrigHeaderWidth = Util.measureText(sHeader, fnGetHeaderFont());
 			fOrigHeaderWidth = Math.min(fOrigHeaderWidth, iMaxWidth * 0.7);
+			fContentWidth = Math.max(fContentWidth, iMinWidth);
 
 			var fContentHeaderRatio = Math.max(1, 1 - (Math.log(Math.max(fContentWidth - 1.7, 0.2)) / Math.log(iMaxWidth * 0.5)) + 1);
 			var fMaxHeaderWidth = fContentHeaderRatio * fContentWidth;
@@ -248,7 +246,7 @@ sap.ui.define([
 	 * @param {int} [mSettings.padding=1.0625] The sum of column padding(1rem) and border(1px) in rem
 	 * @param {float} [mSettings.gap=0] The additional content width in rem
 	 * @param {boolean} [mSettings.headerGap=false] Whether icons in the header should be taken into account
-	 * @param {boolean} [mSettings.truncateLabel=true] Whether the header of the column can be truncated or not
+	 * @param {boolean} [mSettings.truncateLabel=true] Whether the header of the column can be truncated in the boundaries of <code>minWidth</code> and <code>maxWidth</code>
 	 * @param {boolean} [mSettings.verticalArrangement=false] Whether the fields are arranged vertically
 	 * @param {boolean} [mSettings.required=false] Indicates the state of the column header as defined by the <code>required</code> property
 	 * @param {int} [mSettings.defaultWidth=8] The default column content width when type check fails
@@ -314,7 +312,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Util.getNoColumnsIllustratedMessage = function(fnAddColumn) {
-		var oResourceBundle = Core.getLibraryResourceBundle("sap.m");
+		var oResourceBundle = Library.getResourceBundleFor("sap.m");
 
 		var oIllustratedMessage = new IllustratedMessage({
 			illustrationType: MLibrary.IllustratedMessageType.AddColumn,
@@ -345,32 +343,28 @@ sap.ui.define([
 			return pGetSelectAllPopover;
 		}
 
-		pGetSelectAllPopover = Promise.all(
-			[new Promise(function(fnResolve) {
-				sap.ui.require([
-					"sap/m/Popover",
-					"sap/m/Bar",
-					"sap/m/HBox",
-					"sap/m/Title",
-					"sap/ui/core/Icon",
-					"sap/ui/core/library",
-					"sap/m/Text"
-				], function(Popover, Bar, HBox, Title, Icon, coreLib, Text) {
-					fnResolve({
-						Popover: Popover,
-						Bar: Bar,
-						HBox: HBox,
-						Title: Title,
-						Icon: Icon,
-						coreLib: coreLib,
-						Text: Text
-					});
+		pGetSelectAllPopover = (new Promise(function(fnResolve) {
+			sap.ui.require([
+				"sap/m/Popover",
+				"sap/m/Bar",
+				"sap/m/HBox",
+				"sap/m/Title",
+				"sap/ui/core/Icon",
+				"sap/ui/core/library",
+				"sap/m/Text"
+			], function(Popover, Bar, HBox, Title, Icon, coreLib, Text) {
+				fnResolve({
+					Popover: Popover,
+					Bar: Bar,
+					HBox: HBox,
+					Title: Title,
+					Icon: Icon,
+					coreLib: coreLib,
+					Text: Text
 				});
-			}),
-			Core.getLibraryResourceBundle('sap.m', true)
-		]).then(function(aResult) {
-			var oModules = aResult[0];
-			var oResourceBundle = aResult[1];
+			});
+		})).then(function(oModules) {
+			var oResourceBundle = Library.getResourceBundleFor("sap.m");
 			var sIconColor = oModules.coreLib.IconColor.Critical,
 			sTitleLevel = oModules.coreLib.TitleLevel.H2;
 
@@ -445,7 +439,7 @@ sap.ui.define([
 		var oInvisibleMessage = InvisibleMessage.getInstance();
 
 		if (oInvisibleMessage) {
-			var oResourceBundle = Core.getLibraryResourceBundle("sap.m");
+			var oResourceBundle = Library.getResourceBundleFor("sap.m");
 
 			if (iRowCount == undefined) {
 				oInvisibleMessage.announce(oResourceBundle.getText("table.ANNOUNCEMENT_TABLE_UPDATED", [sText]));
@@ -484,6 +478,39 @@ sap.ui.define([
 		return iRowCount <= 0;
 	};
 
-	return Util;
+	/**
+	 * Checks whether the binding supports exporting the table data.
+	 * This can be used to define the enabled property of the export
+	 * button.
+	 *
+	 * @param {sap.ui.model.Binding} oBinding The row binding
+	 * @returns {boolean} Whether the binding can be used for exporting
+	 * @private
+	 * @ui5-restricted sap.ui.mdc, sap.ui.comp
+	 * @since 1.121
+	 */
+	Util.isExportable = function(oBinding) {
+		return !Util.isEmpty(oBinding)
+			&& (!oBinding?.getDownloadUrl
+				|| (oBinding.isResolved() && oBinding.getDownloadUrl() !== null));
+	};
+
+	/**
+	 * Informs whether the current theme is fully applied already.
+	 * Replacement for Core#isThemeApplied
+	 *
+	 * @private
+	 * @since 1.121
+	 */
+	Util.isThemeApplied = function() {
+		var bIsApplied = false;
+		var fnOnThemeApplied = function() {
+			bIsApplied = true;
+		};
+		Theming.attachApplied(fnOnThemeApplied); // Will be called immediately when theme is applied
+		Theming.detachApplied(fnOnThemeApplied);
+		return bIsApplied;
+	};
 
+	return Util;
 });

package/src/sap/m/table/columnmenu/ActionItem.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.ItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/Entry.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/Item.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.ItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110
@@ -88,7 +88,7 @@ sap.ui.define([
 		}
 	});
 
-	/**
+	/*
 	 * @override
 	 */
 	Item.prototype.setShowResetButton = function (bShowResetButton) {
@@ -99,7 +99,7 @@ sap.ui.define([
 		return this;
 	};
 
-	/**
+	/*
 	 * @override
 	 */
 	Item.prototype.setResetButtonEnabled = function (bResetButtonEnabled) {
@@ -110,7 +110,7 @@ sap.ui.define([
 		return this;
 	};
 
-	/**
+	/*
 	 * @override
 	 */
 	Item.prototype.setShowConfirmButton = function (bShowConfirmButton) {
@@ -121,7 +121,7 @@ sap.ui.define([
 		return this;
 	};
 
-	/**
+	/*
 	 * @override
 	 */
 	Item.prototype.setShowCancelButton = function (bShowCancelButton) {

package/src/sap/m/table/columnmenu/ItemBase.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.Entry
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/Menu.js

@@ -8,6 +8,7 @@ sap.ui.define([
 	"sap/m/Button",
 	"sap/m/Toolbar",
 	"sap/m/ToolbarSpacer",
+	"sap/m/ScrollContainer",
 	"sap/m/library",
 	"sap/ui/Device",
 	"sap/ui/core/Control",
@@ -33,6 +34,7 @@ sap.ui.define([
 	Button,
 	Toolbar,
 	ToolbarSpacer,
+	ScrollContainer,
 	library,
 	Device,
 	Control,
@@ -80,7 +82,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110
@@ -153,15 +155,6 @@ sap.ui.define([
 		}, this);
 	};
 
-	Menu.prototype.applySettings = function (mSettings) {
-		// Only works in JS views, but that's fine. This is only convenience for controls.
-		if (mSettings) {
-			this._addAllToPrivateAggregation(mSettings, "_quickActions");
-			this._addAllToPrivateAggregation(mSettings, "_items");
-		}
-		Control.prototype.applySettings.apply(this, arguments);
-	};
-
 	/**
 	 * Opens the popover at the specified target.
 	 *
@@ -248,6 +241,8 @@ sap.ui.define([
 				this._oItemsContainer.destroy();
 				this._oItemsContainer = null;
 			}
+
+			StaticArea.getUIArea().removeContent(this, true);
 			this._oPopover.close();
 			ControlEvents.unbindAnyEvent(this.fAnyEventHandlerProxy);
 		}
@@ -274,15 +269,6 @@ sap.ui.define([
 		ControlEvents.unbindAnyEvent(this.fAnyEventHandlerProxy);
 	};
 
-	Menu.prototype._addAllToPrivateAggregation = function (mSettings, sAggregationName) {
-		if (mSettings[sAggregationName]) {
-			mSettings[sAggregationName].forEach(function (oItem) {
-				this.addAggregation(sAggregationName, oItem);
-			}.bind(this));
-			delete mSettings[sAggregationName];
-		}
-	};
-
 	Menu.prototype._initPopover = function () {
 		if (this._oPopover) {
 			return;
@@ -296,7 +282,7 @@ sap.ui.define([
 			placement: library.PlacementType.VerticalPreferredBottom,
 			content: new AssociativeControl({control: this, height: true}),
 			horizontalScrolling: false,
-			verticalScrolling: false,
+			verticalScrolling: true, //Temporary Solution until UX design for a proper overflow of all areas in the menu exists
 			afterClose: [this._onPopoverAfterClose, this]
 		});
 		this.addDependent(this._oPopover);
@@ -404,6 +390,9 @@ sap.ui.define([
 
 		this._oItemsContainer.addView(oItem);
 		this._setItemVisibility(oMenuItem, oMenuItem.getVisible());
+		oMenuItem.getScrollDelegate = function() {
+			return oItem.getParent().getLayout().getScrollDelegate();
+		};
 	};
 
 	Menu.prototype._createItemsContainer = function () {
@@ -573,11 +562,15 @@ sap.ui.define([
 	};
 
 	Menu.prototype._setItemVisibility = function (oItem, bVisible) {
+		if (!this._oItemsContainer) {
+			return;
+		}
+
 		var oList = this._oItemsContainer._getNavigationList().getItems();
 		var oListItem = oList.find(function (oListItem) {
 			return oListItem._key == oItem.getId();
 		});
-		oListItem && oListItem.setVisible(bVisible);
+		oListItem?.setVisible(bVisible);
 	};
 
 	Menu.prototype._initQuickActionContainer = function () {

package/src/sap/m/table/columnmenu/QuickAction.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/QuickActionBase.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.Entry
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/QuickActionItem.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.Entry
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/QuickGroup.js

@@ -7,11 +7,13 @@
 sap.ui.define([
 	"sap/m/table/columnmenu/QuickActionBase",
 	"sap/m/ToggleButton",
-	"sap/m/library"
-], function (
+	"sap/m/library",
+	"sap/ui/core/Lib"
+], function(
 	QuickActionBase,
 	ToggleButton,
-	library
+	library,
+	Library
 ) {
 	"use strict";
 
@@ -28,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110
@@ -70,7 +72,7 @@ sap.ui.define([
 	};
 
 	QuickGroup.prototype.getLabel = function() {
-		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		var oBundle = Library.getResourceBundleFor("sap.m");
 		return oBundle.getText("table.COLUMNMENU_QUICK_GROUP");
 	};
 

package/src/sap/m/table/columnmenu/QuickGroupItem.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110

package/src/sap/m/table/columnmenu/QuickSort.js

@@ -5,9 +5,11 @@
  */
 
 sap.ui.define([
-	"sap/m/table/columnmenu/QuickActionBase"
+	"sap/m/table/columnmenu/QuickActionBase",
+	"sap/m/table/columnmenu/QuickSortItem"
 ], function (
-	QuickActionBase
+	QuickActionBase,
+	QuickSortItem
 ) {
 	"use strict";
 
@@ -24,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110
@@ -39,7 +41,7 @@ sap.ui.define([
 				/**
 				 * The sortable properties and the initial state.
 				 */
-				items: { type: "sap.m.table.columnmenu.QuickSortItem", multiple: true }
+				items: { type: "sap.m.table.columnmenu.QuickSortItem", defaultClass: QuickSortItem, multiple: true }
 			},
 			events: {
 				/**

package/src/sap/m/table/columnmenu/QuickSortItem.js

@@ -9,12 +9,14 @@ sap.ui.define([
 	"./QuickAction",
 	"sap/m/ToggleButton",
 	"sap/m/library",
+	"sap/ui/core/Lib",
 	"sap/ui/core/library"
-], function (
+], function(
 	QuickActionItem,
 	QuickAction,
 	ToggleButton,
 	library,
+	Library,
 	CoreLibrary
 ) {
 	"use strict";
@@ -34,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110
@@ -79,12 +81,12 @@ sap.ui.define([
 	};
 
 	QuickSortItem.prototype._getLabel = function() {
-		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		var oBundle = Library.getResourceBundleFor("sap.m");
 		return oBundle.getText("table.COLUMNMENU_QUICK_SORT", [this.getLabel()]);
 	};
 
 	QuickSortItem.prototype._createContent = function() {
-		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		var oBundle = Library.getResourceBundleFor("sap.m");
 		return [
 			new ToggleButton({
 				text: oBundle.getText("table.COLUMNMENU_SORT_ASCENDING"),

package/src/sap/m/table/columnmenu/QuickTotal.js

@@ -7,11 +7,13 @@
 sap.ui.define([
 	"sap/m/table/columnmenu/QuickActionBase",
 	"sap/m/ToggleButton",
-	"sap/m/library"
-], function (
+	"sap/m/library",
+	"sap/ui/core/Lib"
+], function(
 	QuickActionBase,
 	ToggleButton,
-	library
+	library,
+	Library
 ) {
 	"use strict";
 
@@ -28,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110
@@ -70,7 +72,7 @@ sap.ui.define([
 	};
 
 	QuickTotal.prototype.getLabel = function() {
-		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		var oBundle = Library.getResourceBundleFor("sap.m");
 		return oBundle.getText("table.COLUMNMENU_QUICK_TOTAL");
 	};
 

package/src/sap/m/table/columnmenu/QuickTotalItem.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.table.columnmenu.QuickActionItem
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @public
 	 * @since 1.110

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

@@ -94,9 +94,16 @@
 }
 
 .sapUiSizeCompact {
-	.sapMActionSheetPopover.sapMPopover  .sapMPopoverCont {
-		padding: 0.1875rem 0.375rem;
-		max-height: calc(~"100% - 0.375rem");
+	.sapMActionSheetPopover.sapMPopover {
+		.sapMPopoverCont {
+			padding: 0.1875rem 0.375rem;
+			max-height: calc(~"100% - 0.375rem");
+		}
+
+		.sapMActionSheet .sapMActionSheetButton .sapMBtnInner.sapMBtnIconFirst {
+			padding-left: 0.4375rem;
+    		padding-right: 0.4375rem;
+		}
 	}
 }
 

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

@@ -6,6 +6,7 @@
 .sapMAT{
     width: 20rem;
     height: 21.875rem;
+    border-radius: @sapTile_BorderCornerRadius;
     position: relative;
     padding: 1rem;
     box-shadow: @sapContent_Shadow0;
@@ -55,7 +56,6 @@
 // ToDo card Styles
 
 .sapMAT.sapMToDoCard {
-    border-radius: 1rem;
     .sapMGTHdrContent {
         margin-bottom: 0.75rem;
     }
@@ -107,8 +107,12 @@
                  overflow: hidden;
                  text-overflow: ellipsis;
                  font-size: 14px;
-                    font-weight: 400;
-                    line-height: 1rem;
+                font-weight: 400;
+                line-height: 1rem;
+                height: 1rem;
+                .sapMText {
+                    cursor: pointer;
+                }
              }
          }
      }
@@ -138,7 +142,6 @@
 // Situation Card Styles
 
 .sapMAT.sapMATSituationCard{
-    border-radius: 1.25rem;
     overflow: hidden;
     .sapMGTHdrContent {
         display: flex;

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

@@ -239,7 +239,7 @@ html[data-sap-ui-animation='off'] .sapMCrsl .sapMCrslInner {
 		background: @sapUiButtonHoverBackground;
 		border-color: @sapUiButtonHoverBorderColor;
 		color: @sapUiButtonHoverTextColor;
-		box-shadow: @sapContent_Interaction_Shadow;
+		box-shadow: @sapUiContentInteractionShadow;
 	}
 
 	&:active {

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

@@ -0,0 +1,3 @@
+.sapMContextMenuSettingContentOpacity {
+	opacity: @sapContent_DisabledOpacity;
+}

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

@@ -146,7 +146,7 @@
 @_sap_m_IconTabBar_ShellContentArrowHeight: 0.1875rem;
 @_sap_m_IconTabBar_ShellTextColor: @sapUiShellNavigationTextColor;
 @_sap_m_IconTabBar_ShellSelectedTextColor: @sapUiShellNavigationSelectedTextColor;
-@_sap_m_IconTabBar_ShellButtonOutlineColor: contrast(@sapShellColor, @sapUiContentFocusColor, @sapUiContentContrastFocusColor, @sapContent_ContrastTextThreshold);
+@_sap_m_IconTabBar_ShellButtonOutlineColor: contrast(@sapUiShellColor, @sapUiContentFocusColor, @sapUiContentContrastFocusColor, @sapUiContentContrastTextThreshold);
 @_sap_m_IconTabBar_ShellOverflowBorderColor: transparent;
 @_sap_m_IconTabBar_ShellOverflowHoverBorderColor: transparent;
 @_sap_m_IconTabBar_ShellOverflowPressedBorderColor: @sapUiShellNavigationActiveBackground;
@@ -546,7 +546,7 @@
 		}
 
 		.sapMITBText {
-			font-size: @sapFontSize;
+			font-size: @sapMFontMediumSize;
 			padding: 0;
 			margin: 0 0.5rem;
 			text-align: left;

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

@@ -7,6 +7,7 @@
 @_sap_m_Label_ColonOffsetWidth: 0.25rem;
 @_sap_m_Label_ColonOffsetWidth_lang_FR: 0.5rem;
 @_sap_m_Label_ColonOffsetWidth_lang_ZH: 0.875rem;
+@_sap_m_Label_InsideInactiveInfoToolbarColor: @sapUiListTextColor;
 
 .sapMLabel {
 	color: @sapUiContentLabelColor;
@@ -118,7 +119,7 @@ html[dir="ltr"] .sapMLabel[dir="rtl"].sapMLabelRequired .sapMLabelColonAndRequir
 }
 
 .sapMTB-Info-CTX.sapMTB.sapMTBInactive .sapMLabel {
-	color: @sapUiListTextColor;
+	color: @_sap_m_Label_InsideInactiveInfoToolbarColor;
 }
 
 /* Toolbar overflow context */

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

@@ -102,7 +102,7 @@ html.sap-desktop .sapUiSizeCondensed .sapUiTableCell .sapMLnk:focus:not(.sapMLnk
 }
 
 .sapMLnkEmphasized {
-	font-weight: bold;
+	font-family: @sapUiFontBoldFamily;
 }
 
 .sapMLnk .sapMEmptyIndicator.sapMEmptyIndicatorAuto {