@openui5/themelib_sap_horizon 1.126.1 → 1.128.0

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

@@ -1,45 +1,40 @@
 /********************************************************************
 	Style of the RTA Toolbar (type: adaptation) - Horizon Dark Theme
 *********************************************************************/
-@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapUiToolbarBackground; //#1d232a
 @_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiShellTextColor; //#eaecee
-@_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorder: @sapUiShellTextColor; //#eaecee
-@_sap_ui_rta_Toolbar_Adaptation_BtnHoverText: @sapUiShellTextColor; //#eaecee
-@_sap_ui_rta_Toolbar_Adaptation_FocusColor: @sapUiContentContrastFocusColor; //#fff
-@_sap_ui_rta_Toolbar_Adaptation_FocusOutlineCol: @sapUiSelected; //#4db1ff
+@_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorderColor: transparent;
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnTextColor: @sapUiButtonEmphasizedTextColor; //#fff
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnBackgroundColor: @sapUiShellBorderColor; //#1d232a
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverBackgroundColor: @sapUiButtonHoverBorderColor; //#3a4a5a
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnFocusColor: @sapUiShellBorderColor; //#1d232a
+@_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelectedBackgroundColor: darken(@sapUiButtonEmphasizedBackground, 5%); //#0064d9
 @_sap_ui_rta_Toolbar_Adaptation_BorderRadius: @sapUiButtonBorderCornerRadius; //0.5rem
-@_sap_ui_rta_Toolbar_Adaptation_BtnFocusBorder: transparent;
-@_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverTextColor: @sapUiShellTextColor; //#eaecee
-@_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelHoverBG: @sapUiButtonEmphasizedHoverBackground; //#0064d9
-@_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverBG: fade(@sapUiNeutral, 30); //#474e56
-@_sap_ui_rta_Toolbar_Adaptation_SegBBtnBG: @sapUiButtonEmphasizedBackground; //	#0070f2
-@_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor: @sapUiCriticalElement; //#f7bf00
-@_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor: @sapUiPositiveText; //#97dd40
-@_sap_ui_rta_Toolbar_Adaptation_VersionHistoryHover: @sapUiListSelectionBackgroundColor; //#1d2d3e
-@_sap_ui_rta_Toolbar_Adaptation_BaseColorLight: @sapUiListHoverBackground; // #232b33
+@_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor: darken(@sapUiContentRatedColor, 10%); //#ffd33f
+@_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor: @sapUiShellPositiveColor; //#97dd40
+@_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor: @sapUiContentFocusColor; //#9ad3ff
+@_sap_ui_rta_Toolbar_Adaptation_VersionListBackgroundColor: @sapUiShellBorderColor; //#1d232a
 
 .sapUiRtaMode {
 	.sapUiRtaToolbar.sapUiRtaToolbarAdaptation {
 
+		//Segmented Buttons
 		.sapMSegB {
+			background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnBackgroundColor;
 			.sapMSegBBtn {
-				margin: 0 0.125rem;
-
 				.sapMSegBBtnInnerWrapper {
+					background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnBackgroundColor;
 					border: none;
-					background-color: @_sap_ui_rta_Toolbar_Adaptation_BaseColor;
 				}
 
 				&.sapMSegBBtnFocusable {
+					.sapMSegBBtnInner {
+						color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+					}
 					&.sapMSegBBtnSel:focus .sapMSegBBtnInner {
-						outline: 0.0625rem solid @_sap_ui_rta_Toolbar_Adaptation_FocusColor; //1px
+						outline: 0.0625rem solid @_sap_ui_rta_Toolbar_Adaptation_SegBBtnFocusColor; //1px
 						outline-offset: -0.125rem; //2px
 					}
 
-					&:hover .sapMSegBBtnInner {
-						background-color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverBG;
-					}
-
 					&:focus .sapMSegBBtnInner {
 						outline: none;
 
@@ -48,31 +43,53 @@
 							top: 0.0625rem;
 							right: 0.0625rem;
 							bottom: 0.0625rem;
-							border: 0.125rem solid @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineCol;
-							border-radius: 0.375rem;
 						}
 					}
+					&:hover .sapMSegBBtnInner {
+						background-color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnHoverBackgroundColor;
+					}
 
 					&.sapMSegBBtnSel {
 						&:hover .sapMSegBBtnInner {
-							background-color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelHoverBG;
-							color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
-
 							&:after {
 								content: none;
 							}
 						}
 
 						& .sapMSegBBtnInner {
-							background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnBG;
-							color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+							background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelectedBackgroundColor;
+							color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnTextColor;
 
 							&:after {
 								content: none;
 							}
 
 							.sapUiIcon {
-								color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+								color: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnTextColor;
+							}
+						}
+					}
+				}
+			}
+			&.sapMSegBIcons {
+				.sapMSegBBtn {
+					&.sapMSegBBtnFocusable {
+						&:not(.sapMSegBBtnSel):focus {
+							.sapMSegBBtnInner {
+								outline: 0.125rem solid @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor; //1px
+								border-radius: @_sap_ui_rta_Toolbar_Adaptation_BorderRadius;
+								outline-offset: -0.125rem;
+
+								&:after {
+									content: none;
+								}
+							}
+						}
+						&.sapMSegBBtnSel:focus {
+							.sapMSegBBtnInner {
+								&:after {
+									content: none;
+								}
 							}
 						}
 					}
@@ -80,10 +97,18 @@
 			}
 		}
 
-		.sapMBtn {
+		//Buttons
+		.sapMBtn:not(.sapUiRtaVersionButton) {
 			&.sapMBtnDisabled .sapMBtnInner {
 				opacity: 1.0;
 			}
+			&:not(:hover){
+				.sapMBtnTransparent,
+				.sapMBtnTransparent bdi,
+				.sapMBtnTransparent>.sapMBtnIcon {
+					color: @_sap_ui_rta_Toolbar_Adaptation_TextColor!important;
+				}
+			}
 		}
 
 		.sapMTB:not(.sapMTB-Info-CTX) {
@@ -93,7 +118,8 @@
 
 		.sapUiRtaVersionButton.sapUiRtaDraftVersionAccent {
 			&:hover {
-				> span > span > bdi {
+				> span > span > bdi,
+				> span > span.sapMBtnIcon {
 					color: @_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor !important;
 				}
 			}
@@ -101,17 +127,21 @@
 
 		.sapUiRtaVersionButton.sapUiRtaActiveVersionAccent {
 			&:hover {
-				> span > span > bdi {
+				> span > span > bdi,
+				> span > span.sapMBtnIcon{
 					color: @_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor !important;
 				}
 			}
 		}
+
 	}
 	.sapUiRtaVersionHistory {
-		border: 0.0625rem solid fade(@sapUiNeutralBorder, 35%);
+		.sapMLIB:not(:hover) {
+			background: @_sap_ui_rta_Toolbar_Adaptation_VersionListBackgroundColor;
+		}
 		.sapMLIBHoverable:hover {
-			outline: 0.125rem solid @sapUiSelected;
-			border-radius: 0.375rem;
+			outline: 0.125rem solid @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor;
+			border-radius: @_sap_ui_rta_Toolbar_Adaptation_BorderRadius;
 			outline-offset: -0.125rem;
 		}
 	}

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

@@ -1,8 +1,8 @@
 /******************************************************************
 	Style of the RTA Toolbar (all types) - Horizon Dark Theme
 *******************************************************************/
-@_sap_ui_rta_Toolbar_Base_BaseBG: @sapUiToolbarBackground; //#1d232a
-@_sap_ui_rta_Toolbar_Base_OutlineColor: @sapUiButtonEmphasizedBorderColor; //#0070f2
+@_sap_ui_rta_Toolbar_Base_BackgroundColor: @sapUiShellBorderColor; //#1d232a
+@_sap_ui_rta_Toolbar_Base_OutlineColor: @sapUiShellSelectedTextColor; //#4db1ff
 
 .sapUiRtaMode {
 	.sapUiRtaToolbar {

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

@@ -7,11 +7,11 @@
 @import "../../../../../sap/ui/core/themes/sap_horizon_dark/base.less";
 @import "../../../../../sap/ui/core/themes/sap_horizon_dark/global.less";
 
-@import "Overlay.less";
+@import "AddIFrame.less";
+@import "ChangeVisualization.less";
 @import "ContextMenu.less";
 @import "Dialogs.less";
-@import "AddIFrame.less";
 @import "FieldRepository.less";
+@import "Overlay.less";
 @import "Toolbar.adaptation.less";
-@import "Toolbar.base.less";
-@import "ChangeVisualization.less";
+@import "Toolbar.base.less";

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

@@ -4,13 +4,14 @@
 @_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
-@_sap_ui_rta_ChangeVisualization_BorderRadius: @sapUiButtonBorderCornerRadius;
+@_sap_ui_rta_ChangeVisualization_OverlayOutlineColor: darken(@sapUiSuccessBorder, 25%); //#4c994c
+@_sap_ui_rta_ChangeVisualization_BorderRadius: @sapUiButtonBorderCornerRadius; // 0.375rem
 
 .sapUiDtOverlay {
 	.sapUiRtaChangeIndicatorHovered {
 		&:after {
 			box-shadow: none;
+			border-radius: @_sap_ui_rta_ChangeVisualization_BorderRadius;
 		}
 	}
 

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

@@ -1,18 +1,34 @@
 /**********************************************************************
 	Style of the RTA Contextmenu - Horizon High Contrast Black theme
 ***********************************************************************/
-@_sap_ui_rta_ContextMenu_Border_LightColor: @sapUiNeutralBorder; //#ffffff
-@_sap_ui_rta_ContextMenu_Border_DarkColor: @sapUiNeutralBG; //#000000
-@_sap_ui_rta_ContextMenu_Border_Radius: @sapUiButtonBorderCornerRadius; // 0.375rem
-@_sap_ui_rta_ContextMenu_BoxShadow_DarkColor: fade(@sapUiContentShadowColor, 60%); //rgba(255, 255, 255, 0.6)
-@_sap_ui_rta_ContextMenu_BoxShadow_LightColor: @sapUiNeutralBorder; //#ffffff
+@_sap_ui_rta_ContextMenu_BorderLightColor: @sapUiShellBorderColor; //#ffffff
+@_sap_ui_rta_ContextMenu_BorderDarkColor: @sapUiShellBackground; //#000000
+@_sap_ui_rta_ContextMenu_BorderRadius: @sapUiButtonBorderCornerRadius; // 0.375rem
+@_sap_ui_rta_ContextMenu_BoxShadowLightColor: fade(@sapUiContentShadowColor, 60%); //rgba(255, 255, 255, 0.6)
+
+@_sap_ui_rta_ContextMenu_BoxShadow:
+		0 0.25rem 2rem 0 fade(@_sap_ui_rta_ContextMenu_BoxShadowLightColor, 60%),
+		0 0 0 0.125rem @_sap_ui_rta_ContextMenu_BoxShadowLightColor;
+
 
 .sapUiRtaMode {
 	.sapUiDtContextMenu {
 		&.sapMMenu {
-			border: 0.188rem dashed @_sap_ui_rta_ContextMenu_Border_LightColor; //2px
+			border: 0.188rem dashed @_sap_ui_rta_ContextMenu_BorderLightColor; //2px
 			border-image: none;
-			border-radius: @_sap_ui_rta_ContextMenu_Border_Radius;
+			border-radius: @_sap_ui_rta_ContextMenu_BorderRadius;
+		}
+	}
+}
+
+.sapUiDtContextMenu {
+	.sapUiMnuLst {
+		.sapUiMnuItm {
+			&:focus {
+				&.sapUiMnuItmDsbl{
+					outline: none;
+				}
+			}
 		}
 	}
 }

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

@@ -1,16 +1,21 @@
 /**********************************************************************
 	Style of Dialogs shown in RTA - Horizon High Contrast Black theme
 ***********************************************************************/
-@_sap_ui_rta_Dialogs_BorderLightColor: @sapUiNeutralElement; //#ffffff
-@_sap_ui_rta_Dialogs_BorderDarkColor: @sapUiNeutralBG; //#000000
+@_sap_ui_rta_Dialogs_BorderLightColor: @sapUiShellBorderColor; //#fff
+@_sap_ui_rta_Dialogs_BorderDarkColor: @sapUiShellBackground; //#000000
 @_sap_ui_rta_Dialogs_BorderRadius: @sapUiButtonBorderCornerRadius; //0.375rem
+@_sap_ui_rta_Dialogs_BoxShadowLightColor: fade(@sapUiContentShadowColor, 60%); //rgba(255, 255, 255, 0.6)
+
+@_sap_ui_rta_Dialogs_BorderBoxShadow:
+		0 0.25rem 2rem 0 fade(@_sap_ui_rta_Dialogs_BoxShadowLightColor, 60%),
+		0 0 0 0.125rem @_sap_ui_rta_Dialogs_BoxShadowLightColor;
 
 .sapMDialog.sapUiRTABorder {
-	border: 0.25rem solid @_sap_ui_rta_Dialogs_BorderLightColor;
+	border: 0.188rem solid @_sap_ui_rta_Dialogs_BorderLightColor;
 	border-image: none;
 	border-radius: @_sap_ui_rta_Dialogs_BorderRadius;
-	outline: 0.25rem dashed @_sap_ui_rta_Dialogs_BorderDarkColor; //4px
-	outline-offset: -0.188rem;
+	outline: 0.188rem dashed @_sap_ui_rta_Dialogs_BorderDarkColor; //4px
+	outline-offset: -0.125rem;
 }
 
 .sapUiRtaPopover {
@@ -20,7 +25,8 @@
 		border-image: none;
 		border-radius: @_sap_ui_rta_Dialogs_BorderRadius;
 		outline: 0.188rem dashed @_sap_ui_rta_Dialogs_BorderDarkColor; //4px
-		outline-offset: -0.25rem; //4px
+		outline-offset: -0.125rem; //4px
+		box-shadow: @_sap_ui_rta_Dialogs_BorderBoxShadow;
 	}
 
 	&.sapMPopoverArr, .sapMPopoverArr {

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

@@ -1,31 +1,16 @@
 /****************************************************************************
 	Style of the RTA Add Fields Dialog  - Horizon High Contrast Black theme
 *****************************************************************************/
-@_sap_ui_rta_FieldRepository_ListSelect: @sapUiChartPaletteSequentialHue1Dark2; //#0979e8
-@_sap_ui_rta_FieldRepository_BtnHoverOutline: @sapUiButtonActiveBorderColor; //#fff
-@_sap_ui_rta_FieldRepository_ListItmBorderRadius: @sapUiButtonBorderCornerRadius; //0.375rem
-
 .sapUiRtaMode {
-
 	.sapUIRtaFieldRepositoryDialog {
-
-		.sapMLIBHoverable {
-			&.sapMLIBSelected:hover {
-				background: @_sap_ui_rta_FieldRepository_ListSelect;
+		.sapMBtn:focus {
+			> .sapMFocusable {
+				outline-offset: -0.125rem; //2px
+				border: 0.0625rem solid transparent; //2px
+				&.sapMBtnEmphasized {
+					border: 0.125rem solid transparent; //2px
+				}
 			}
-
-			&.sapMLIB.sapMLIBSelected {
-				border-bottom: 0.0625rem solid transparent;
-			}
-		}
-
-		.sapUIRtaListItem {
-			border-radius: @_sap_ui_rta_FieldRepository_ListItmBorderRadius;
-		}
-
-		// Search field
-		.sapMSF.sapMFocus:hover .sapMSFF {
-			outline: 0.0625rem solid @_sap_ui_rta_FieldRepository_BtnHoverOutline; //1px
 		}
 	}
 }

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

@@ -1,73 +1,31 @@
 /******************************************************************
 	Style of the RTA Overlays - Horizon High Contrast Black theme
 *******************************************************************/
-@_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
-@_sap_ui_rta_Overlay_BorderRadius: @sapUiButtonBorderCornerRadius; //0.375rem
+@_sap_ui_rta_Overlay_ResizeHandleColor: darken(@sapUiSuccessBorder, 25%); //#4c994c
+@_sap_ui_rta_Overlay_PlaceholderBackgroundColor: darken(@sapUiFieldPlaceholderTextColor, 30%); //#4d4d4d
 
 .sapUiRta {
-	.sapUiDtOverlayTargetZone {
-		&:after {
-			box-shadow: none;
-			border-radius: @_sap_ui_rta_Overlay_BorderRadius;
-		}
-
-		&.sapUiDtOverlayDropZone > .sapUiDtOverlayChildren > .sapUiDtOverlayMovable {
-			background: @_sap_ui_rta_Overlay_TargetZoneBG;
-		}
-	}
-}
-
-.sapUiRta:not(.sapUiRtaVisualizationMode) {
-	.sapUiDtOverlay {
-		&:focus {
-			outline: none;
-			/* 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: 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
-			border-radius: @_sap_ui_rta_Overlay_BorderRadius;
-		}
-	}
-
-	.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 0.25rem @_sap_ui_rta_Overlay_BoxShadowColor inset; //4px
-			}
-		}
-
-		&.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
-				box-shadow: none;
+	.sapUiDtOverlayDropZone {
+		> .sapUiDtOverlayChildren {
+			> .sapUiRtaOverlayPlaceholder {
+				background: @_sap_ui_rta_Overlay_PlaceholderBackgroundColor !important;
+				// no "focus" border
+				&:focus {
+					&:before {
+						content: none;
+					}
+				}
+
+				// all descendants
+				* {
+					background: @_sap_ui_rta_Overlay_PlaceholderBackgroundColor;
+					// no "focus" border
+					&:focus {
+						&:before {
+							content: none;
+						}
+					}
+				}
 			}
 		}
 	}

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

@@ -1,23 +1,17 @@
 /***********************************************************************
 	Style of the RTA Toolbar (type: adaptation) - Horizon High Contrast Black 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_SegBBtnSelBG: @sapUiSelected;
-@_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor: @sapUiCriticalText; //#ffab1d
-@_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor: @sapUiPositiveText; //#9c9
-@_sap_ui_rta_Toolbar_Adaptation_BoxShadow_DarkColor: fade(@sapUiNeutralElement, 80%); //rgba(255, 255, 255, 0.8)
-@_sap_ui_rta_Toolbar_Adaptation_BoxShadow_LightColor: @sapUiNeutralElement; //#ffffff
-@_sap_ui_rta_Toolbar_Adaptation_VersionHistoryHover: @sapUiListHoverBackground; //#795100
-@_sap_ui_rta_Toolbar_Adaptation_BaseColorLight: @sapUiContentDisabledTextColor; //#666
+@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiShellTextColor; //#fff
+@_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor: @sapUiContentFocusColor; //#fff
+@_sap_ui_rta_Toolbar_Adaptation_DraftVersionColor: @sapUiShellCriticalColor; //#ffab1d
+@_sap_ui_rta_Toolbar_Adaptation_ActiveVersionColor:@sapUiShellPositiveColor; //#9c9
+@_sap_ui_rta_Toolbar_Adaptation_BoxShadowDarkColor: fade(@sapUiContentShadowColor, 60%); //rgba(255, 255, 255, 0.6)
 
 .sapUiRtaMode {
 	.sapUiRtaToolbar.sapUiRtaToolbarAdaptation {
 		.sapMBtn {
 			&:focus .sapMFocusable {
-				outline: 0.125rem dotted @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineCol;
+				outline: 0.125rem dotted @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineColor;
 				outline-offset: -0.125rem; //2px
 				border-color: transparent;
 			}
@@ -33,8 +27,6 @@
 				}
 
 				&.sapMSegBBtnSel .sapMSegBBtnInner {
-					background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelBG;
-
 					&:after {
 						content: none !important;
 					}
@@ -45,5 +37,35 @@
 				}
 			}
 		}
+		// set text to white on hover for better accessibility
+		.sapUiRtaVersionButton {
+			&:hover {
+				> span > span > bdi {
+					color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+				}
+			}
+		}
+	}
+	// set text to white on hover for better accessibility
+	.sapUiRtaVersionHistory {
+		.sapMLIBHoverable:hover {
+			.sapMLIBContent {
+				.sapMFeedListItem {
+					.sapMFeedListItemText {
+						.sapMFeedListItemTextText {
+							.sapMFeedListItemTextString {
+								color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+							}
+						}
+						.sapMFeedListItemFooter {
+							.sapMFeedListItemInfoText,
+							.sapMFeedListItemTimestampText {
+								color: @_sap_ui_rta_Toolbar_Adaptation_TextColor;
+							}
+						}
+					}
+				}
+			}
+		}
 	}
 }

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

@@ -1,13 +1,9 @@
 /******************************************************************************
 	Style of the RTA Toolbar (all types) - Horizon High Contrast Black 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_OutlineColor: @sapUiButtonEmphasizedBorderColor; //#fff
-@_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_OutlineColor: @sapUiShellBorderColor; //#fff
+@_sap_ui_rta_Toolbar_Base_BoxShadowDarkColor: fade(@sapUiContentShadowColor, 60%); //rgba(255, 255, 255, 0.6)
+@_sap_ui_rta_Toolbar_Base_BorderDarkColor: @sapUiShellBackground; //#000000
 
 .sapUiRtaMode {
 	.sapUiRtaToolbar {

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

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

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

@@ -2,15 +2,16 @@
 	Style of the RTA Change Visualization - Horizon hcw theme
 *******************************************************************/
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorLight: @sapUiPositiveText; //#006362
-@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium: @sapUiActive; //#e97624
+@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium: @sapUiShellActiveBackground; //#e97624
 @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark: lighten(@sapUiChart8, 20%); //#e52faa
-@_sap_ui_rta_ChangeVisualization_OverlayOutline: @sapUiIndication5; //#004ccb
-@_sap_ui_rta_ChangeVisualization_BorderRadius: @sapUiButtonBorderCornerRadius;
+@_sap_ui_rta_ChangeVisualization_OverlayOutlineColor: @sapUiSelected; //#5c93ff
+@_sap_ui_rta_ChangeVisualization_BorderRadius: @sapUiButtonBorderCornerRadius; // 0.375rem
 
 .sapUiDtOverlay {
 	.sapUiRtaChangeIndicatorHovered {
 		&:after {
 			box-shadow: none;
+			border-radius: @_sap_ui_rta_ChangeVisualization_BorderRadius;
 		}
 	}
 

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

@@ -1,18 +1,30 @@
 /**********************************************************************
 	Style of the RTA Contextmenu - Horizon High Contrast White theme
 ***********************************************************************/
-@_sap_ui_rta_ContextMenu_Border_LightColor: @sapUiNeutralBG; //#fff
-@_sap_ui_rta_ContextMenu_Border_DarkColor: @sapUiNeutralBorder; //#000
-@_sap_ui_rta_ContextMenu_Border_Radius: @sapUiButtonBorderCornerRadius; // 0.375rem
-@_sap_ui_rta_ContextMenu_BoxShadow_DarkColor: fade(@sapUiContentShadowColor, 60%); //rgba(255, 255, 255, 0.6)
-@_sap_ui_rta_ContextMenu_BoxShadow_LightColor: @sapUiNeutralBG; //#fff
+@_sap_ui_rta_ContextMenu_BorderLightColor: @sapUiShellBackground; //#fff
+@_sap_ui_rta_ContextMenu_BorderDarkColor: @sapUiContentShadowColor; //#000
+@_sap_ui_rta_ContextMenu_BorderRadius: @sapUiButtonBorderCornerRadius; // 0.375rem
+@_sap_ui_rta_ContextMenu_BoxShadowDarkColor: fade(@sapUiContentShadowColor, 60%); //rgba(0, 0, 0, 0.6)
+@_sap_ui_rta_ContextMenu_BoxShadowLightColor: @sapUiShellBackground; //#fff
 
 .sapUiRtaMode {
 	.sapUiDtContextMenu {
 		&.sapMMenu {
-			border: 0.188rem dashed @_sap_ui_rta_ContextMenu_Border_DarkColor; //2px
+			border: 0.188rem dashed @_sap_ui_rta_ContextMenu_BorderDarkColor; //2px
 			border-image: none;
-			border-radius: @_sap_ui_rta_ContextMenu_Border_Radius;
+			border-radius: @_sap_ui_rta_ContextMenu_BorderRadius;
+		}
+	}
+}
+
+.sapUiDtContextMenu {
+	.sapUiMnuLst {
+		.sapUiMnuItm {
+			&:focus {
+				&.sapUiMnuItmDsbl{
+					outline: none;
+				}
+			}
 		}
 	}
 }

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

@@ -1,16 +1,16 @@
 /***********************************************************************
 	Style of Dialogs shown in RTA - Horizon High Contrast White theme
 ************************************************************************/
-@_sap_ui_rta_Dialogs_BorderLightColor: @sapUiNeutralElement; //#000
-@_sap_ui_rta_Dialogs_BorderDarkColor: @sapUiNeutralBG; //#fff
+@_sap_ui_rta_Dialogs_BorderLightColor: @sapUiContentShadowColor; //#000
+@_sap_ui_rta_Dialogs_BorderDarkColor: @sapUiShellBackground; //#fff
 @_sap_ui_rta_Dialogs_BorderRadius: @sapUiButtonBorderCornerRadius; //0.375rem
 
 .sapMDialog.sapUiRTABorder {
-	border: 0.25rem solid @_sap_ui_rta_Dialogs_BorderLightColor;
+	border: 0.188rem solid @_sap_ui_rta_Dialogs_BorderLightColor;
 	border-image: none;
 	border-radius: @_sap_ui_rta_Dialogs_BorderRadius;
-	outline: 0.25rem dashed @_sap_ui_rta_Dialogs_BorderDarkColor; //4px
-	outline-offset: -0.188rem;
+	outline: 0.188rem dashed @_sap_ui_rta_Dialogs_BorderDarkColor; //4px
+	outline-offset: -0.125rem;
 }
 
 .sapUiRtaPopover {
@@ -20,7 +20,7 @@
 		border-image: none;
 		border-radius: @_sap_ui_rta_Dialogs_BorderRadius;
 		outline: 0.188rem dashed @_sap_ui_rta_Dialogs_BorderDarkColor; //4px
-		outline-offset: -0.25rem; //4px
+		outline-offset: -0.125rem; //4px
 	}
 
 	&.sapMPopoverArr, .sapMPopoverArr {