@openui5/sap.ui.rta 1.101.0 → 1.102.2

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

@@ -1,169 +1,38 @@
 /******************************************************************
 	Style of the RTA Toolbar (all types) - base Theme
 *******************************************************************/
-@_sap_ui_rta_Toolbar_Base_SegBBtnHoverBG: lighten(@sapSelectedColor,32%); //#c2e2f9
-@_sap_ui_rta_Toolbar_Base_TextColor: @sapUiWhite; //#fff
-@_sap_ui_rta_Toolbar_Base_BaseColor: darken(desaturate(@sapChart_OrderedColor_1, 48%), 14%); //#435060
-@_sap_ui_rta_Toolbar_Base_BorderColor: @sapUiMediumBG;
-@_sap_ui_rta_Toolbar_Base_BtnHoverColor: @sapUiButtonHoverTextColor;
+@_sap_ui_rta_Toolbar_Base_TextColor: @sapUiTextInverted; //#fff
+@_sap_ui_rta_Toolbar_Base_BaseColor: darken(desaturate(@sapUiChart1, 48%), 14%); //#435060
+@_sap_ui_rta_Toolbar_Base_BaseBG: darken(desaturate(@sapUiChart1, 48%), 14%); //#435060
+@_sap_ui_rta_Toolbar_Base_BoxShadow_DarkColor: @sapUiDarkShadowTint; // #000
+@_sap_ui_rta_Toolbar_Base_BoxShadow_LightColor: @sapUiLightShadowTint; // #fff
+@_sap_ui_rta_Toolbar_Border_Image: repeating-linear-gradient(-45deg,
+@_sap_ui_rta_Toolbar_Base_BaseColor,
+@_sap_ui_rta_Toolbar_Base_BaseColor 0.25rem,
+@_sap_ui_rta_Toolbar_Base_TextColor 0.25rem,
+@_sap_ui_rta_Toolbar_Base_TextColor 0.375rem) 4;
+
+@_sap_ui_rta_Toolbar_Box_Shadow: 0.375rem 0.625rem 2rem fade(@_sap_ui_rta_Toolbar_Base_BoxShadow_DarkColor, 30),
+0.125rem 0.375rem 1rem fade(@_sap_ui_rta_Toolbar_Base_BoxShadow_DarkColor, 60),
+0 0 0 0.0625rem fade(@_sap_ui_rta_Toolbar_Base_BoxShadow_LightColor, 20),
+0 0.0625rem 0 0 fade(@_sap_ui_rta_Toolbar_Base_BoxShadow_LightColor, 20);
 
 .sapUiRtaMode {
 
+	.sapUiRtaMarginTopForToolbar {
+		margin-top: 3rem; //48px
+	}
+
 	.sapUiRtaToolbar {
+		border: 0.125rem solid @_sap_ui_rta_Toolbar_Base_TextColor; //2px
+		border-image: @_sap_ui_rta_Toolbar_Border_Image;
+		box-shadow: @_sap_ui_rta_Toolbar_Box_Shadow;
 		position: absolute;
 		top: 0;
 		left: 0;
 		right: 0;
 		padding: 0 1.25rem; //20px
 		height: 2.75rem; /* Overrider `.sapUiSizeCompact .sapMTB` */ //44px
-		background-color: @_sap_ui_rta_Toolbar_Base_BaseColor;
-
-		.sapMBtn {
-			padding: 0;
-			height: 2.5rem; //40px
-			margin: 0 0.25rem; //4px
-
-			&.sapMBtnDisabled .sapMBtnInner {
-				opacity: 0.5;
-			}
-		}
-
-		.sapMBtnTransparent,
-		:not(.sapMBtnDisabled) .sapMBtnTransparent > .sapMBtnIcon,
-		:not(.sapMBtnDisabled) .sapMBtnGhost > .sapMBtnIcon,
-		:not(.sapMBtnDisabled) .sapMMenuBtn.sapMMenuBtnRegular .sapMBtnInner::after {
-			color: @_sap_ui_rta_Toolbar_Base_TextColor;
-		}
-
-		:not(.sapMBtnDisabled) .sapMMenuBtn:hover.sapMMenuBtnRegular .sapMBtnInner::after {
-			color: @_sap_ui_rta_Toolbar_Base_BtnHoverColor;
-		}
-
-
-		.sapMSegB > .sapMSegBBtn .sapMSegBBtnInner {
-			background-color: @_sap_ui_rta_Toolbar_Base_BaseColor;
-			color: @_sap_ui_rta_Toolbar_Base_TextColor;
-			border: none;
-			position: relative;
-		}
-
-		.sapMSegBBtn.sapMSegBBtnFocusable {
-
-			&:hover .sapMSegBBtnInner,
-			&.sapMSegBBtnSel:hover .sapMSegBBtnInner {
-				color: @_sap_ui_rta_Toolbar_Base_SegBBtnHoverBG;
-			}
-
-			&:focus .sapMSegBBtnInner {
-				outline: 0.0625rem dotted @_sap_ui_rta_Toolbar_Base_TextColor; //1px
-				outline-offset: -0.0625rem; //1px
-			}
-
-			&.sapMSegBBtnSel {
-
-				&:hover .sapMSegBBtnInner::after {
-					border-bottom: 0.125rem solid @_sap_ui_rta_Toolbar_Base_SegBBtnHoverBG; //2px
-				}
-
-				&:hover .sapMSegBBtnInner {
-					background-color: @_sap_ui_rta_Toolbar_Base_BaseColor;
-				}
-
-				& .sapMSegBBtnInner::after {
-					position: absolute;
-					display: block;
-					content: '';
-					border-bottom: 0.125rem solid @_sap_ui_rta_Toolbar_Base_TextColor; //2px
-					left: 0.375rem; //6px
-					right: 0.375rem; //6px
-					bottom: 0.125rem; //2px
-				}
-
-				+ .sapMSegBBtn .sapMSegBBtnInner {
-					border-left: none;
-				}
-
-				.sapMSegBBtnInner:hover {
-					border: none;
-				}
-			}
-		}
-
-		.sapMSegBBtnFocusable.sapMBtnActive:hover {
-			.sapMSegBBtnInner {
-				background-color: @_sap_ui_rta_Toolbar_Base_BaseColor;
-			}
-
-			& .sapMSegBBtnInner::after {
-				border-bottom: 0.125rem solid @_sap_ui_rta_Toolbar_Base_SegBBtnHoverBG; //2px
-			}
-		}
-
-		.sapMBtn:focus .sapMFocusable {
-			outline: none;
-			border: 0.0625rem dotted @_sap_ui_rta_Toolbar_Base_TextColor; //1px
-		}
-
-		.sapMTBStandard {
-			height: 2.5rem; //40px
-			border-bottom: none;
-			background: @_sap_ui_rta_Toolbar_Base_BaseColor;
-		}
-		.sapUiRtaToolbarSwitcherSection {
-			.sapMSegBBtn:hover {
-				.sapUiIcon,
-				&.sapMSegBBtnSel .sapMSegBBtnInner .sapUiIcon {
-					color: @_sap_ui_rta_Toolbar_Base_SegBBtnHoverBG;
-				}
-			}
-		}
-	}
-	.sapUiRtaToolbarVisualizationSelection li:first-child {
-		border-bottom: 1px solid @_sap_ui_rta_Toolbar_Base_BorderColor;
-	}
-}
-.sapUiSizeCozy {
-	.sapUiRtaToolbar {
-		.sapMSegBBtn.sapMSegBBtnFocusable.sapMSegBBtnSel {
-			& .sapMSegBBtnInner:after {
-				bottom: 0.375rem; //6px
-				left: 0.5625rem; //9px
-				right: 0.5625rem; //9px
-			}
-		}
+		background-color: @_sap_ui_rta_Toolbar_Base_BaseBG;
 	}
-}
-
-.sapUiSizeCozy.sapUiRtaMode .sapUiRtaToolbar .sapMBtn .sapMBtnInner {
-	text-shadow: none; /* Override shadow of `.sapMBtnInner` in sap.m */
-}
-
-.sapUiRtaToolbarActionsSection > div:first-child {
-	width: 100%;
-}
-
-// the default hbox width which is set via the element properties must be overruled
-.sapUiMedia-sapUiRtaToolbar-sapUiRtaToolbarDesktop .sapUiRtaToolbarIconAndDraftSection,
-.sapUiMedia-sapUiRtaToolbar-sapUiRtaToolbarDesktop .sapUiRtaToolbarActionsSection,
-.sapUiMedia-sapUiRtaToolbar-sapUiRtaToolbarTablet .sapUiRtaToolbarIconAndDraftSection,
-.sapUiMedia-sapUiRtaToolbar-sapUiRtaToolbarTablet .sapUiRtaToolbarActionsSection {
-	width: ~"calc(50% - 200px) !important";
-}
-
-.sapUiMedia-sapUiRtaToolbar-sapUiRtaToolbarDesktop .sapUiRtaToolbarSwitcherSection,
-.sapUiMedia-sapUiRtaToolbar-sapUiRtaToolbarTablet .sapUiRtaToolbarSwitcherSection {
-	width: 400px !important;
-}
-
-.sapUiMedia-sapUiRtaToolbar-sapUiRtaToolbarMobile .sapUiRtaToolbarIconAndDraftSection,
-.sapUiMedia-sapUiRtaToolbar-sapUiRtaToolbarMobile .sapUiRtaToolbarActionsSection {
-	width: ~"calc(50% - 70px) !important";
-}
-
-.sapUiMedia-sapUiRtaToolbar-sapUiRtaToolbarMobile .sapUiRtaToolbarSwitcherSection {
-	width: 140px !important;
-}
-
-.sapUiRtaToolbarSwitcherSection > div {
-	width: 100% !important;
 }

package/src/sap/ui/rta/themes/base/Toolbar.fiori.less

@@ -1,40 +1,21 @@
 /**
 	This class is being assigned to the original Fiori Header Toolbar when RTA Toolbar shows
  */
-@_sap_ui_rta_Toolbar_Fiori_TextColor: @sapUiWhite;  //#fff
 
 .sapUiRtaFioriHeaderInvisible {
 	visibility: hidden;
 }
 
-
-  /* type: fiori */
+/* type: fiori */
 .sapUiRtaToolbar.type_fiori {
 	transition: opacity 0.25s ease-out;
 	opacity: 0;
 
-
 	.sapMImg {
-		//padding-top: 0.375rem; //6px
-		vertical-align: middle;
 		height: 2.5rem !important; // 40px
 	}
 
 	&.is_visible {
 		opacity: 1;
 	}
-
-	/* color: contrast */
-	&.color_contrast {
-
-		.sapMBtn .sapMBtnContent,
-		.sapMBtn .sapMBtnIcon {
-			text-shadow: none; /* Override shadow of `.sapMBtnInner` in sap.m */
-			color: @_sap_ui_rta_Toolbar_Fiori_TextColor;
-		}
-
-		.sapMBtn.sapMBtnDisabled {
-			opacity: 0.3;
-		}
-	}
-}
+}

package/src/sap/ui/rta/themes/base/Toolbar.personalization.less

@@ -1,16 +1,13 @@
 /******************************************************************
 	Style of the Personalization Toolbar - base Theme
 *******************************************************************/
-@_sap_ui_rta_Toolbar_Personalization_TextColor: @sapUiWhite; // #fff
-@_sap_ui_rta_Toolbar_Personalization_TextShadowColor: @sapUiDeepBG; //#000
-@_sap_ui_rta_Toolbar_Personalization_BaseColor: darken(desaturate(@sapChart_OrderedColor_1, 48%), 14%); //#435060
+@_sap_ui_rta_Toolbar_Personalization_TextColor: @sapUiTextInverted; // #fff
+@_sap_ui_rta_Toolbar_Personalization_BaseColor: darken(desaturate(@sapUiChart1, 48%), 14%); //#435060
 
 .sapUiRtaToolbar.type_personalization {
 	position: absolute;
 	left: 0;
 	right: 0;
-	top: auto;
-	top: initial;
 	bottom: 0;
 	background-color: @_sap_ui_rta_Toolbar_Personalization_BaseColor;
 	padding: 0 1rem; //16px
@@ -19,22 +16,14 @@
 
 	.sapMBtn {
 		padding: 0;
-		height: 2.5rem; //40px
 		margin: 0 0.25rem; //4px
+
 		.sapMBtnTransparent.sapMBtnInner {
 			border: none;
 
 			.sapMBtnContent {
 				color: @_sap_ui_rta_Toolbar_Personalization_TextColor;
-				text-shadow: 0 0 0.125rem @_sap_ui_rta_Toolbar_Personalization_TextShadowColor; //2px
 			}
 		}
 	}
-
-	// Disable the right margin for Done button
-	>.sapMFlexItem:last-child {
-		.sapMBtn:last-child {
-			margin-right: 0;
-		}
-	}
 }

package/src/sap/ui/rta/themes/base/Toolbar.standalone.less

@@ -1,11 +1,7 @@
 /******************************************************************
 	Style of the RTA Standalone Toolbar - base Theme
 *******************************************************************/
-@_sap_ui_rta_Toolbar_Standalone_TextColor: @sapUiWhite; //#fff
-@_sap_ui_rta_Toolbar_Standalone_BaseColor: darken(desaturate(@sapChart_OrderedColor_1, 48%), 14%);	//#435060
-
 .sapUiRtaToolbar.type_standalone.color_default {
-	background-color: @_sap_ui_rta_Toolbar_Standalone_BaseColor;
 	top: -3.125rem; //50px;
 	transition: top 0.25s ease-out;
 	height: 3rem; //48p
@@ -13,9 +9,4 @@
 	&.is_visible {
 		top: 0;
 	}
-
-	.sapMBtn:focus .sapMFocusable {
-		outline: none;
-		border: 0.0625rem dotted @_sap_ui_rta_Toolbar_Standalone_TextColor; //1px
-	}
 }

package/src/sap/ui/rta/themes/base/library.source.less

@@ -17,5 +17,7 @@
 @import "Overlay.less";
 @import "MessageBox.less";
 @import "AddIFrame.less";
+@import "ContextMenu.less";
+@import "Dialogs.less";
 
 @import "OverlayWithScrollbar.less";

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

@@ -0,0 +1,7 @@
+/******************************************************************
+	Style of the RTA Change Visualization - HCB theme
+*******************************************************************/
+@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorLight: lighten(@sapUiPositiveText, 10%); //#bbddbb
+@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium: @sapUiCriticalText; //#ffab1d
+@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark: lighten(@sapUiChart8, 20%); //#dd8ec9
+@_sap_ui_rta_ChangeVisualization_OverlayOutline: @sapUiContentHelpColor; // #03b803

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

@@ -0,0 +1,5 @@
+/******************************************************************
+	Style of the RTA Contextmenu - HCB theme
+*******************************************************************/
+@_sap_ui_rta_ContextMenu_Border_LightColor: @sapUiNeutralBorder; //#ffffff
+@_sap_ui_rta_ContextMenu_Border_DarkColor: @sapUiNeutralBG; //#000000

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

@@ -0,0 +1,28 @@
+/******************************************************************
+	Style of Dialogs shown in RTA - HCB theme
+*******************************************************************/
+@_sap_ui_rta_Dialogs_BorderLightColor: @sapUiNeutralElement; //#ffffff
+@_sap_ui_rta_Dialogs_BorderDarkColor: @sapUiNeutralBG; //#000000
+
+.sapUiRtaPopover {
+	&.sapMPopoverArr, .sapMPopoverArr {
+		border-style: none;
+
+		&:after {
+			left: 0;
+			bottom: 1.5rem;
+		}
+	}
+}
+
+.sapUiSizeCompact .sapUiRtaPopover {
+	&.sapMPopoverArr, .sapMPopoverArr {
+		bottom: -2rem;
+
+		&:after {
+			left: 0;
+			bottom: 1.5rem;
+			border-width: 0.125rem;
+		}
+	}
+}

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

@@ -0,0 +1,18 @@
+/****************************************************************************
+	Style of the RTA Add Fields Dialog  - HCB theme
+*****************************************************************************/
+
+.sapUiRtaMode {
+	.sapUIRtaFieldRepositoryDialog {
+		.sapMBtn:focus {
+			> .sapMFocusable {
+				outline-offset: -0.125rem; //2px
+				border-radius: 0.375rem !important;
+
+				&.sapMBtnEmphasized {
+					border: 0.125rem solid transparent;
+				}
+			}
+		}
+	}
+}

package/src/sap/ui/rta/themes/sap_hcb/Overlay.less

@@ -1,34 +1,74 @@
 /******************************************************************
 	Style of the RTA Overlays - HCB Theme
 *******************************************************************/
-@_sap_ui_rta_Overlay_BaseBG : @sapHCStandardBG;
-@_sap_ui_rta_Overlay_HoverBG : fade(lighten(@sapHCHighlightBG, 15%), 30%);
-@_sap_ui_rta_Overlay_ActiveBG : fade(lighten(@sapHCHighlightAltBG, 15%), 30%);
-@_sap_ui_rta_Overlay_Border : @sapUiDragAndDropActiveBorderColor;
+@_sap_ui_rta_Overlay_HoverBG: fade(lighten(@sapUiHcHighlightBackground, 15%), 30%); //rgba(199, 132, 0, 0.3)
+@_sap_ui_rta_Overlay_Outline: @sapUiContentHelpColor; // #03b803
+@_sap_ui_rta_Overlay_BorderColor: @sapUiContentHelpColor; //#03b803
+@_sap_ui_rta_Overlay_BoxShadowColor: @sapUiNeutralBG; //#000
+@_sap_ui_rta_Overlay_ShellBG: @sapUiNeutralBG; //#000
+@_sap_ui_rta_Overlay_FocusBorder: @sapUiNeutralElement; //#fff
+@_sap_ui_rta_Overlay_TargetZoneBG: fade(@sapUiSelected, 30%);
+@_sap_ui_rta_Overlay_PlaceholderBG: @sapUiNeutralBG; //#000
 
+.sapUiRta {
+	.sapUiDtOverlayTargetZone {
+		&:after {
+			box-shadow: none;
+		}
+
+		&.sapUiDtOverlayDropZone > .sapUiDtOverlayChildren > .sapUiDtOverlayMovable {
+			background: @_sap_ui_rta_Overlay_TargetZoneBG;
+		}
+	}
+}
 
 .sapUiRta:not(.sapUiRtaVisualizationMode) {
 	.sapUiDtOverlay {
 		&:focus {
 			outline: none;
-			/* We create inner black shadow to make sure white border is in contrast with element */
-			box-shadow: 0 0 0 2px #000 inset;
+			/* We create inner white shadow to make sure black border is in contrast with element */
+			box-shadow: 0 0 0 0.125rem @_sap_ui_rta_Overlay_BoxShadowColor inset; //2px
+
 			&:before {
-				border-width: 2px;
+				border: none;
+				outline: 0.125rem dotted @_sap_ui_rta_Overlay_FocusBorder; //2px
+				outline-offset: -0.25rem; //4px
 			}
 		}
 	}
+
+	.sapUiRtaOverlayHover {
+		&:after {
+			border: none;
+			box-shadow: none;
+			outline: 0.125rem dotted @_sap_ui_rta_Overlay_BorderColor; //2px
+			outline-offset: -0.125rem; //2px
+		}
+	}
+
 	.sapUiDtOverlaySelected {
+		box-shadow: none;
+
+		&:after {
+			border: 0.125rem solid @_sap_ui_rta_Overlay_BorderColor; //2px
+			outline: none;
+		}
+
 		&.sapUiDtOverlayFocusable {
 			&:focus {
 				/* Same trick as described above but doubled thickness */
-				box-shadow: 0 0 0 4px #000 inset;
+				box-shadow: 0 0 0 0.25rem @_sap_ui_rta_Overlay_BoxShadowColor inset; //4px
 			}
 		}
-	}
-	.sapUiRtaOverlayHover {
-		&:after {
-			border-width: 2px;
+
+		&.sapUiRtaOverlayHover {
+			&:after {
+				border: 0.125rem solid @_sap_ui_rta_Overlay_BorderColor !important; //2px
+				outline: 0.125rem dotted @_sap_ui_rta_Overlay_BorderColor !important; //2px
+				outline-offset: -0.25rem; //4px
+				transition: none;
+				box-shadow: none;
+			}
 		}
 	}
 }

package/src/sap/ui/rta/themes/sap_hcb/Toolbar.adaptation.less

@@ -0,0 +1,38 @@
+/******************************************************************
+	Style of the RTA Toolbar (type: adaptation) - sap_hcb Theme
+*******************************************************************/
+@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapUiNeutralBG; //#000000
+@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiNeutralElement; //#ffffff
+@_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorder: @sapUiNeutralElement; //#ffffff
+@_sap_ui_rta_Toolbar_Adaptation_FocusOutlineCol: @sapUiNeutralBorder; //#fff
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverTextColor: @sapUiNeutralElement; //#ffffff
+@_sap_ui_rta_Toolbar_Adaptation_BtnHoverText: @sapUiNeutralElement; //#ffffff
+
+.sapUiRtaMode {
+	.sapUiRtaToolbar.sapUiRtaToolbarAdaptation {
+		.sapMBtn {
+			&:focus .sapMFocusable {
+				outline: 0.125rem dotted @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineCol;
+				outline-offset: -0.125rem; //2px
+				border-color: transparent;
+			}
+		}
+
+		.sapMSegB {
+			.sapMSegBBtn {
+				border: none;
+
+				&.sapMSegBBtnFocusable {
+					&:focus {
+						outline: none;
+
+						.sapMSegBBtnInner {
+							outline-width: 0.125rem; //2px
+							outline-offset: -0.125rem; //2px
+						}
+					}
+				}
+			}
+		}
+	}
+}

package/src/sap/ui/rta/themes/sap_hcb/Toolbar.base.less

@@ -1,3 +1,15 @@
-.sapUiRtaToolbarContainer .sapUiRtaToolbar {
-	box-shadow: 0 0 2.5rem 0.125rem rgba(255, 255, 255, 0.8);
+/******************************************************************
+	Style of the RTA Toolbar (all types) - sap_hcb Theme
+*******************************************************************/
+@_sap_ui_rta_Toolbar_Base_BaseColor: @sapUiNeutralBG; //#000000
+@_sap_ui_rta_Toolbar_Base_BaseBG: @sapUiNeutralBG; //#000000
+@_sap_ui_rta_Toolbar_Base_TextColor: @sapUiNeutralElement; //#ffffff
+@_sap_ui_rta_Toolbar_Base_BoxShadow_DarkColor: fade(@sapUiNeutralElement, 80%); //rgba(255, 255, 255, 0.8)
+@_sap_ui_rta_Toolbar_Base_BoxShadow_LightColor: @sapUiNeutralElement; //#ffffff
+
+.sapUiRtaMode {
+	.sapUiRtaToolbar {
+		box-shadow: 0 0.625rem 2rem 0 @_sap_ui_rta_Toolbar_Base_BoxShadow_DarkColor,
+		0 0 0.625rem -0.125rem @_sap_ui_rta_Toolbar_Base_BoxShadow_LightColor; //10px 32px 10px 2px
 	}
+}

package/src/sap/ui/rta/themes/sap_hcb/Toolbar.personalization.less

@@ -1,4 +1,10 @@
+/******************************************************************
+	Style of the Personalization Toolbar - sap_hcb Theme
+*******************************************************************/
+@_sap_ui_rta_Toolbar_Personalization_BaseColor: @sapUiNeutralBG; //#000000
+@_sap_ui_rta_Toolbar_Personalization_BorderColor: @sapUiShellBorderColor; // #fff
+@_sap_ui_rta_Toolbar_Personalization_TextColor: @sapUiBaseText; // #fff
+
 .sapUiRtaToolbar.type_personalization {
-	background-color: @sapHCStandardBG;
-	border-top: @sapHCStandardFG 1px solid;
+	border-top: @_sap_ui_rta_Toolbar_Personalization_BorderColor 0.125rem solid;
 }

package/src/sap/ui/rta/themes/sap_hcb/library.source.less

@@ -7,7 +7,10 @@
 @import "../../../../../sap/ui/core/themes/sap_hcb/global.less";
 
 @import "Toolbar.base.less";
-@import "Toolbar.standalone.less";
 @import "Toolbar.personalization.less";
-
+@import "Toolbar.adaptation.less";
+@import "ChangeVisualization.less";
 @import "Overlay.less";
+@import "ContextMenu.less";
+@import "FieldRepository.less";
+@import "Dialogs.less";

package/src/sap/ui/rta/toolbar/Adaptation.fragment.xml

@@ -39,10 +39,18 @@
 						id="sapUiRta_discardDraft"
 						icon="sap-icon://delete"
 						press=".discardDraft"
-						visible="{= ((${parts: ['versions>/displayedVersion', 'versions>/versioningEnabled' ], formatter: '.formatDiscardDraftVisible'})  && (${controls>/modeSwitcher} === 'adaptation'))}"
+						visible="{parts: ['versions>/displayedVersion', 'versions>/versioningEnabled', 'controls>/modeSwitcher' ], formatter: '.formatDiscardDraftVisible'}"
 						type="Transparent"
 						text="{i18n>TOL_DISCARD_DRAFT}"
 						tooltip="{i18n>TOL_DISCARD_DRAFT}" />
+				<toolbar:OverflowToolbarButton
+						id="sapUiRta_publishVersion"
+						enabled="{versions>/publishVersionEnabled}"
+						visible="{parts: ['controls>/publishVisible', 'versions>/versioningEnabled', 'versions>/displayedVersion', 'controls>/modeSwitcher'], formatter: '.formatPublishVersionVisibility'}"
+						press=".publishVersion"
+						type="Transparent"
+						icon="sap-icon://shipping-status"
+						tooltip="{i18n>TOL_PUBLISH_VERSION}" />
 			</content>
 		</OverflowToolbar>
 	</HBox>
@@ -87,19 +95,27 @@
 		<OverflowToolbar id="sapUiRta_actionsToolbar">
 			<content>
 				<ToolbarSpacer />
-				<toolbar:OverflowToolbarButton
-						id="sapUiRta_translate"
+				<MenuButton
+						id="sapUiRta_translateMenu"
 						icon="sap-icon://translate"
-						press=".showTranslationPopover"
-						visible="{controls>/translationVisible}"
+						visible="{= ${controls>/modeSwitcher} === 'adaptation' &amp;&amp; ${controls>/translationVisible}}"
 						enabled="{controls>/translationEnabled}"
 						type="Transparent"
-						text="{i18n>BTN_TRANSLATE}"
 						tooltip="{i18n>BTN_TRANSLATE}">
-					<toolbar:layoutData>
-						<OverflowToolbarLayoutData priority="Low" />
-					</toolbar:layoutData>
-				</toolbar:OverflowToolbarButton>
+					<Menu
+							id="sapUiRta_translate"
+							class="sapUiRtaToolbarVisualizationSelection">
+						<MenuItem
+								text="{i18n>BTN_OPEN_DOWNLOAD_TRANSLATION}"
+								press=".openDownloadTranslationDialog"
+								icon="sap-icon://download"/>
+						<MenuItem
+								text="{i18n>BTN_OPEN_UPLOAD_TRANSLATION}"
+								press=".openUploadTranslationDialog"
+								enabled="{= ${translation>/sourceLanguages}.length > 0}"
+								icon="sap-icon://upload"/>
+					</Menu>
+				</MenuButton>
 				<Button
 						id="sapUiRta_toggleChangeVisualizationMenuButton"
 						visible="{= ${controls>/modeSwitcher} === 'visualization'}"
@@ -108,8 +124,7 @@
 						icon="sap-icon://slim-arrow-down"
 						iconFirst="false"
 						press=".openChangeCategorySelectionPopover"
-						tooltip="{i18n>BUT_CHANGEVISUALIZATION_SELECTCHANGES}">
-				</Button>
+						tooltip="{i18n>BUT_CHANGEVISUALIZATION_SELECTCHANGES}"/>
 				<Button
 						id="sapUiRta_undo"
 						icon="sap-icon://undo"
@@ -137,7 +152,7 @@
 				<toolbar:OverflowToolbarButton
 						id="sapUiRta_publish"
 						enabled="{controls>/publishEnabled}"
-						visible="{= (${controls>/publishVisible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
+						visible="{= (${controls>/publishVisible} &amp;&amp; !${versions>/versioningEnabled} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
 						press=".publish"
 						type="Transparent"
 						text="{i18n>BTN_PUBLISH}" >
@@ -192,7 +207,7 @@
 				<toolbar:OverflowToolbarButton
 						id="sapUiRta_saveAs"
 						visible="{= (${controls>/saveAsVisible} &amp;&amp; ${controls>/modeSwitcher} === 'adaptation')}"
-						enabled="{controls>/saveAsEnabled}"
+						enabled="{parts: ['controls>/saveAsEnabled', 'versions>/displayedVersion'], formatter: '.formatSaveAsEnabled'}"
 						press=".saveAs"
 						type="Transparent"
 						text="{i18n>BTN_SAVE_AS}" >