@openui5/sap.ui.rta 1.127.0 → 1.128.0

package/src/sap/ui/rta/plugin/RTAElementMover.js

@@ -35,7 +35,7 @@ function(
 	 * The RTAElementMover is responsible for the RTA specific adaptation of element movements.
 	 *
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/Remove.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class The Remove allows trigger remove operations on the overlay
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/plugin/Rename.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/RenameHandler.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * Provides Rename handling functionality
 	 *
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private
@@ -234,7 +234,6 @@ sap.ui.define([
 			jQuery(_oWrapperDomRef).offset({left: DOMUtil.getOffset(this._oEditableControlDomRef).left});
 			RenameHandler._setEditableFieldPosition.apply(this);
 			this._oEditableField.style.visibility = "";
-			this._oEditableField.focus();
 
 			// If scrolling happens during startEdit, the position of the editable field can be wrong
 			// To avoid this, the position is recalculated after the scrollbar synchronization is ready
@@ -243,6 +242,10 @@ sap.ui.define([
 				oOverlayWithScrollbar.attachScrollSynced(RenameHandler._setEditableFieldPosition, this);
 			}.bind(this));
 
+			// The focus can trigger an immediate blur event (e.g. when the "discard draft" pop-up is opened),
+			// therefore the entire editable field preparation has to be finalized before the focus is set.
+			this._oEditableField.focus();
+
 			// keep Overlay selected while renaming
 			mPropertyBag.overlay.setSelected(true);
 			EventBus.getInstance().publish("sap.ui.rta", mPropertyBag.pluginMethodName, {

package/src/sap/ui/rta/plugin/Resize.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.101

package/src/sap/ui/rta/plugin/Selection.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @class The Selection plugin allows you to select or focus overlays with mouse or keyboard and navigate to others.
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/plugin/Settings.js

@@ -5,15 +5,18 @@
  */
 
 sap.ui.define([
-	"sap/ui/rta/plugin/Plugin",
-	"sap/ui/rta/Utils",
+	"sap/base/Log",
 	"sap/ui/dt/Util",
-	"sap/base/Log"
+	"sap/ui/fl/Utils",
+	"sap/ui/rta/plugin/Plugin",
+	"sap/ui/rta/Utils"
+
 ], function(
-	Plugin,
-	Utils,
+	BaseLog,
 	DtUtil,
-	BaseLog
+	FlUtils,
+	Plugin,
+	Utils
 ) {
 	"use strict";
 
@@ -25,7 +28,7 @@ sap.ui.define([
 	 * @class The Settings allows trigger change of settings operations on the overlay
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.44
@@ -166,6 +169,22 @@ sap.ui.define([
 		});
 	};
 
+	Settings.prototype._handleAnnotationChangeCommand = function(mChange, oElement, oCompositeCommand) {
+		var mChangeSpecificData = mChange.changeSpecificData;
+
+		return this.getCommandFactory().getCommandFor(
+			oElement,
+			"annotation",
+			{
+				content: mChangeSpecificData.content,
+				changeType: mChangeSpecificData.annotationChangeType
+			}
+		)
+		.then(function(oAnnotationCommand) {
+			return oCompositeCommand.addCommand(oAnnotationCommand);
+		});
+	};
+
 	Settings.prototype._handleCompositeCommand = function(aElementOverlays, oElement, aChanges, oSettingsAction) {
 		var oCompositeCommand;
 
@@ -180,17 +199,22 @@ sap.ui.define([
 				var mChangeSpecificData = mChange.changeSpecificData;
 				// Flex Change
 				if (mChangeSpecificData.changeType) {
-					return this._handleFlexChangeCommand(mChange, aElementOverlays, oCompositeCommand, oSettingsAction);
+					return () => this._handleFlexChangeCommand(mChange, aElementOverlays, oCompositeCommand, oSettingsAction);
 				// App Descriptor Change
 				} else if (mChangeSpecificData.appDescriptorChangeType) {
-					return this._handleAppDescriptorChangeCommand(mChange, oElement, oCompositeCommand);
+					return () => this._handleAppDescriptorChangeCommand(mChange, oElement, oCompositeCommand);
+				// Annotation Change
+				} else if (mChangeSpecificData.annotationChangeType) {
+					return () => this._handleAnnotationChangeCommand(mChange, oElement, oCompositeCommand);
 				}
 				return undefined;
 			}, this);
 		}.bind(this))
 
 		.then(function(aPromises) {
-			return Promise.all(aPromises);
+			// Since oCompositeCommand gets modified by each handler, the promise execution must be sequential
+			// to ensure the correct order of the commands
+			return FlUtils.execPromiseQueueSequentially(aPromises);
 		})
 
 		.then(function() {

package/src/sap/ui/rta/plugin/Split.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.46

package/src/sap/ui/rta/plugin/Stretch.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/additionalElements/ActionExtractor.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * handled by the AdditionalElements Plugin (Reveal, Add Via Delegate, Add Custom)
 	 *
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @since 1.94
 	 */

package/src/sap/ui/rta/plugin/additionalElements/AddElementsDialog.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @class Context - Dialog for available Fields in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsPlugin.js

@@ -119,7 +119,7 @@ sap.ui.define([
 	 * @class The plugin allows to add additional elements that exist either hidden in the UI or in the OData service
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsUtils.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * Helper object containing methods for the AdditionalElements plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @since 1.94
 	 */

package/src/sap/ui/rta/plugin/additionalElements/CommandBuilder.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Helper object to build the RTA commands resulting from the AdditionalElements Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @since 1.94
 	 */

package/src/sap/ui/rta/plugin/iframe/AddIFrame.js

@@ -119,7 +119,7 @@ sap.ui.define([
 	 * @class The AddIFrame allows trigger AddIFrame operations on the overlay.
 	 * @extends sap.ui.rta.plugin.BaseCreate
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.75

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.fragment.xml

@@ -63,9 +63,13 @@
 									<Label id="sapUiRtaAddIFrameDialog_WidthLabel" class="sapUiRtaAddIFrameDialogWidthLabel" labelFor="sapUiRtaAddIFrameDialog_WidthInput"
 										text="{dialogInfo>/text/widthLabel}">
 									</Label>
-									<Input id="sapUiRtaAddIFrameDialog_WidthInput" class="sapUiRtaAddIFrameDialogWidthInput"
+									<Input
+										id="sapUiRtaAddIFrameDialog_WidthInput"
+										class="sapUiRtaAddIFrameDialogWidthInput"
 										value="{path: 'dialogInfo>/frameWidth/value', type: 'FloatType', constraints: {minimum: 1}}"
-										valueState="{dialogInfo>/frameWidth/valueState}"/>
+										valueState="{dialogInfo>/frameWidth/valueState}"
+										valueStateText="{dialogInfo>/text/dimensionsErrorText}"
+									/>
 									<Select
 										id="sapUiRtaAddIFrameDialog_WidthUnit"
 										class="sapUiRtaAddIFrameDialogWidthUnit"
@@ -89,9 +93,13 @@
 								<form:content>
 									<Label id="sapUiRtaAddIFrameDialog_HeightLabel" class="sapUiRtaAddIFrameDialogHeightLabel" labelFor="sapUiRtaAddIFrameDialog_HeightInput"
 										text="{dialogInfo>/text/heightLabel}"/>
-									<Input id="sapUiRtaAddIFrameDialog_HeightInput" class="sapUiRtaAddIFrameDialogHeightInput"
+									<Input
+										id="sapUiRtaAddIFrameDialog_HeightInput"
+										class="sapUiRtaAddIFrameDialogHeightInput"
 										value="{path: 'dialogInfo>/frameHeight/value', type: 'FloatType', constraints: {minimum: 1}}"
-										valueState="{dialogInfo>/frameHeight/valueState}"/>
+										valueState="{dialogInfo>/frameHeight/valueState}"
+										valueStateText="{dialogInfo>/text/dimensionsErrorText}"
+									/>
 									<Select
 										id="sapUiRtaAddIFrameDialog_HeightUnit"
 										class="sapUiRtaAddIFrameDialogHeightUnit"
@@ -152,8 +160,15 @@
 									<items>
 										<ColumnListItem type="Active" press="onParameterPress">
 											<cells>
-												<Text text="{dialogInfo>label}"/>
-												<Text text="{dialogInfo>value}" wrapping="false"/>
+												<Text
+													text="{dialogInfo>label}"
+													tooltip="{dialogInfo>label}"
+												/>
+												<Text
+													text="{dialogInfo>value}"
+													tooltip="{=${dialogInfo>value}.toString()}"
+													wrapping="false"
+												/>
 											</cells>
 										</ColumnListItem>
 									</items>

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.js

@@ -42,6 +42,7 @@ sap.ui.define([
 		widthUnitLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_WIDTH_UNITLABEL"),
 		heightLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_HEIGHT_LABEL"),
 		heightUnitLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_HEIGHT_UNITLABEL"),
+		dimensionsErrorText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_DIMENSIONS_ERROR"),
 		saveText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_BUTTON_SAVE"),
 		cancelText: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_BUTTON_CANCEL"),
 		previewUrlLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_PREVIEW_URL_LABEL"),
@@ -158,7 +159,7 @@ sap.ui.define([
 	 * @class Context - Dialog for IFrame settings in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.78

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialogController.js

@@ -136,6 +136,7 @@ sap.ui.define([
 		onShowPreview() {
 			const sReturnedURL = this._buildReturnedURL();
 			const sURL = this._buildPreviewURL();
+
 			if (!isValidUrl(sURL).result) {
 				return;
 			}
@@ -150,11 +151,12 @@ sap.ui.define([
 				oPanelButton.setEnabled(false);
 			}
 			try {
-				this._oJSONModel.setProperty("/previewUrl/value", sURL);
 				this._oJSONModel.setProperty("/previousFrameUrl/value", sReturnedURL);
 				this._oJSONModel.setProperty("/settingsUpdate/value", false);
 
 				oIFrame.applySettings({ url: sURL, advancedSettings: {...this._oJSONModel.getProperty("/advancedSettings/value")} });
+				// Use the URL from the IFrame to ensure that the complete path is shown
+				this._oJSONModel.setProperty("/previewUrl/value", oIFrame.getUrl());
 			} catch (oError) {
 				Log.error("Error previewing the URL: ", oError);
 			}

package/src/sap/ui/rta/service/Action.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Action
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted
 	 *

package/src/sap/ui/rta/service/ControllerExtension.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.ControllerExtension
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/Outline.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Outline
 	 * @author SAP SE
 	 * @since 1.56
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/service/Property.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Property
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/Selection.js

@@ -14,7 +14,7 @@ sap.ui.define(function() {
 	 * @name sap.ui.rta.service.Selection
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/SupportTools.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.SupportTools
 	 * @author SAP SE
 	 * @since 1.106
-	 * @version 1.127.0
+	 * @version 1.128.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/themes/base/AddIFrame.less

@@ -1,10 +1,9 @@
 /******************************************************************
 	Style of the RTA Add IFrame Dialog  - base Theme
 *******************************************************************/
-@_sap_ui_rta_AddIFrame_Title: @sapUiTextTitle; //#000
-@_sap_ui_rta_AddIFrame_DelimiterLineColor: @sapUiInfobarActiveBackground; //#d9d9d9
-@_sap_ui_rta_AddIFrame_BorderColor: @sapUiNeutralBorder; //#fff;
-@_sap_ui_rta_AddIFrame_PreviewBG: @sapUiListTableGroupHeaderBackground; //#f2f2f2
+@_sap_ui_rta_AddIFrame_BorderColor: @sapUiGroupContentBorderColor; //#000;
+@_sap_ui_rta_AddIFrame_PreviewBackgroundColor: @sapUiContentImagePlaceholderBackground; //#fff
+@_sap_ui_rta_AddIFrame_PreviewTextColor: @sapUiContentForegroundTextColor; //#000
 
 .sapUiRtaMode {
 	.sapUiRtaAddIFrameDialog {
@@ -16,10 +15,6 @@
 			&:focus::after {
 				content: none;
 			}
-
-			.sapMTitle {
-				color: @_sap_ui_rta_AddIFrame_Title;
-			}
 		}
 
 		.sapUiRtaAddIFrameDialogVlWrapper {
@@ -48,7 +43,7 @@
 			.sapUiRtaAddIFrameDialogPercentGrid {
 				padding: 0.25rem 0 0 0;
 				margin: 0 1rem;
-				border-bottom: 0.0625rem solid @_sap_ui_rta_AddIFrame_DelimiterLineColor; //1px
+				border-bottom: 0.0625rem solid @_sap_ui_rta_AddIFrame_BorderColor; //1px
 
 				> div {
 					margin-bottom: 0.25rem;
@@ -119,7 +114,7 @@
 			.sapUiRtaAddIFrameDialogPreviewGrid {
 				padding: 0;
 				margin: 0 1rem 1rem;
-				background: @_sap_ui_rta_AddIFrame_PreviewBG;
+				background: @_sap_ui_rta_AddIFrame_PreviewBackgroundColor;
 				border: 0.0625rem solid @_sap_ui_rta_AddIFrame_BorderColor; //1px
 
 				> div {
@@ -130,6 +125,9 @@
 				.sapUiRtaAddIFrameDialogNoPreviewLabel {
 					margin-top: 4rem;
 				}
+				.sapMLabelTextWrapper {
+					color: @_sap_ui_rta_AddIFrame_PreviewTextColor;
+				}
 			}
 		}
 	}

package/src/sap/ui/rta/themes/base/ChangeVisualization.less

@@ -4,9 +4,8 @@
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorLight: @sapUiChartPaletteSequentialHue1Light1; //#4880cb
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium: @sapUiChartPaletteSequentialHue1Dark1; //#1b57a7
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark: @sapUiChartPaletteSequentialHue11Dark2; //#0e4186
-@_sap_ui_rta_ChangeVisualization_DependentIndicatorColorTransparent: @sapUiGroupTitleBackground; //#fff
 @_sap_ui_rta_ChangeVisualization_OverlayBoxShadow: @sapUiUx3ToolPopupShadow; //0px 6px 12px 0px fade(black, 30);
-@_sap_ui_rta_ChangeVisualization_OverlayOutline: @sapUiSelected; //#8fb5ff
+@_sap_ui_rta_ChangeVisualization_OverlayOutlineColor: @sapUiSelected; //#8fb5ff
 
 .sapUiRtaChangeIndicator {
 	height: 0.8rem;
@@ -55,7 +54,7 @@
 			content: " ";
 			transition: box-shadow .25s;
 			box-shadow: @_sap_ui_rta_ChangeVisualization_OverlayBoxShadow;
-			outline: 0.0625rem solid @_sap_ui_rta_ChangeVisualization_OverlayOutline !important; //1px
+			outline: 0.0625rem solid @_sap_ui_rta_ChangeVisualization_OverlayOutlineColor !important; //1px
 			outline-offset: -0.0625rem; //1px
 		}
 	}

package/src/sap/ui/rta/themes/base/ContextMenu.less

@@ -1,24 +1,24 @@
 /******************************************************************
 	Style of the RTA Contextmenu - base Theme
 *******************************************************************/
-@_sap_ui_rta_ContextMenu_Border_LightColor: @sapUiInvertedElement; //#fff
-@_sap_ui_rta_ContextMenu_Border_DarkColor: darken(desaturate(@sapUiChart1, 48%), 14%); //#435060
-@_sap_ui_rta_ContextMenu_BoxShadow_DarkColor: @sapUiDarkShadowTint; // #000
-@_sap_ui_rta_ContextMenu_BoxShadow_LightColor: @sapUiLightShadowTint; // #fff
+@_sap_ui_rta_ContextMenu_BorderLightColor: @sapUiButtonLiteBorderColor; //#fff
+@_sap_ui_rta_ContextMenu_BorderDarkColor: @sapUiButtonAcceptBorderColor; //#006362
+@_sap_ui_rta_ContextMenu_BoxShadowDarkColor: @sapUiDarkShadowTint; // #000
+@_sap_ui_rta_ContextMenu_BoxShadowLightColor: @sapUiLightShadowTint; // #fff
 
-@_sap_ui_rta_ContextMenu_BoxShadow: 0.375rem 0.625rem 2rem fade(@_sap_ui_rta_ContextMenu_BoxShadow_DarkColor, 30),
-0.125rem 0.375rem 1rem fade(@_sap_ui_rta_ContextMenu_BoxShadow_DarkColor, 60),
-0 0 0 0.0625rem fade(@_sap_ui_rta_ContextMenu_BoxShadow_LightColor, 20),
-0 0.0625rem 0 0 fade(@_sap_ui_rta_ContextMenu_BoxShadow_LightColor, 20); //10px 20px 6px 6px 1px 1px
+@_sap_ui_rta_ContextMenu_BoxShadow: 0.375rem 0.625rem 2rem fade(@_sap_ui_rta_ContextMenu_BoxShadowDarkColor, 30),
+0.125rem 0.375rem 1rem fade(@_sap_ui_rta_ContextMenu_BoxShadowDarkColor, 60),
+0 0 0 0.0625rem fade(@_sap_ui_rta_ContextMenu_BoxShadowLightColor, 20),
+0 0.0625rem 0 0 fade(@_sap_ui_rta_ContextMenu_BoxShadowLightColor, 20); //10px 20px 6px 6px 1px 1px
 
 .sapUiRtaMode {
 	.sapUiDtContextMenu {
 		&.sapMMenu {
-			border: 0.125rem solid @_sap_ui_rta_ContextMenu_Border_LightColor; //2px
-			border-image: repeating-linear-gradient(-45deg, @_sap_ui_rta_ContextMenu_Border_DarkColor,
-			@_sap_ui_rta_ContextMenu_Border_DarkColor 0.25rem,
-			@_sap_ui_rta_ContextMenu_Border_LightColor 0.25rem,
-			@_sap_ui_rta_ContextMenu_Border_LightColor 0.375rem) 4;
+			border: 0.125rem solid @_sap_ui_rta_ContextMenu_BorderLightColor; //2px
+			border-image: repeating-linear-gradient(-45deg, @_sap_ui_rta_ContextMenu_BorderDarkColor,
+			@_sap_ui_rta_ContextMenu_BorderDarkColor 0.25rem,
+			@_sap_ui_rta_ContextMenu_BorderLightColor 0.25rem,
+			@_sap_ui_rta_ContextMenu_BorderLightColor 0.375rem) 4;
 			box-shadow: @_sap_ui_rta_ContextMenu_BoxShadow;
 		}
 	}

package/src/sap/ui/rta/themes/base/Dialogs.less

@@ -1,8 +1,8 @@
 /******************************************************************
 	Style of the RTA Dialogs - base Theme
 *******************************************************************/
-@_sap_ui_rta_Dialogs_BorderLightColor: @sapUiShellBackground; //#fff
-@_sap_ui_rta_Dialogs_BorderDarkColor: darken(desaturate(@sapUiChart1, 48%), 14%); //#435060
+@_sap_ui_rta_Dialogs_BorderLightColor: @sapUiButtonLiteBorderColor; //#fff
+@_sap_ui_rta_Dialogs_BorderDarkColor: @sapUiButtonAcceptBorderColor; //#006362
 @_sap_ui_rta_Dialogs_BoxShadowDarkColor: @sapUiDarkShadowTint; // #000
 @_sap_ui_rta_Dialogs_BoxShadowLightColor: @sapUiLightShadowTint; // #fff
 

package/src/sap/ui/rta/themes/base/FieldRepository.less

@@ -1,20 +1,15 @@
 /******************************************************************
 	Style of the RTA Add Fields Dialog  - base Theme
 *******************************************************************/
-@_sap_ui_rta_FieldRepository_Title: @sapUiTextTitle; //#000
-@_sap_ui_rta_FieldRepository_BtnFocusOtline: @sapUiButtonHoverBorderColor; //#000
-@_sap_ui_rta_FieldRepository_BC_Container_Border: @sapUiGroupContentBorderColor; //#000
+@_sap_ui_rta_FieldRepository_BtnFocusOutlineColor: @sapUiContentFocusColor; //#000
+@_sap_ui_rta_FieldRepository_BC_Container_BorderColor: @sapUiGroupContentBorderColor; //#000
 
 .sapUIRtaFieldRepositoryDialog {
 
-	&.sapMDialog > header .sapMDialogTitleGroup .sapMTitle {
-		color: @_sap_ui_rta_FieldRepository_Title;
-	}
-
 	.sapMBtn {
 		&:focus {
 			> .sapMBtnInner {
-				outline: 0.0625rem dotted @_sap_ui_rta_FieldRepository_BtnFocusOtline; //1px
+				outline: 0.0625rem dotted @_sap_ui_rta_FieldRepository_BtnFocusOutlineColor; //1px
 				border: 0.0625rem solid transparent;
 			}
 		}
@@ -28,10 +23,10 @@
 		width: 100%;
 		margin-top: 0.25rem; //4px
 		padding-bottom: 0.5rem; //8px
-		border-bottom: 0.0625rem solid @_sap_ui_rta_FieldRepository_BC_Container_Border; //1px
+		border-bottom: 0.0625rem solid @_sap_ui_rta_FieldRepository_BC_Container_BorderColor; //1px
 
 		> div:not(:first-child) {
-			padding-left: 2.125rem; //34px
+			padding-left: 2.125rem;     //34px
 			padding-right: 0.625rem; //10px
 		}
 

package/src/sap/ui/rta/themes/base/FlexSupportExtension.less

@@ -1,14 +1,19 @@
 /******************************************************************
 	Style used by flex support chrome extension  - base Theme
 *******************************************************************/
+@_sap_ui_rta_FlexSupportExtension_BoxShadow: @sapUiUx3ToolPopupShadow; //0px 6px 12px 0px fade(black, 30);
+@_sap_ui_rta_FlexSupportExtension_BackgroundColor: fade(@sapUiSelected, 5%); //rgba(143, 181, 255, 0.05);
+@_sap_ui_rta_FlexSupportExtension_BorderRadius: @sapUiButtonBorderCornerRadius; //0.375rem
+@_sap_ui_rta_FlexSupportExtension_OutlineColor: @sapUiSelected; //#8fb5ff
+
 .sapUiFlexibilitySupportExtension_Selected {
-	box-shadow: @sapUiUx3ToolPopupShadow;
+	box-shadow: @_sap_ui_rta_FlexSupportExtension_BoxShadow;
 	&:after {
 		content: " ";
-		background: @sapUiMessageSuccessBorderColor;
+		background: @_sap_ui_rta_FlexSupportExtension_BackgroundColor;
 		opacity: 0.40;
-		border-radius: @sapUiButtonBorderCornerRadius;
-		outline: 0.125rem solid @sapUiSelected; //1px
+		border-radius: @_sap_ui_rta_FlexSupportExtension_BorderRadius;
+		outline: 0.125rem solid @_sap_ui_rta_FlexSupportExtension_OutlineColor; //1px
 		outline-offset: -0.125rem; //1px
 	}
 }