@openui5/themelib_sap_belize 1.101.0 → 1.102.2

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

@@ -1,12 +1,16 @@
 /******************************************************************
 	Style of Dialogs shown in RTA - sap_belize_3_hcb Theme
 *******************************************************************/
-@_sap_ui_rta_Dialogs_Border_LightColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Dialogs_Border_DarkColor: @sapUiBlackBG; //#000000
-@_sap_ui_rta_Dialogs_BoxShadowColor: fade(@sapUiWhite, 80%); //rgba(255, 255, 255, 0.8)
+@_sap_ui_rta_Dialogs_BorderLightColor: @sapUiNeutralElement; //#ffffff
+@_sap_ui_rta_Dialogs_BorderDarkColor: @sapUiNeutralBG; //#000000
+@_sap_ui_rta_Dialogs_BoxShadowColor: fade(@sapUiNeutralElement, 80%); //rgba(255, 255, 255, 0.8)
 
 .sapMDialog.sapUiRTABorder {
-	border: 0.1875rem solid @_sap_ui_rta_Dialogs_Border_LightColor; //3px
-	border-image: repeating-linear-gradient( -45deg, @_sap_ui_rta_Dialogs_Border_DarkColor, @_sap_ui_rta_Dialogs_Border_DarkColor 5px, @_sap_ui_rta_Dialogs_Border_LightColor 5px, @_sap_ui_rta_Dialogs_Border_LightColor 10px) 4;
-	box-shadow: 0 10px 64px 0 @_sap_ui_rta_Dialogs_BoxShadowColor, 0 0 10px -2px @_sap_ui_rta_Dialogs_Border_LightColor;
+	box-shadow: 0 0.625rem 4rem 0 @_sap_ui_rta_Dialogs_BoxShadowColor, 0 0 0.625rem -0.125rem @_sap_ui_rta_Dialogs_BorderLightColor;
+}
+
+.sapUiRtaPopover {
+	&.sapMPopover, .sapMPopover {
+		box-shadow: 0 0.625rem 4rem 0 @_sap_ui_rta_Dialogs_BoxShadowColor, 0 0 0.625rem -0.125rem @_sap_ui_rta_Dialogs_BorderLightColor;
+	}
 }

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

@@ -1,21 +1,12 @@
 /*****************************************************************************
 	Style of the RTA Add Fields Dialog  - sap_belize_hcb Theme
 ******************************************************************************/
-@_sap_ui_rta_FieldRepository_BGColor: @sapHC_HighlightBackground; //#7a5100;
-
 .sapUiRtaMode {
-
 	.sapUIRtaFieldRepositoryDialog {
 		.sapMBtn:hover {
 			> .sapMBtnHoverable {
 				outline: none;
 			}
 		}
-
-		.sapMLIBHoverable {
-			&:hover {
-				background: @sap_ui_rta_FieldRepository_ListHoverBG;
-			}
-		}
 	}
 }

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

@@ -2,11 +2,11 @@
 	Style of the RTA Overlays - sap_belize_hcb Theme
 *******************************************************************/
 @_sap_ui_rta_Overlay_BorderColor: @sapUiDragAndDropActiveBorderColor; //#03b803
-@_sap_ui_rta_Overlay_BoxShadowColor: @sapUiBlackBG; //#000000
-@_sap_ui_rta_Overlay_BaseBG: @sapUiBlackBG; //#000000
-@_sap_ui_rta_Overlay_ActiveBG: fade(lighten(@sapHC_HighlightAltBackground, 15%), 30%); //rgba(22, 137, 217, 0.3)
-@_sap_ui_rta_Overlay_HoverBorder: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Overlay_Border: @sapUiDragAndDropActiveBorderColor; //#03b803
+@_sap_ui_rta_Overlay_BoxShadowColor: @sapUiNeutralBG; //#000
+@_sap_ui_rta_Overlay_ShellBG: @sapUiNeutralBG; //#000
+@_sap_ui_rta_Overlay_HoverBorder: @sapUiNeutralElement; //#fff
+@_sap_ui_rta_Overlay_PlaceholderBG: @sapUiContentDisabledTextColor; //#666
+
 
 .sapUiRta {
 	.sapUiDtOverlayTargetZone {
@@ -15,6 +15,14 @@
 			box-shadow: none;
 		}
 	}
+
+	.sapUiDtOverlayDropZone {
+		> .sapUiDtOverlayChildren {
+			> .sapUiRtaOverlayPlaceholder {
+				opacity: 0.7;
+			}
+		}
+	}
 }
 
 .sapUiRta:not(.sapUiRtaVisualizationMode) {
@@ -27,6 +35,7 @@
 			box-shadow: none;
 		}
 	}
+
 	.sapUiDtOverlay {
 		&:focus {
 			outline: none;
@@ -40,6 +49,7 @@
 			}
 		}
 	}
+
 	.sapUiDtOverlaySelected {
 		transition: none;
 		box-shadow: none;
@@ -50,22 +60,12 @@
 				box-shadow: 0 0 0 4px @_sap_ui_rta_Overlay_BoxShadowColor inset;
 			}
 		}
-		&.sapUiRtaOverlayHover{
+
+		&.sapUiRtaOverlayHover {
 			&:after {
-				border: 0.125rem solid @_sap_ui_rta_Overlay_BorderColor!important; //2px
+				border: 0.125rem solid @_sap_ui_rta_Overlay_BorderColor !important; //2px
 				outline-offset: -0.25rem; //4px
 			}
 		}
 	}
-}
-
-.sapUiRtaMode .sapUiShellBackgroundImage.sapUiGlobalBackgroundImageForce.sapUshellShellBG {
-	background-color: @_sap_ui_rta_Overlay_BaseBG;
-	background-image:  none;
-}
-
-.sapUiRtaMode .sapUshellViewPortCenter,
-.sapUiRtaMode .sapMShellBG,
-.sapUiRtaMode .sapUiRtaToolbar {
-	background-color: @_sap_ui_rta_Overlay_BaseBG;
 }

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

@@ -1,12 +1,7 @@
 /******************************************************************
 	Style of the RTA Toolbar (type: adaptation) - belize_hcb Theme
 *******************************************************************/
-@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapUiBlackBG; //#000000
-@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Toolbar_Adaptation_BoxShadowColor: fade(@sapUiWhite, 80%); //rgba(255, 255, 255, 0.8)
-
-.sapUiRtaMode {
-	.sapUiRtaToolbar.sapUiRtaToolbarAdaptation {
-		box-shadow: 0 10px 32px 0 @_sap_ui_rta_Toolbar_Adaptation_BoxShadowColor, 0 0 10px -2px @_sap_ui_rta_Toolbar_Adaptation_TextColor;
-	}
-}
+@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapUiNeutralBG; //#000000
+@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiNeutralElement; //#ffffff
+@_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor: @sapUiCriticalText; //#ffab1d
+@_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor: @sapUiContentHelpColor; //#03b803

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

@@ -1,73 +1,15 @@
 /******************************************************************
 	Style of the RTA Toolbar (all types) - belize_hcb Theme
 *******************************************************************/
-@_sap_ui_rta_Toolbar_Base_BaseColor: @sapUiBlackBG; //#000000
-@_sap_ui_rta_Toolbar_Base_TextColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Toolbar_Base_HoverColor: @sapHC_HighlightBackground; //#7a5100
+@_sap_ui_rta_Toolbar_Base_BaseColor: @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
+@_sap_ui_rta_Toolbar_Base_BaseBG: @sapUiNeutralBG; //#000000
 
 .sapUiRtaMode {
-
-	.sapUiRtaToolbar {
-
-		.sapMSegBBtn.sapMSegBBtnFocusable {
-
-			&:hover .sapMSegBBtnInner,
-			&.sapMSegBBtnSel:hover .sapMSegBBtnInner {
-				background-color: @_sap_ui_rta_Toolbar_Base_HoverColor;
-				color: @_sap_ui_rta_Toolbar_Base_TextColor;
-			}
-
-			&.sapMSegBBtnSel:hover .sapMSegBBtnInner::after {
-				border-bottom: 0.125rem solid @_sap_ui_rta_Toolbar_Base_TextColor; //2px
-			}
-
-			&:focus .sapMSegBBtnInner {
-				outline: 0.125rem dotted @_sap_ui_rta_Toolbar_Base_TextColor; //2px
-				outline-offset: -0.0625rem; //1px
-			}
-		}
-
-		.sapMSegBBtnFocusable.sapMBtnActive:hover {
-			.sapMSegBBtnInner {
-				background-color: @_sap_ui_rta_Toolbar_Base_BaseColor;
-			}
-
-			& .sapMSegBBtnInner::after {
-				border-bottom: 0.125rem solid @_sap_ui_rta_Toolbar_Base_TextColor; //2px
-			}
-		}
-
-		.sapMSegB .sapMSegBBtn.sapMSegBtnLastVisibleButton:not(.sapMSegBBtnDis) .sapMSegBBtnInner {
-			border-right: none;
-		}
-
-		.sapMSegBBtnFocusable:active + .sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInner,
-		.sapMSegBBtnFocusable:focus + .sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInner {
-			border-left: none;
-		}
-		.sapMBtn:focus > .sapMFocusable {
-			outline: 0.125rem dotted @sapUiWhite; //2px
-			border-color: transparent;
-		}
-		.sapUiRtaToolbarSwitcherSection {
-			.sapMSegBBtn:hover {
-				.sapUiIcon,
-				&.sapMSegBBtnSel .sapMSegBBtnInner .sapUiIcon {
-					color: @_sap_ui_rta_Toolbar_Base_TextColor;
-				}
-			}
-		}
-	}
-}
-
-.sapUiSizeCozy{
 	.sapUiRtaToolbar {
-		.sapMSegBBtn.sapMSegBBtnFocusable {
-			&:focus {
-				.sapMSegBBtnInner {
-					outline-offset: -0.25rem; //4px
-				}
-			}
-		}
+		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_belize_hcb/Toolbar.personalization.less

@@ -1,9 +1,9 @@
 /****************************************************************************
 	Style of the RTA Toolbar (type: personalization) - sap_belize_hcb Theme
 *****************************************************************************/
-@_sap_ui_rta_Toolbar_Personalization_BaseColor: @sapUiBlackBG; //#000000
-@_sap_ui_rta_Toolbar_Personalization_TopBorder: @sapUiWhite; //#ffffff
+@_sap_ui_rta_Toolbar_Personalization_BaseColor: @sapUiNeutralBG; //#000000
+@_sap_ui_rta_Toolbar_Personalization_BorderColor: @sapUiShellBorderColor; // #fff
 
 .sapUiRtaToolbar.type_personalization {
-	border-top: @_sap_ui_rta_Toolbar_Personalization_TopBorder 0.0625rem solid; //1px
+	border-top: @_sap_ui_rta_Toolbar_Personalization_BorderColor 0.125rem solid;
 }

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

@@ -13,6 +13,6 @@
 @import "Dialogs.less";
 @import "FieldRepository.less";
 @import "Toolbar.base.less";
-@import "Toolbar.standalone.less";
 @import "Toolbar.personalization.less";
-@import "Toolbar.adaptation.less";
+@import "Toolbar.adaptation.less";
+@import "ChangeVisualization.less";

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

@@ -0,0 +1,15 @@
+/******************************************************************
+	Style of the RTA Change Visualization - Quartz hcw theme
+*******************************************************************/
+@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorLight: @sapUiPositiveText; //#006362
+@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium: @sapUiActive; //#ec8b46
+@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark: lighten(@sapUiChart8, 20%); //#e52faa
+@_sap_ui_rta_ChangeVisualization_OverlayOutline: @sapUiIndication5; //#004ccb
+
+.sapUiDtOverlay {
+	.sapUiRtaChangeIndicatorHovered {
+		&:after {
+			box-shadow: none;
+		}
+	}
+}

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

@@ -1,41 +1,17 @@
 /******************************************************************
 	Style of the RTA Contextmenu - sap_belize_hcw Theme
 *******************************************************************/
-@_sap_ui_rta_ContextMenu_Border_LightColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_ContextMenu_Border_DarkColor: @sapUiBlackBG; //#000000
-@_sap_ui_rta_ContextMenu_BoxShadowColor: fade(@sapUiBlackBG, 50%); //rgba(0, 0, 0, 0.5)
+@_sap_ui_rta_ContextMenu_Border_LightColor: @sapUiNeutralBorder; //#ffffff
+@_sap_ui_rta_ContextMenu_Border_DarkColor: @sapUiNeutralBG; //#000000
+@_sap_ui_rta_ContextMenu_BoxShadow_DarkColor: fade(@sapUiContentShadowColor, 50%); //rgba(0, 0, 0, 0.5)
+@_sap_ui_rta_ContextMenu_BoxShadow_LightColor: @sapUiNeutralBorder; //#ffffff
 
-.sapUiRtaMode {
 
+.sapUiRtaMode {
 	.sapUiDtContextMenu {
-
-		&.sapMPopover, .sapMPopover {
-			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 4px, @_sap_ui_rta_ContextMenu_Border_LightColor 4px, @_sap_ui_rta_ContextMenu_Border_LightColor 6px) 4;
-			box-shadow: 0 10px 32px 0 @_sap_ui_rta_ContextMenu_BoxShadowColor, 0 0 10px -2px @_sap_ui_rta_ContextMenu_Border_DarkColor;
-		}
-
-		&.sapMPopoverArr, .sapMPopoverArr {
-			width: 2rem; //32px
-			height: 2rem; //32px
-			bottom: -2rem; //32px
-			left: 0.25rem !important; //4px
-			&:after {
-				box-shadow: 0 64px 32px 0 @_sap_ui_rta_ContextMenu_BoxShadowColor, 0 0 10px -3px @_sap_ui_rta_ContextMenu_Border_DarkColor;
-				border: 0.125rem solid @_sap_ui_rta_ContextMenu_Border_LightColor; //2px
-				border-image: repeating-linear-gradient( -50deg, @_sap_ui_rta_ContextMenu_Border_DarkColor, @_sap_ui_rta_ContextMenu_Border_DarkColor 3px, @_sap_ui_rta_ContextMenu_Border_LightColor 3px, @_sap_ui_rta_ContextMenu_Border_LightColor 5px) 4;
-				width: 1rem; //16px
-				height: 1rem; //16px
-				margin: -0.65rem 0 0 0.35rem; //10px 6px
-			}
-			&.sapMPopoverArrUp {
-				height: 1rem; //16px
-				top: -1rem; //16px
-				&:after {
-					box-shadow: 0 -64px 32px 0 @_sap_ui_rta_ContextMenu_BoxShadowColor, 0 0 10px -3px @_sap_ui_rta_ContextMenu_Border_DarkColor;
-					margin: 0.35rem 0 0 0.35rem; //6px 6px
-				}
-			}
+		&.sapMMenu {
+			box-shadow: 0 0.625rem 2rem 0 @_sap_ui_rta_ContextMenu_BoxShadow_DarkColor,
+			0 0 0.625rem -0.125rem @_sap_ui_rta_ContextMenu_BoxShadow_LightColor; //10px 32px 10px 2px
 		}
 	}
 }

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

@@ -1,12 +1,17 @@
 /******************************************************************
 	Style of Dialogs shown in RTA - sap_belize_hcw Theme
 *******************************************************************/
-@_sap_ui_rta_Dialogs_Border_LightColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Dialogs_Border_DarkColor: @sapUiBlackBG; //#000000
-@_sap_ui_rta_Dialogs_BoxShadowColor: fade(@sapUiBlackBG, 50%); //rgba(0, 0, 0, 0.5)
+@_sap_ui_rta_Dialogs_BorderLightColor: @sapUiNeutralBG; //#ffffff
+@_sap_ui_rta_Dialogs_BorderDarkColor: @sapUiNeutralElement; //#000000
+@_sap_ui_rta_Dialogs_BoxShadowColor: fade(@sapUiNeutralElement, 50%); //rgba(0, 0, 0, 0.5)
 
 .sapMDialog.sapUiRTABorder {
-	border: 0.1875rem solid @_sap_ui_rta_Dialogs_Border_LightColor; //3px
-	border-image: repeating-linear-gradient( -45deg, @_sap_ui_rta_Dialogs_Border_DarkColor, @_sap_ui_rta_Dialogs_Border_DarkColor 5px, @_sap_ui_rta_Dialogs_Border_LightColor 5px, @_sap_ui_rta_Dialogs_Border_LightColor 10px) 4;
-	box-shadow: 0 10px 64px 0 @_sap_ui_rta_Dialogs_BoxShadowColor, 0 0 10px -4px @_sap_ui_rta_Dialogs_Border_DarkColor;
+	box-shadow: 0 0.625rem 4rem 0 @_sap_ui_rta_Dialogs_BoxShadowColor, 0 0 0.625rem -0.125rem @_sap_ui_rta_Dialogs_BorderLightColor;
 }
+
+.sapUiRtaPopover {
+	&.sapMPopover, .sapMPopover {
+		box-shadow: 0 0.625rem 4rem 0 @_sap_ui_rta_Dialogs_BoxShadowColor, 0 0 0.625rem -0.125rem @_sap_ui_rta_Dialogs_BorderLightColor;
+
+	}
+}

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

@@ -1,8 +1,6 @@
 /******************************************************************
 	Style of the RTA Add Fields Dialog  - sap_belize_hcw Theme
 *******************************************************************/
-@_sap_ui_rta_FieldRepository_BGColor: @sapHC_HighlightBackground; //#ec8b46;
-
 .sapUiRtaMode {
 	.sapUIRtaFieldRepositoryDialog {
 		.sapMBtn:hover {

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

@@ -1,10 +1,10 @@
 /******************************************************************
 	Style of the RTA Overlays - sap_belize_hcw Theme
 *******************************************************************/
-@_sap_ui_rta_Overlay_BorderColor: @sapUiAccent6; //#004ccb
-@_sap_ui_rta_Overlay_BoxShadowColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Overlay_BGColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Overlay_HoverBorder: @sapUiBlackBG; //#000000
+@_sap_ui_rta_Overlay_BorderColor: @sapUiIndication5; //#004ccb
+@_sap_ui_rta_Overlay_BoxShadowColor: @sapUiNeutralBG; //#ffffff
+@_sap_ui_rta_Overlay_ShellBG: @sapUiNeutralBG; //#fff
+@_sap_ui_rta_Overlay_HoverBorder: @sapUiNeutralElement; //#000000
 
 .sapUiRta {
 	.sapUiDtOverlayTargetZone {
@@ -13,6 +13,14 @@
 			box-shadow: none;
 		}
 	}
+
+	.sapUiDtOverlayDropZone {
+		> .sapUiDtOverlayChildren {
+			> .sapUiRtaOverlayPlaceholder {
+				opacity: 0.7;
+			}
+		}
+	}
 }
 
 .sapUiRta:not(.sapUiRtaVisualizationMode) {
@@ -25,6 +33,7 @@
 			outline-offset: -0.125rem; //2px
 		}
 	}
+
 	.sapUiDtOverlay {
 		&:focus {
 			outline: none;
@@ -38,6 +47,7 @@
 			}
 		}
 	}
+
 	.sapUiDtOverlaySelected {
 		transition: none;
 		box-shadow: none;
@@ -46,31 +56,22 @@
 			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 @_sap_ui_rta_Overlay_BoxShadowColor inset;
 			}
 		}
+
 		&.sapUiRtaOverlayHover {
 			&:after {
-				border: 0.125rem solid @_sap_ui_rta_Overlay_BorderColor!important; //2px
-				outline: 0.125rem dotted @_sap_ui_rta_Overlay_BorderColor!important; //2px
+				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;
 			}
 		}
 	}
-}
-
-.sapUiRtaMode .sapUiShellBackgroundImage.sapUiGlobalBackgroundImageForce.sapUshellShellBG {
-	background-color: @_sap_ui_rta_Overlay_BGColor;
-	background-image:  none;
-}
-
-.sapUiRtaMode .sapUshellViewPortCenter,
-.sapUiRtaMode .sapMShellBG,
-.sapUiRtaMode .sapUiRtaToolbar {
-	background-color: @_sap_ui_rta_Overlay_BGColor;
 }

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

@@ -1,11 +1,9 @@
 /******************************************************************
 	Style of the RTA Toolbar (type: adaptation) - belize_hcw Theme
 *******************************************************************/
-@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiBlackBG; //#000000
-
-.sapUiRtaMode {
-	.sapUiRtaToolbar.sapUiRtaToolbarAdaptation {
-		box-shadow: 0 10px 32px 0 rgba(0, 0, 0, 0.5), 0 0 10px -2px @_sap_ui_rta_Toolbar_Adaptation_TextColor;
-	}
-}
+@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapUiNeutralBG; //#ffffff
+@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiNeutralElement; //#000000
+@_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorder: @sapUiNeutralElement; //#000000
+@_sap_ui_rta_Toolbar_Adaptation_FocusOutlineCol: @sapUiNeutralBorder; //#000000
+@_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor: darken(@sapUiActive, 19%); //#be5a13
+@_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor: @sapUiContentHelpColor; //#006500

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

@@ -1,72 +1,8 @@
 /******************************************************************
 	Style of the RTA Toolbar (all types) - belize_hcw Theme
 *******************************************************************/
-@_sap_ui_rta_Toolbar_Base_BaseColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Toolbar_Base_TextColor: @sapUiBlackBG; //#000000
-
-.sapUiRtaMode {
-
-	.sapUiRtaToolbar {
-
-		.sapMSegBBtn.sapMSegBBtnFocusable {
-
-			&:hover .sapMSegBBtnInner,
-			&.sapMSegBBtnSel:hover .sapMSegBBtnInner {
-				background-color: @sapHC_HighlightBackground;
-				color: @_sap_ui_rta_Toolbar_Base_TextColor;
-			}
-
-			&.sapMSegBBtnSel:hover .sapMSegBBtnInner::after {
-				border-bottom: 0.125rem solid @_sap_ui_rta_Toolbar_Base_TextColor; //2px
-			}
-
-			&:focus .sapMSegBBtnInner {
-				outline: 0.125rem dotted @_sap_ui_rta_Toolbar_Base_TextColor; //2px
-				outline-offset: -0.0625rem; //1px
-			}
-		}
-
-		.sapMSegBBtnFocusable.sapMBtnActive:hover {
-			.sapMSegBBtnInner {
-				background-color: @_sap_ui_rta_Toolbar_Base_BaseColor;
-			}
-
-			& .sapMSegBBtnInner::after {
-				border-bottom: 0.125rem solid @_sap_ui_rta_Toolbar_Base_TextColor; //2px
-			}
-		}
-
-		.sapMSegB .sapMSegBBtn.sapMSegBtnLastVisibleButton:not(.sapMSegBBtnDis) .sapMSegBBtnInner {
-			border-right: none;
-		}
-
-		.sapMSegBBtnFocusable:active + .sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInner,
-		.sapMSegBBtnFocusable:focus + .sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInner {
-			border-left: none;
-		}
-		.sapMBtn:focus > .sapMFocusable {
-			outline: 0.125rem dotted @sapUiBlackBG; //2px
-			border-color: transparent;
-		}
-		.sapUiRtaToolbarSwitcherSection {
-			.sapMSegBBtn:hover {
-				.sapUiIcon,
-				&.sapMSegBBtnSel .sapMSegBBtnInner .sapUiIcon {
-					color: @_sap_ui_rta_Toolbar_Base_TextColor;
-				}
-			}
-		}
-	}
-}
-
-.sapUiSizeCozy{
-	.sapUiRtaToolbar {
-		.sapMSegBBtn.sapMSegBBtnFocusable {
-			&:focus {
-				.sapMSegBBtnInner {
-					outline-offset: -0.25rem; //4px
-				}
-			}
-		}
-	}
-}
+@_sap_ui_rta_Toolbar_Base_BaseColor: @sapUiNeutralBG; //#ffffff
+@_sap_ui_rta_Toolbar_Base_TextColor: @sapUiNeutralElement; //#000000
+@_sap_ui_rta_Toolbar_Base_BoxShadow_DarkColor: fade(@sapUiNeutralElement, 80%); //rgba(0, 0, 0, 0.8)
+@_sap_ui_rta_Toolbar_Base_BoxShadow_LightColor: @sapUiNeutralBG; //#ffffff
+@_sap_ui_rta_Toolbar_Base_BaseBG: @sapUiNeutralBG; //#ffffff

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

@@ -1,14 +1,10 @@
 /****************************************************************************
 	Style of the RTA Toolbar (type: personalization) - sap_belize_hcw Theme
 *****************************************************************************/
-@_sap_ui_rta_Toolbar_Personalization_BaseColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Toolbar_Personalization_TextColor: @sapUiBlackBG; //#000
+@_sap_ui_rta_Toolbar_Personalization_BaseColor: @sapUiNeutralBG; //#ffffff
+@_sap_ui_rta_Toolbar_Personalization_TextColor: @sapUiShellBorderColor; //#000
+@_sap_ui_rta_Toolbar_Personalization_BorderColor: @sapUiShellBorderColor; // #000
 
 .sapUiRtaToolbar.type_personalization {
-	border-top: @sapHC_StandardForeground 0.0625rem solid; //1px
-	.sapMBtn .sapMBtnTransparent.sapMBtnInner .sapMBtnContent {
-		color: @_sap_ui_rta_Toolbar_Personalization_TextColor;
-		font-weight: bold;
-		text-shadow: none;
-	}
+	border-top: @_sap_ui_rta_Toolbar_Personalization_BorderColor 0.125rem solid;
 }

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

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

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

@@ -1,4 +1,8 @@
 /******************************************************************
 	Style of the RTA Overlays - Belize Plus Theme
 *******************************************************************/
-@_sap_ui_rta_Overlay_BaseBG: @sapBackgroundColor;
+@_sap_ui_rta_Overlay_ShellBG: transparent;
+
+.sapUiRtaMode .sapUiShellBackgroundImage.sapUiGlobalBackgroundImageForce.sapUshellShellBG {
+	background-image: linear-gradient(to bottom, #2a4863, #9dc0de);
+}

package/src/sap/ui/unified/themes/sap_belize/CalendarLegend.less

@@ -7,4 +7,8 @@
 
 .sapUiUnifiedLegendNonWorkingDay > .sapUiUnifiedLegendSquare > .sapUiUnifiedLegendSquareColor {
 	background: @_sap_ui_unified_CalendarLegend_sapUiUnifiedLegendNonWorkingDay;
+}
+
+.sapUiUnifiedLegendSquareColor {
+	border-radius: 0;
 }

package/src/sap/ui/unified/themes/sap_belize_hcb/CalendarLegend.less

@@ -13,6 +13,10 @@
 	box-shadow: @sapUiShadowLevel3;
 }
 
+.sapUiUnifiedLegendSquareColor {
+	border-radius: 0;
+}
+
 /*** compact mode (desktop size) ***/
 
 .sapUiSizeCompact .sapUiUnifiedLegend,

package/src/sap/ui/unified/themes/sap_belize_hcw/CalendarLegend.less

@@ -13,6 +13,10 @@
 	box-shadow: @sapUiShadowLevel3;
 }
 
+.sapUiUnifiedLegendSquareColor {
+	border-radius: 0;
+}
+
 /*** compact mode (desktop size) ***/
 
 .sapUiSizeCompact .sapUiUnifiedLegend,

package/src/sap/ui/unified/themes/sap_belize_plus/CalendarLegend.less

@@ -6,4 +6,8 @@
 /*** items and colors ***/
 
 @_sap_ui_unified_CalendarLegend_sapUiUnifiedLegendWorkingDay: lighten(@sapUiContentForegroundColor, 1);
-@_sap_ui_unified_CalendarLegend_sapUiUnifiedLegendNonWorkingDay: darken(@sapUiContentForegroundColor, 5);
+@_sap_ui_unified_CalendarLegend_sapUiUnifiedLegendNonWorkingDay: darken(@sapUiContentForegroundColor, 5);
+
+.sapUiUnifiedLegendSquareColor {
+	border-radius: 0;
+}

package/src/sap/ui/dt/themes/sap_belize_hcw/ContextMenu.less

@@ -1,15 +0,0 @@
-/******************************************************************
-	Style of the DT Contextmenu - sap_belize_hcw Theme
-*******************************************************************/
-@_sap_ui_dt_ContextMenu_BorderColor: @sapUiBlackBG; //#000000
-
-.sapUiDtContextMenu {
-
-	&.sapMPopoverArr, .sapMPopoverArr {
-		&:after {
-			box-shadow: 0 0 0 1px @_sap_ui_dt_ContextMenu_BorderColor;
-			border: none;
-			margin: -0.375rem 0 0 0.125rem;  //-6px 0 0 2px
-		}
-	}
-}