@openui5/themelib_sap_horizon 1.96.5 → 1.99.0

package/src/sap/m/themes/sap_horizon/Page.less

@@ -138,10 +138,13 @@ html[data-sap-ui-animation='on'] .sapMPageWithFloatingFooter {
 		top: 2.75rem;
 	}
 
-	> .sapMPageHeader + .sapMPageSubHeader + section,
-	> .sapMPageHeader + .sapMPageSubHeader.sapMPageSubHeaderInfoBar + section {
+	> .sapMPageHeader + .sapMPageSubHeader + section {
 		top: 5.5rem;
 	}
+
+	> .sapMPageHeader + .sapMPageSubHeader.sapMPageSubHeaderInfoBar + section {
+		top: 4.75rem;
+	}
 }
 
 .sapUiSizeCompact .sapF2CollapsedHeader.sapMPageWithHeader {

package/src/sap/m/themes/sap_horizon/RangeSlider.less

@@ -2,15 +2,14 @@
 /* CSS for control sap.m/RangeSlider  */
 /* Horizon theme                      */
 /* ================================== */
-
 .sapMRangeSlider.sapMSliderInner .sapMSliderHandle {
 	top: -0.75rem;
 }
 
 .sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled):hover>.sapMSliderHandle {
-	border: 1px @sapContent_FocusStyle @sapContent_Selected_ForegroundColor;
-	background: transparent;
-	box-shadow: @sapContent_Selected_Shadow;
+		border: 1px @sapContent_FocusStyle @sapContent_Selected_ForegroundColor;
+		background: transparent;
+		box-shadow: @sapContent_Selected_Shadow;
 }
 
 .sapMRangeSlider.sapMSlider .sapMSliderInner:not(.sapMSliderInnerDisabled):hover .sapMSliderProgress:focus ~ .sapMSliderHandle,

package/src/sap/m/themes/sap_horizon/SegmentedButton.less

@@ -251,13 +251,6 @@ html.sap-desktop .sapMSegBBtnFocusable.sapMBtnActive:hover .sapMSegBBtnInner {
 	}
 }
 
-/* Android size compact fix */
-html[data-sap-ui-os^="Android4.1"][data-sap-ui-browser^="an"] {
-	.sapUiSizeCompact .sapMSegBBtn img {
-		margin-bottom: 0.128rem;
-	}
-}
-
 .sapMSegBBtn.sapMSegBtnLastVisibleButton .sapMSegBBtnInner {
 	border-right: 1px solid @sapUiButtonBorderColor;
 	border-top-right-radius: @sapUiButtonBorderCornerRadius;

package/src/sap/m/themes/sap_horizon/SlideTile.less

@@ -43,7 +43,7 @@ html.sap-desktop .sapMST:active .sapMSTFocusDiv:after {
 }
 
 .sapMST.TwoByOne {
-	width: 23rem;
+	width: 22.5rem;
 }
 
 .sapMST.TwoByHalf {
@@ -73,4 +73,13 @@ html.sap-desktop .sapMST:focus .sapMSTFocusDiv:after,
 html.sap-desktop .sapMST:active .sapMSTFocusDiv:after {
 	border: none;
 	border-radius: @sapElement_BorderCornerRadius;
+}
+
+html.sap-desktop .sapMST:hover {
+	box-shadow: @sapContent_Shadow1 !important;;
+
+	.sapMGT:hover {
+		box-shadow: none !important;
+	}
+
 }

package/src/sap/m/themes/sap_horizon/Slider.less

@@ -3,6 +3,7 @@
 /* Horizon theme                 */
 /* ============================= */
 
+/*new*/
 .sapMSliderInner .sapMSliderHandle {
 	border: 1px solid @sapContent_Selected_Background;
 	background: @sapContent_Selected_Background;

package/src/sap/m/themes/sap_horizon/SliderTooltip.less

@@ -3,12 +3,8 @@
 /* Horizon theme                        */
 /* ==================================== */
 
-/* ------------------------------ */
-/* Slider Tooltip styles          */
-/* ------------------------------ */
-
 .sapMSliderTooltip {
-	background: @sapField_Focus_Background;
+	background: @sapField_Focus_Background; 
 	border-radius: 0.5rem;
 	border: none;
 	box-shadow: @sapUiContentShadow1;

package/src/sap/m/themes/sap_horizon/SplitButton.less

@@ -21,10 +21,6 @@
 }
 
 .sapMMenuBtn {
-	.sapMBtn:hover > .sapMBtnHoverable.sapMBtnEmphasized,
-	span.sapMBtnInner.sapMBtnEmphasized {
-		border-left-color: @sapUiButtonBackground;
-	}
 	.sapMBtn.sapMSBActive:hover > .sapMBtnHoverable.sapMBtnEmphasized:not(.sapMBtnActive):not(.sapMToggleBtnPressed) .sapMBtnIcon {
 		color: @sapUiButtonActiveTextColor;
 	}
@@ -118,7 +114,8 @@
 	box-sizing: border-box;
 	top: 0.5rem;
 	left: -0.0625rem;
-	border: 0.0125rem solid @sapUiButtonHoverTextColor;
+	width: 0.0625rem;
+	background-color: @sapUiButtonHoverTextColor;
 	pointer-events: none;
 	height: 1.25rem;
 	border-radius: 0.35rem;
@@ -129,19 +126,19 @@
 .sapMSB.sapMSBSuccess .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before,
 .sapMSB.sapMSBCritical .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before,
 .sapMSB.sapMSBNegative .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
-	border-color: @sapUiButtonEmphasizedTextColor;
+	background-color: @sapUiButtonEmphasizedTextColor;
 }
 
 .sapMSB.sapMSBAccept .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
-	border-color: @sapUiButtonAcceptTextColor;
+	background-color: @sapUiButtonAcceptTextColor;
 }
 
 .sapMSB.sapMSBReject .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
-	border-color: @sapUiButtonRejectTextColor;
+	background-color: @sapUiButtonRejectTextColor;
 }
 
 .sapMSB.sapMSBAttention .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
-	border-color: @sapUiButtonAttentionTextColor;
+	background-color: @sapUiButtonAttentionTextColor;
 }
 
 .sapUiSizeCompact .sapMSB .sapMBtn:not(.sapMSBText) .sapMBtnInner.sapMBtnIconFirst::before {
@@ -149,10 +146,10 @@
 	height: 0.9rem;
 }
 
-.sapMSB .sapMBtnInner.sapMBtnIconFirst:hover::before,
-.sapMSB .sapMBtn.sapMSBActive .sapMBtnInner.sapMBtnIconFirst::before,
-.sapMMenuBtn:hover .sapMBtnInner.sapMBtnIconFirst::before,
-.sapMMenuBtn:focus .sapMBtnInner.sapMBtnIconFirst::before {
+.sapMSB .sapMBtn:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnIconFirst:hover::before,
+.sapMSB .sapMBtn.sapMSBActive.sapMBtn:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnIconFirst::before,
+.sapMMenuBtn:hover .sapMBtn:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnIconFirst::before,
+.sapMMenuBtn:focus .sapMBtn:not(.sapMBtnDisabled) .sapMBtnInner.sapMBtnIconFirst::before {
 	display: none;
 }
 

package/src/sap/m/themes/sap_horizon/SuggestionsPopover.less

@@ -1,8 +1,3 @@
-/* ======================================== */
-/* CSS for control sap.m/SuggestionsPopover */
-/* Horizon theme                            */
-/* ======================================== */
-
 div.sapMSuggestionsPopover {
 	box-shadow: @sapUiShadowLevel2;
 }

package/src/sap/m/themes/sap_horizon/Tokenizer.less

@@ -28,7 +28,7 @@ html.sap-desktop .sapMTokenizer:focus {
 
 /* editable tokens in read-only tokenizer */
 .sapMTokenizer.sapMTokenizerReadonly .sapMToken {
-	color: @sapUiContentLabelColor;
+		color: @sapUiContentLabelColor;
 }
 
 .sapUiSizeCompact {
@@ -87,4 +87,4 @@ html.sap-desktop .sapMTokenizer:focus {
 		border-bottom-left-radius: @sapUiElementBorderCornerRadius;
 		border-bottom-right-radius: @sapUiElementBorderCornerRadius;
 	}
-}
+}

package/src/sap/m/themes/sap_horizon/ValueStateHeader.less

@@ -1,8 +1,3 @@
-/* ====================================== */
-/* CSS for control sap.m/ValueStateHeader */
-/* Horizon theme                          */
-/* ====================================== */
-
 .sapMValueStateHeaderText {
 	padding-left: 0.75rem;
 }

package/src/sap/m/themes/sap_horizon/WizardProgressNavigator.less

@@ -99,6 +99,5 @@
 }
 
 .sapMWizardProgressNavStep:focus .sapMWizardProgressNavStepContainer {
-	outline: @sapContent_FocusWidth @sapContent_FocusStyle @sapContent_FocusColor;
 	border-radius: 8px;
 }

package/src/sap/tnt/themes/sap_horizon/InfoLabel.less

@@ -38,7 +38,7 @@
 			background-color: @backgroundColor;
 
 			.sapTntInfoLabelInner {
-				color: @borderColor;
+				color: @sapUiBaseText;
 			}
 		}
 	}

package/src/sap/ui/core/themes/sap_horizon/.theme

@@ -6,7 +6,7 @@
 	<copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-	<version>1.96.5</version>
+	<version>1.99.0</version>
 
 	<documentation>SAPUI5 Horizon theme library.</documentation>
 

package/src/sap/ui/mdc/themes/sap_horizon/TokenDisplay.less

@@ -0,0 +1,34 @@
+/* ======================================== */
+/* CSS for control sap.ui.mdc/TokenDisplay  */
+/* Horizon theme              				*/
+/* ======================================== */
+
+.sapUiMdcTokenizerDisplay .sapMToken {
+	background: transparent;
+	border: 0px;
+
+	padding-left: 0.3125rem;
+}
+
+.sapUiMdcTokenizerDisplay .sapMTokenSelected:not(:focus),
+.sapUiMdcTokenizerDisplay .sapMToken.sapMTokenReadOnly.sapMTokenSelected {
+	background: transparent;
+	border: 0px;
+	box-shadow: none;
+}
+
+html.sap-desktop .sapUiMdcTokenizerDisplay .sapMToken:not(.sapMTokenSelected):not(:focus):hover {
+	background: transparent;
+	border: 0px;
+	box-shadow: none;
+}
+
+html.sap-desktop .sapUiMdcTokenizerDisplay .sapMToken.sapMTokenSelected:hover {
+	background: transparent;
+	border: 0px;
+}
+
+html.sap-desktop .sapUiMdcTokenizerDisplay .sapMToken:focus {
+	border: 0px;
+	box-shadow: none;
+}

package/src/sap/ui/mdc/themes/sap_horizon/TokenizerDisplay.less

@@ -0,0 +1,10 @@
+/* =========================================== */
+/* CSS for control sap.ui.mdc/TokenizerDisplay */
+/* Horizon theme                               */
+/* =========================================== */
+
+html.sap-desktop .sapUiMdcTokenizerDisplay.sapMTokenizer:focus {
+    outline: none;
+    box-shadow: none;
+}
+

package/src/sap/ui/mdc/themes/sap_horizon/ValueHelpDialog.less

@@ -6,4 +6,13 @@
 // give the title 2rem left margin
 .sapMdcValueHelpTitle.sapMDialog header .sapMBarPH {
 	padding-left: 2rem;
+}
+
+// setting some background to transparent so that the VH dialog content get a white background
+.sapMdcValueHelpPanel .sapMPanel.sapMdcTokenizerPanel {
+    background-color: transparent;
+}
+
+.sapMdcValueHelpPanel .sapMITBContent {
+	background-color: transparent;
 }

package/src/sap/ui/mdc/themes/sap_horizon/library.source.less

@@ -10,4 +10,6 @@
 
 @import "CollectiveSearchSelect.less";
 @import "Table.less";
-@import "ValueHelpDialog.less";
+@import "ValueHelpDialog.less";
+@import "TokenDisplay.less";
+@import "TokenizerDisplay.less";

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

@@ -3,67 +3,29 @@
 /* Horizon theme                           */
 /* ======================================= */
 
-@_sap_ui_rta_ContextMenu_Border_LightColor: @sapUiWhite; //#fff
-@_sap_ui_rta_ContextMenu_Border_DarkColor: @sapPrimary1; //#354a5f
+@_sap_ui_rta_ContextMenu_Border_DarkColor: @sapUiButtonEmphasizedBorderColor;
+@_sap_ui_rta_ContextMenu_ShadowDarkColor: #000;
+@_sap_ui_rta_ContextMenu_ShadowLightColor: #fff;
+@_sap_ui_rta_ContextMenu_BoxShadow: 0 0.625rem 1.25rem fade(@_sap_ui_rta_ContextMenu_ShadowDarkColor, 19),
+									0 0.375rem 0.375rem fade(@_sap_ui_rta_ContextMenu_ShadowDarkColor, 23),
+									0 0 0 0.0625rem fade(@_sap_ui_rta_ContextMenu_ShadowLightColor, 20),
+									0 0.0625rem 0 0 fade(@_sap_ui_rta_ContextMenu_ShadowLightColor, 20);
 
 .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 0.625rem 1.25rem fade(black, 19), 0 0.375rem 0.375rem fade(black, 23), 0 0 0 0.0625rem fade(white, 20), 0 0.0625rem 0 0 fade(white, 20); //10px 20px 6px 6px 1px 1px
+		&.sapMMenu {
+			border: 0.188rem dashed @_sap_ui_rta_ContextMenu_Border_DarkColor; //2px
+			box-shadow: @_sap_ui_rta_ContextMenu_BoxShadow;
+			border-radius: @sapUiElementBorderCornerRadius;
 		}
-
-		&.sapMPopoverArr, .sapMPopoverArr {
-			width: 2rem; //32px
-			height: 2rem; //32px
-			bottom: -2rem; //32px
-			left: 0.25rem !important; //4px
-			&:after {
-				box-shadow: 0.375rem -0.375rem 0.75rem 0 fade(black,30), 0 0 0 0.0625rem fade(white,20); //6px 6px 12px 1px
-				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: 0.8125rem; //13px
-				margin: -0.65rem 0 0 0.35rem; //10px 6px
-			}
-			&.sapMPopoverArrUp {
-				height: 0.8125rem; //13px
-				top: -0.8125rem; //13px
-				&:after {
-					box-shadow: -0.375rem 0.375rem 0.75rem 0 fade(black,30), 0 0 0 0.0625rem fade(white,20); //6px 6px 12px 1px
-					margin: 0.35rem 0 0 0.35rem; //6px 6px
+		&.sapUiSubmenu,
+		&:not(.sapUiDtContextMiniMenu) {
+			.sapUiMnuItm {
+				&.sapUiMnuItmHov {
+					color: @sapUiListTextColor;
+					background-color: @sapUiListHoverBackground;
 				}
 			}
 		}
-
-		.sapMBtnInner.sapMBtnText .sapMBtnIcon {
-			padding-left: 0;
-		}
-
-		.sapMBtnIcon {
-			margin-left: 0.4375rem; //7px
-			margin-right: 0.4375rem; //7px
-		}
-
-		&.sapMBtn:focus:not(:hover) > .sapMFocusable,
-		.sapMBtn:focus:not(:hover) > .sapMFocusable {
-			outline: none;
-			border: 0.0625rem dotted; //1px
-		}
-		&.sapMBtn:hover:not(:focus) > .sapMBtnHoverable,
-		.sapMBtn:hover:not(:focus) > .sapMBtnHoverable {
-			outline: none;
-			border: 0.0625rem solid; //1px
-		}
-
-		.sapMBtn:focus:hover > .sapMFocusable,
-		&.sapMBtn:focus:hover > .sapMFocusable {
-			border: 0.0625rem solid; //1px
-			outline: 0.0625rem dotted; //1px
-			outline-offset: -0.25rem; //4px
-		}
 	}
 }

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

@@ -3,21 +3,23 @@
 /* Horizon theme                       */
 /* =================================== */
 
-@_sap_ui_rta_Border_LightColor: @sapUiWhite; //#fff
-@_sap_ui_rta_Border_DarkColor: @sapPrimary1; //#354a5f
+@_sap_ui_rta_Border_LightColor: @sapUiShellBorderColor; //#fff
+@_sap_ui_rta_Border_DarkColor: @sapUiButtonEmphasizedBorderColor; //#0070f2
 @_sap_ui_rta_Border_BoxShadow: 0 0.625rem 1.25rem fade(black, 19), 0 0.375rem 0.375rem fade(black, 23), 0 0 0 0.0625rem fade(white, 20), 0 0.0625rem 0 0 fade(white, 20); //10px 20px 6px 6px 1px 1px
 
 .sapMDialog.sapUiRTABorder {
-	border: 0.1875rem solid @_sap_ui_rta_Border_LightColor; //3px
-	border-image: repeating-linear-gradient( -45deg, @_sap_ui_rta_Border_DarkColor, @_sap_ui_rta_Border_DarkColor 5px, @_sap_ui_rta_Border_LightColor 5px, @_sap_ui_rta_Border_LightColor 10px) 4;
+	border: 0.188rem solid @_sap_ui_rta_Border_LightColor; //3px
+	border-radius: @sapUiElementBorderCornerRadius;
+	outline: 0.188rem dashed @_sap_ui_rta_Border_DarkColor; //3px
+	outline-offset: -0.188rem;
 }
 
 .sapUiRtaPopover {
 
 	&.sapMPopover, .sapMPopover {
-		border: 0.125rem solid @_sap_ui_rta_Border_LightColor; //2px
-		border-image: repeating-linear-gradient(-45deg, @_sap_ui_rta_Border_DarkColor, @_sap_ui_rta_Border_DarkColor 4px, @_sap_ui_rta_Border_LightColor 4px, @_sap_ui_rta_Border_LightColor 6px) 4;
+		border: 0.188rem dashed @_sap_ui_rta_Border_DarkColor; //3px
 		box-shadow: @_sap_ui_rta_Border_BoxShadow;
+		border-radius: @sapUiElementBorderCornerRadius;
 	}
 
 	&.sapMPopoverArr, .sapMPopoverArr {
@@ -26,8 +28,7 @@
 		bottom: -2rem; //32px
 		&:after {
 			box-shadow: 0.375rem -0.375rem 0.75rem 0 fade(black, 30), 0 0 0 0.0625rem fade(white, 20); //6px 6px 12px 1px
-			border: 0.125rem solid @_sap_ui_rta_Border_LightColor; //2px
-			border-image: repeating-linear-gradient(-50deg, @_sap_ui_rta_Border_DarkColor, @_sap_ui_rta_Border_DarkColor 3px, @_sap_ui_rta_Border_LightColor 3px, @_sap_ui_rta_Border_LightColor 5px) 4;
+			border: 0.188rem dashed @_sap_ui_rta_Border_DarkColor; //3px
 			width: 1rem; //16px
 			height: 0.8125rem; //13px
 			margin: -0.65rem 0 0 0.35rem; //10px 6px

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

@@ -3,13 +3,8 @@
 /* Horizon theme                               */
 /* =========================================== */
 
-@sap_ui_rta_FieldRepository_ListSelect: darken(@sapList_Active_TextColor, 10%); //#e6e6e6
-@sap_ui_rta_FieldRepository_ListHoverText: @sapPrimary6; //#32363a
-@sap_ui_rta_FieldRepository_ListHoverBG: @sapUiListSelectionHoverBackground; //#dde8f1
-@sap_ui_rta_FieldRepository_ButtonEmphasizedBG: @sapUiButtonEmphasizedBackground; //#0a6ed1
-@sap_ui_rta_FieldRepository_ButtonEmphasizedText: @sapUiButtonEmphasizedTextColor; //#ffffff
-@sap_ui_rta_FieldRepository_ButtonEmphasizedHoverBG: @sapUiButtonHoverBackground; //#ebf5fe
-@sap_ui_rta_FieldRepository_FocusColor: @sapContent_FocusColor; //#000000
+@sap_ui_rta_FieldRepository_ListSelect: @sapUiListHoverSelectionBackground;
+@sap_ui_rta_FieldRepository_ButtonActiveColor: @sapUiButtonActiveBorderColor;
 
 .sapUiRtaMode {
 
@@ -17,42 +12,27 @@
 
 		.sapMBtn {
 			&:hover:not(focus) {
-				.sapMBtnInner {
-					border: 0.0625rem solid @sap_ui_rta_FieldRepository_ButtonEmphasizedBG; //1px
-				}
 				.sapMBtnHoverable {
 					outline: none;
 				}
 			}
 
-			> .sapMBtnInner {
-				border: 0.0625rem solid @sap_ui_rta_FieldRepository_ButtonEmphasizedText; //1px
+			> .sapMBtnInner:not(.sapMBtnEmphasized) {
+				background: transparent;
 			}
 
 			&:focus {
-				&:not(:hover) > .sapMFocusable {
-					border: 0.0625rem dotted @sap_ui_rta_FieldRepository_FocusColor; //1px
-					outline: none;
-				}
 				&:hover > .sapMFocusable {
-					border: 0.0625rem solid; //1px
-					outline: 0.0625rem dotted; //1px
-					outline-offset: -0.25rem; //4px
+					outline: 0.125rem solid @sap_ui_rta_FieldRepository_ButtonActiveColor;
+					outline-offset: -0.125rem;
 				}
 			}
 		}
 
 		.sapMLIBHoverable {
-			&:hover {
-				background: @sap_ui_rta_FieldRepository_ListSelect;
-			}
 			&.sapMLIBSelected:hover {
-				background: @sap_ui_rta_FieldRepository_ListHoverBG;
+				background: @sap_ui_rta_FieldRepository_ListSelect;
 			}
 		}
-
-		.sapMLIB.sapMLIBSelected {
-			border-color: transparent;
-		}
 	}
 }

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

@@ -3,9 +3,9 @@
 /* Horizon theme                       */
 /* =================================== */
 
-@_sap_ui_rta_Overlay_BaseBG: @sapBackgroundColor; //#fafafa
-@_sap_ui_rta_Overlay_BaseColor: @sapPrimary1; //#3f5161
-@_sap_ui_rta_Overlay_Base_PlaceholderBG: lighten(saturate(@sapPrimary4, 15%), 2%); //#f1f5f6
+@_sap_ui_rta_Overlay_BaseBG: @sapUiShellBackground; //#f5f6f7
+@_sap_ui_rta_Overlay_BaseColor: @sapUiNotificationBarBG; //rgba(85,107,130,0.98)
+@_sap_ui_rta_Overlay_Base_PlaceholderBG: lighten(saturate(@sapUiShellBackground, 15%), 2%);
 
 .sapUiRta {
 	.sapUiDtOverlayDropZone {

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

@@ -3,5 +3,26 @@
 /* Horizon theme                                  */
 /* ============================================== */
 
-@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapPrimary1; //#3f5161;
-@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiWhite; //#fff
+@_sap_ui_rta_Toolbar_Adaptation_BaseColor: @sapUiToolbarBackground;
+@_sap_ui_rta_Toolbar_Adaptation_TextColor: @sapUiShellTextColor;
+@_sap_ui_rta_Toolbar_Adaptation_BorderDarkColor: @sapUiButtonEmphasizedBorderColor;
+
+.sapUiRtaMode {
+
+  .sapUiRtaToolbar.sapUiRtaToolbarAdaptation {
+    border: 0.188rem dashed @_sap_ui_rta_Toolbar_Adaptation_BorderDarkColor;
+    border-image: none;
+
+    .sapMFlexBox {
+      background-color: @_sap_ui_rta_Toolbar_Adaptation_BaseColor;
+    }
+  }
+
+  .sapMList {
+    padding: 3px;
+  }
+
+  .sapUiRtaVersionHistory {
+    border: none;
+  }
+}

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

@@ -3,21 +3,78 @@
 /* Horizon theme                            */
 /* ======================================== */
 
-@_sap_ui_rta_Toolbar_Base_SegBBtnHoverBG: lighten(saturate(@sapPrimary2, 40%), 42%); //#CAE4FB
-@_sap_ui_rta_Toolbar_Base_TextColor: @sapUiWhite; //#fff
-@_sap_ui_rta_Toolbar_Base_BaseColor: @sapPrimary1; //#3f5161;
-@_sap_ui_rta_Toolbar_Base_BtnHover: fade(lighten(@sapPrimary1, 18%), 50%); //rgba(99, 127, 153, 0.5)
+@_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;
 
 .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;
+		}
 	}
 }
 
 .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/Toolbar.personalization.less

@@ -3,4 +3,15 @@
 /* Horizon theme                                       */
 /* =================================================== */
 
-@_sap_ui_rta_Toolbar_Personalization_BaseColor: darken(saturate(@sapPrimary1, 5), 9); //#2a3a48
+@_sap_ui_rta_Toolbar_Personalization_BaseColor: @sapUiToolbarBackground;
+@_sap_ui_rta_Toolbar_Personalization_TextColor: @sapUiShellTextColor;
+
+.sapUiRtaToolbar.type_personalization {
+  .sapMBtn {
+    .sapMBtnTransparent.sapMBtnInner {
+      .sapMBtnContent {
+        text-shadow: none;
+      }
+    }
+  }
+}

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

@@ -3,4 +3,5 @@
 /* Horizon theme                                  */
 /* ============================================== */
 
-@_sap_ui_rta_Toolbar_Standalone_BaseColor: @sapPrimary1; //#3f5161;
+@_sap_ui_rta_Toolbar_Standalone_BaseColor: @sapUiToolbarBackground;
+@_sap_ui_rta_Toolbar_Standalone_TextColor: @sapUiShellTextColor;