@openui5/themelib_sap_horizon 1.101.0 → 1.102.2

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

@@ -1,80 +1,14 @@
-/* ======================================== */
-/* CSS for control sap.ui.rta/Toolbar.base  */
-/* Evening Horizon theme                    */
-/* ======================================== */
-
-@_sap_ui_rta_Toolbar_Base_SegBBtnHoverBG: @sapUiToolbarBackground;
-@_sap_ui_rta_Toolbar_Base_TextColor: @sapUiShellTextColor;
-@_sap_ui_rta_Toolbar_Base_BaseColor: @sapUiToolbarBackground;
-@_sap_ui_rta_Toolbar_Base_BtnHover: @sapUiShellTextColor;
-@_sap_ui_rta_Toolbar_Base_BtnSelected: @sapUiSelected;
+/******************************************************************
+	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
 
 .sapUiRtaMode {
 	.sapUiRtaToolbar {
-
-		.sapMSegB {
-			.sapMSegBBtn {
-				margin:0px 2px;
-				.sapMSegBBtnInnerWrapper {
-					background-color: @sapUiToolbarBackground;
-				}
-			}
-		}
-
-		.sapMBtn {
-			&.sapMBtnDisabled .sapMBtnInner {
-				opacity: 1.0;
-			}
-		}
-
-		.sapMSegBBtn.sapMSegBBtnFocusable {
-
-			&:hover .sapMSegBBtnInner,
-			&.sapMSegBBtnSel:hover .sapMSegBBtnInner {
-				color: @_sap_ui_rta_Toolbar_Base_BtnHover;
-			}
-
-			&:focus .sapMSegBBtnInner {
-				outline: 0.0625rem solid @_sap_ui_rta_Toolbar_Base_BtnSelected; //1px
-				outline-offset: -0.0625rem; //1px
-				border-radius: @sapUiElementBorderCornerRadius;
-			}
-
-			&.sapMSegBBtnSel {
-
-				&:hover .sapMSegBBtnInner::after {
-					border-bottom: 0.125rem solid @_sap_ui_rta_Toolbar_Base_BtnHover; //2px
-					border-radius: 0;
-				}
-
-				& .sapMSegBBtnInner::after {
-					border-radius: 0;
-				}
-			}
-		}
-		.sapMBtn:focus .sapMFocusable {
-			border: 0.0625rem solid @_sap_ui_rta_Toolbar_Base_BtnSelected; //1px
-		}
-		.sapUiRtaToolbarSwitcherSection {
-			.sapMSegBBtn:hover {
-				.sapUiIcon,
-				&.sapMSegBBtnSel .sapMSegBBtnInner .sapUiIcon {
-					color: @_sap_ui_rta_Toolbar_Base_BtnHover;
-				}
-			}
-		}
-
-		.sapMTB:not(.sapMTB-Info-CTX) {
-			border-top-right-radius: 0;
-			border-top-left-radius: 0;
-		}
+		outline: 0.125rem dashed @_sap_ui_rta_Toolbar_Base_OutlineColor;
+		outline-offset: -0.125rem;
+		border: none;
+		border-image: none;
 	}
-}
-
-.sapUiSizeCozy .sapUiRtaToolbar .sapMSegB .sapMSegBBtn .sapMSegBBtnInner {
-	line-height: 2rem; //32px
-}
-
-html.sap-desktop .sapUiRtaMode .sapMSegBBtnFocusable:focus .sapMSegBBtnInner:after {
-	border: none;
 }

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

@@ -1,17 +1,4 @@
-/* =================================================== */
-/* CSS for control sap.ui.rta/Toolbar.personalization  */
-/* Evening Horizon theme                               */
-/* =================================================== */
-
-@_sap_ui_rta_Toolbar_Personalization_BaseColor: @sapUiToolbarBackground;
-@_sap_ui_rta_Toolbar_Personalization_TextColor: @sapUiShellTextColor;
-
-.sapUiRtaToolbar.type_personalization {
-  .sapMBtn {
-    .sapMBtnTransparent.sapMBtnInner {
-      .sapMBtnContent {
-        text-shadow: none;
-      }
-    }
-  }
-}
+/******************************************************************
+	Style of the Personalization Toolbar - Horizon Dark Theme
+*******************************************************************/
+@_sap_ui_rta_Toolbar_Personalization_BaseColor: @sapUiToolbarBackground;

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

@@ -10,8 +10,9 @@
 @import "Overlay.less";
 @import "ContextMenu.less";
 @import "Dialogs.less";
+@import "AddIFrame.less";
 @import "FieldRepository.less";
 @import "Toolbar.personalization.less";
-@import "Toolbar.standalone.less";
 @import "Toolbar.adaptation.less";
-@import "Toolbar.base.less";
+@import "Toolbar.base.less";
+@import "ChangeVisualization.less";

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

@@ -1,8 +1,77 @@
-/* ===================================== */
-/* CSS for control sap.ui.rta/AddIFrame  */
-/* Horizon High Contrast Black theme     */
-/* ===================================== */
+/**************************************************************************
+	Style of the RTA Add IFrame Dialog  Horizon High Contrast Black theme
+***************************************************************************/
+@_sap_ui_rta_AddIFrame_DelimiterLineColor: @sapUiListBorderColor; //#999
+@_sap_ui_rta_AddIFrame_PreviewBG: @sapUiNeutralBG; //#000
+@_sap_ui_rta_AddIFrame_BorderRadius: 0.5rem;
+@_sap_ui_rta_AddIFrame_PreviewTlbarHoverBG: @sapUiNeutralBG; //#000
 
-.sapUiRtaMode .sapUiRtaAddIFrameDialog .sapUiRtaAddIFrameDialogVlWrapper .sapUiRtaAddIFrameDialogPreviewGrid .sapUiRtaAddIFrameDialogNoPreviewLabel {
-	color: @sapUiBlackBG; //#000000
+.sapUiRtaMode {
+	.sapUiRtaAddIFrameDialog {
+		.sapUiRtaAddIFrameDialogVlWrapper {
+			.sapUiRtaAddIFrameDialogEditGrid {
+
+				.sapUiRtaAddIFrameDialogParameters {
+					.sapMScrollCont {
+						border-radius: @_sap_ui_rta_AddIFrame_BorderRadius;
+					}
+				}
+
+				.sapUiRtaAddIFrameDialogEditUrl {
+					.sapMTextArea {
+						.sapMInputBaseContentWrapper {
+							border: 0.0625rem solid @_sap_ui_rta_AddIFrame_BorderColor; //1px
+							border-radius: @_sap_ui_rta_AddIFrame_BorderRadius;
+							background-image: none;
+						}
+
+						.sapMTextAreaInner {
+							border: none;
+						}
+
+						&.sapMFocus.sapMInputBase .sapMInputBaseContentWrapper:not(.sapMInputBaseDisabledWrapper)::before {
+							border-radius: @_sap_ui_rta_AddIFrame_BorderRadius;
+						}
+
+						&.sapMFocus {
+							.sapMInputBaseContentWrapper .sapMInputBaseInner {
+								outline: none;
+							}
+						}
+					}
+				}
+			}
+
+			.sapUiRtaAddIFrameDialogPreviewLinkGrid {
+				.sapUiRtaAddIFrameDialogPreviewLinkPanel {
+
+					&.sapMPanel .sapMPanelWrappingDiv:not(.sapMPanelWrappingDivExpanded),
+					&.sapMPanel .sapMPanelWrappingDivTb:not(.sapMPanelWrappingDivTbExpanded) {
+						border-radius: 0;
+					}
+
+					.sapUiRtaAddIFrameDialogPreviewLinkToolbar {
+						padding-left: 0;
+						padding-right: 0.125rem;
+
+						&.sapMTB:hover,
+						&.sapMTB-Solid-CTX.sapMTB:hover {
+							background-color: @_sap_ui_rta_AddIFrame_PreviewTlbarHoverBG;
+						}
+					}
+				}
+			}
+
+			.sapUiRtaAddIFrameDialogPreviewGrid {
+				border-radius: @_sap_ui_rta_AddIFrame_BorderRadius;
+				padding-bottom: 0.5rem;
+				background: transparent;
+			}
+		}
+	}
+}
+
+// adapt scrollbars to rounded corners
+html.sap-desktop:not(.sapUiNativeScrollbars) ::-webkit-scrollbar {
+	background-color: inherit !important;
 }

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

@@ -1,20 +1,20 @@
-/* =============================================== */
-/* CSS for control sap.ui.rta/ChangeVisualization  */
-/* Horizon High Contrast Black theme               */
-/* =============================================== */
+/******************************************************************
+	Style of the RTA Change Visualization - Horizon 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
+@_sap_ui_rta_ChangeVisualization_BorderRadius: @sapUiButtonBorderCornerRadius;
 
-@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorLight: @sapUiContentContrastFocusColor	;
-@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorMedium: @sapUiContentContrastFocusColor;
-@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark: @sapUiContentContrastFocusColor;
+.sapUiDtOverlay {
+	.sapUiRtaChangeIndicatorHovered {
+		&:after {
+			box-shadow: none;
+		}
+	}
 
-.sapUiRtaChangeIndicatorColorLight{
-	opacity: 0.4;
-}
-
-.sapUiRtaChangeIndicatorColorMedium{
-	opacity: 0.6;
-}
-
-.sapUiRtaChangeIndicatorColorDark{
-	opacity: 0.85;
+	&.sapUiRtaChangeIndicatorDependent {
+		border-radius: @_sap_ui_rta_ChangeVisualization_BorderRadius;
+	}
 }

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

@@ -1,18 +1,18 @@
-/* ======================================= */
-/* CSS for control sap.ui.rta/ContextMenu  */
-/* Horizon High Contrast Black theme       */
-/* ======================================= */
-
-@_sap_ui_rta_ContextMenu_Border_LightColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_ContextMenu_Border_DarkColor: @sapUiBlackBG; //#000000
-@_sap_ui_rta_ContextMenu_BoxShadowColor: fade(@sapUiWhite, 60%); //rgba(255, 255, 255, 0.6)
+/**********************************************************************
+	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
 
 .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 4px, @_sap_ui_rta_ContextMenu_Border_LightColor 4px, @_sap_ui_rta_ContextMenu_Border_LightColor 6px) 4;
-			box-shadow: 0 0.625rem 2rem 0 @_sap_ui_rta_ContextMenu_BoxShadowColor, 0 0 0.625rem -0.125rem @_sap_ui_rta_ContextMenu_Border_LightColor; //10px 32px 10px 2px
+			border: 0.188rem dashed @_sap_ui_rta_ContextMenu_Border_LightColor; //2px
+			border-image: none;
+			border-radius: @_sap_ui_rta_ContextMenu_Border_Radius;
 		}
 	}
 }

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

@@ -1,14 +1,32 @@
-/* =================================== */
-/* CSS for control sap.ui.rta/Dialogs  */
-/* Horizon High Contrast Black 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)
+/**********************************************************************
+	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_BorderRadius: @sapUiButtonBorderCornerRadius; //0.375rem
 
 .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 0.625rem 4rem 0 @_sap_ui_rta_Dialogs_BoxShadowColor, 0 0 0.625rem -0.125rem @_sap_ui_rta_Dialogs_Border_LightColor; //10px 64px 10px 2px
+	border: 0.25rem 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;
+}
+
+.sapUiRtaPopover {
+
+	&.sapMPopover, .sapMPopover {
+		border: 0.188rem solid @_sap_ui_rta_Dialogs_BorderLightColor; //3px
+		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
+	}
+
+	&.sapMPopoverArr, .sapMPopoverArr {
+		&:after {
+			border: 0.188rem dashed @_sap_ui_rta_Dialogs_BorderLightColor; //3px
+			border-image: none;
+		}
+	}
 }

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

@@ -1,24 +1,31 @@
-/* =========================================== */
-/* CSS for control sap.ui.rta/FieldRepository  */
-/* Horizon High Contrast Black theme           */
-/* =========================================== */
-
-@_sap_ui_rta_FieldRepository_BGColor: @sapHC_HighlightBackground; //#7a5100;
-@_sap_ui_rta_FieldRepository_Focus: @sapUiWhite; //fff
-@_sap_ui_rta_FieldRepository_Title: @sapUiWhite; //fff
+/****************************************************************************
+	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 {
-		.sapMBtn:focus {
-			> .sapMFocusable {
-				outline: 0.0625rem dotted @_sap_ui_rta_FieldRepository_Focus; //1px
-				outline-offset: -0.1875rem; //3px
+
+		.sapMLIBHoverable {
+			&.sapMLIBSelected:hover {
+				background: @_sap_ui_rta_FieldRepository_ListSelect;
+			}
+
+			&.sapMLIB.sapMLIBSelected {
+				border-bottom: 0.0625rem solid transparent;
 			}
 		}
-	}
-}
 
+		.sapUIRtaListItem {
+			border-radius: @_sap_ui_rta_FieldRepository_ListItmBorderRadius;
+		}
 
-.sapUIRtaFieldRepositoryDialog.sapMDialog > header.sapMDialogTitle .sapMTitle {
-	color: @_sap_ui_rta_FieldRepository_Title;
+		// 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,76 +1,74 @@
-/* =================================== */
-/* CSS for control sap.ui.rta/Overlay  */
-/* Horizon High Contrast Black 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
+/******************************************************************
+	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
 
 .sapUiRta {
 	.sapUiDtOverlayTargetZone {
 		&:after {
-			transition: none;
 			box-shadow: none;
+			border-radius: @_sap_ui_rta_Overlay_BorderRadius;
+		}
+
+		&.sapUiDtOverlayDropZone > .sapUiDtOverlayChildren > .sapUiDtOverlayMovable {
+			background: @_sap_ui_rta_Overlay_TargetZoneBG;
 		}
 	}
 }
 
 .sapUiRta:not(.sapUiRtaVisualizationMode) {
-	.sapUiRtaOverlayHover {
-		&:after {
-			outline: 0.125rem dotted @_sap_ui_rta_Overlay_BorderColor; //2px
-			outline-offset: -0.125rem; //2px
-			border: none;
-			transition: none;
-			box-shadow: none;
-		}
-	}
 	.sapUiDtOverlay {
 		&:focus {
 			outline: none;
-			/* We create inner black shadow to make sure white border is in contrast with element */
+			/* 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_HoverBorder; //2px
+				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 {
-		transition: none;
 		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
+				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;
 			}
 		}
 	}
-}
-
-.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_horizon_hcb/Toolbar.adaptation.less

@@ -1,14 +1,46 @@
-/* ============================================== */
-/* CSS for control sap.ui.rta/Toolbar.adaptation  */
-/* Horizon High Contrast Black theme              */
-/* ============================================== */
+/***********************************************************************
+	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_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 0.625rem 2rem 0 @_sap_ui_rta_Toolbar_Adaptation_BoxShadowColor, 0 0 0.625rem -0.125rem @_sap_ui_rta_Toolbar_Adaptation_TextColor; //10px 32px 10px 2px
+		.sapMBtn {
+			&:focus .sapMFocusable {
+				outline: 0.125rem dotted @_sap_ui_rta_Toolbar_Adaptation_FocusOutlineCol;
+				outline-offset: -0.125rem; //2px
+				border-color: transparent;
+			}
+		}
+
+		.sapMSegB {
+			.sapMSegBBtn {
+				&.sapMSegBBtnFocusable {
+					&:focus .sapMSegBBtnInner {
+						outline-width: 0.125rem; //2px
+						outline-offset: -0.125rem; //2px
+					}
+				}
+
+				&.sapMSegBBtnSel .sapMSegBBtnInner {
+					background: @_sap_ui_rta_Toolbar_Adaptation_SegBBtnSelBG;
+
+					&:after {
+						content: none !important;
+					}
+				}
+
+				.sapMSegBBtnInner {
+					border: solid thin;
+				}
+			}
+		}
 	}
 }

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

@@ -1,87 +1,19 @@
-/* ======================================== */
-/* CSS for control sap.ui.rta/Toolbar.base  */
-/* Horizon High Contrast Black theme        */
-/* ======================================== */
+/******************************************************************************
+	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_BaseColor: @sapUiBlackBG; //#000000
-@_sap_ui_rta_Toolbar_Base_TextColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Toolbar_Base_FocusColor: @sapUiWhite; //#ffffff
-@_sap_ui_rta_Toolbar_Base_HoverColor: @sapHC_HighlightBackground; //#7a5100
 
 .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.125rem; //2px
-			}
-		}
-
-		.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 @_sap_ui_rta_Toolbar_Base_FocusColor; //2px
-			border-color: transparent;
-		}
-		.sapMBtn:hover {
-			&:focus > .sapMBtnInner {
-				border-color: transparent !important;
-			}
-		}
-		.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
-			}
-		}
+		outline: 0.125rem dashed @_sap_ui_rta_Toolbar_Base_OutlineColor;
+		outline-offset: -0.125rem;
+		border: none;
+		border-image: none;
 	}
-}
-
-// Special handling for IE and EDGE Browsers
-html[data-sap-ui-browser^="ie"].sap-desktop .sapUiRtaToolbar .sapMSegB .sapMSegBBtnFocusable.sapMSegBBtnSel:focus .sapMSegBBtnInner,
-html[data-sap-ui-browser^="ed"].sap-desktop .sapUiRtaToolbar .sapMSegB .sapMSegBBtnFocusable.sapMSegBBtnSel:focus .sapMSegBBtnInner,
-html[data-sap-ui-browser^="ie"].sap-desktop .sapUiRtaToolbar .sapMSegBBtn.sapMSegBBtnFocusable:focus .sapMSegBBtnInner,
-html[data-sap-ui-browser^="ed"].sap-desktop .sapUiRtaToolbar .sapMSegBBtn.sapMSegBBtnFocusable:focus .sapMSegBBtnInner {
-	outline: 0.125rem dotted; //2px
 }

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

@@ -1,11 +1,8 @@
-/* =================================================== */
-/* CSS for control sap.ui.rta/Toolbar.personalization  */
-/* Horizon High Contrast Black theme                   */
-/* =================================================== */
-
-@_sap_ui_rta_Toolbar_Personalization_BaseColor: @sapUiBlackBG; //#000000
-@_sap_ui_rta_Toolbar_Personalization_TopBorder: @sapUiWhite; //#ffffff
+/*****************************************************************************************
+	Style of the RTA Toolbar (type: personalization) - Horizon High Contrast Black theme
+******************************************************************************************/
+@_sap_ui_rta_Toolbar_Personalization_BaseColor: @sapUiNeutralBG; //#000000
 
 .sapUiRtaToolbar.type_personalization {
-	border-top: @_sap_ui_rta_Toolbar_Personalization_TopBorder 0.0625rem solid; //1px
+	border-top: 0.0625rem solid @_sap_ui_rta_Toolbar_Personalization_TextColor; //1px
 }

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

@@ -13,7 +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 "AddIFrame.less";