From d925288cb04275e804b76e8c1b91cfc5d484c1a9 Mon Sep 17 00:00:00 2001 From: IB002 <132930816+IB002@users.noreply.github.com> Date: Wed, 12 Jul 2023 16:50:31 -0400 Subject: [PATCH 01/15] fix(styles): updated input styles for tool-header [ci visual] --- packages/styles/src/tool-header.scss | 310 ++++++++++++++++++++++++++- 1 file changed, 301 insertions(+), 9 deletions(-) diff --git a/packages/styles/src/tool-header.scss b/packages/styles/src/tool-header.scss index 18f8dfeebc..0efd484076 100644 --- a/packages/styles/src/tool-header.scss +++ b/packages/styles/src/tool-header.scss @@ -1,5 +1,6 @@ @import "./new-settings"; @import "./mixins"; +@import "./mixins/button/button-helper"; $block: #{$fd-namespace}-tool-header; $fd-tool-header-height: 2.75rem !default; @@ -68,6 +69,9 @@ $fd-tool-header-object-status-semantic-values: ( ); .#{$block} { + // Paddings + $fd-tool__header-item-spacing: 0.5rem !default; + @include fd-reset(); @include fd-flex-vertical-center() { @@ -84,6 +88,20 @@ $fd-tool-header-object-status-semantic-values: ( &__group { @include fd-reset(); @include fd-flex-vertical-center(); + + &--center { + display: none; + justify-content: center; + margin: 0 $fd-tool__header-item-spacing; + + .#{$block}__action { + width: 100%; + } + + @include fd-media-xl() { + display: inline-block; + } + } } &__element { @@ -244,21 +262,295 @@ $fd-tool-header-object-status-semantic-values: ( } } - .#{$block}__input-group { - background: var(--sapShellColor); - border: 0.0625rem solid var(--sapShell_InteractiveBorderColor); + .#{$block}__search-field { + --fdSelect_Text_Content_Color: var(--fdShellbar_Select_Content_Color); + --fdInputGroup_Input_Border: var(--fdShellbar_Input_Border); + --fdInputGroup_Input_Color: var(--fdShellbar_Input_Color); + --fdInputGroup_Input_Placeholder_Color: var(--fdShellbar_Input_Placeholder_Color); + --fdInputGroup_Input_Placeholder_Style: var(--fdShellbar_Input_Placeholder_Style); + --fdInputGroup_Background: none; + --fdInputGroup_Background_Color: var(--fdShellbar_Input_Background); + --fdInputGroup_Hover_Background: none; + --fdInput_Group_Button_Box_Shadow: none; + --fdInput_Box_Shadow_Hover: none; + + box-shadow: none; + border: var(--fdShellbar_Search_Border); + border-radius: var(--fdShellbar_Input_Border_Radius); + position: relative; + cursor: text; + + &-helper { + display: var(--fdShellbar_Helper_Display); + + &::before, + &::after { + position: absolute; + content: ""; + z-index: 20; + pointer-events: none; + box-shadow: var(--sapField_Shadow); + border-radius: var(--fdShellbar_Input_Border_Radius); + + @include fd-set-equal-positions(0); + } - input { - color: var(--sapShell_TextColor); + &::after { + box-shadow: var(--fdShellbar_Helper_Bottom_Shadow); + border-radius: 0; + } + } + + &-input { + position: relative; + + @include fd-set-paddings-x-equal(var(--fdShellbar_Search_Input_X_Padding)); + + @include fd-hover() { + --fdInputGroup_Hover_Input_Background: var(--fdShellbar_Input_Hover_Background); + --fdInputGroup_Addon_Background: var(--fdShellbar_Search_Container_Hover_Background); + & ~ .#{$block}__search-field-addon { + --fdInputGroup_Addon_Background: var(--fdShellbar_Search_Container_Hover_Background); + } + + & ~ .#{$block}__search-field-helper { + &::after { + box-shadow: inset 0 -0.0625rem 0 var(--sapField_Hover_BorderColor); + } + } + } + + @include fd-focus() { + --fdInputGroup_Input_Color: var(--fdShellbar_Input_Focus_Color); + --fdInputGroup_Input_Background: var(--fdShellbar_Input_Focus_Background); + } + + &:placeholder-shown { + & ~ .#{$block}__search-cancel { + display: none; + } + } + + &:not(:placeholder-shown) { + & ~ .#{$block}__search-submit { + > * { + --fdButtonBackgroundColor: var(--fdShellbar_Search_Active_Button_Background); + --fdButtonColor: var(--fdShellbar_Search_Active_Button_Color); + --fdShellbar_Button_Active_Background: var(--fdButtonBackgroundColor); + --fdShellbar_Button_Active_Color: var(--fdShellbar_Search_Active_Button_Color); + + @include fd-set-border-left(var(--fdShellbar_Button_Left_Border)); + + &:hover { + --fdButtonBackgroundColor: var(--fdShellbar_Search_Active_Button_Hover_Background); + } + } + } + } + + &--select { + @include fd-flex-vertical-center(); + + font-style: normal; + height: 100%; + flex: 0 1; + } + } + + &-addon { + @include fd-flex-vertical-center() { + height: 100%; + flex: 0 1; + } + + .#{$block}__button { + --fdButton_Outline_Offset: 0; + --fdButton_Focus_Border_Radius: var(--fdShellbar_Input_Border_Radius); + + height: var(--fdShellbar_Input_Addon_Dimension); + min-width: var(--fdShellbar_Input_Addon_Dimension); + border-radius: var(--fdShellbar_Input_Border_Radius); + border-width: var(--fdShellbar_Input_Addon_Border_Width); + + @include fd-hover () { + @include fd-set-border-left(var(--fdShellbar_Button_Left_Border)); + + --fdButtonBackgroundColor: var(--fdShellbar_Search_Button_Hover_Background); + } + + @include fd-active() { + border-color: var(--fdShellbar_Button_Active_Border_Color); + } + } + } + + .#{$block}__search-field-category { + flex-shrink: 0; + + @include fd-hover() { + --fdInputGroup_Addon_Background: var(--fdShellbar_Input_Background); + & ~ .#{$block}__search-field-input, + & ~ .#{$block}__search-field-addon { + --fdInputGroup_Addon_Background: var(--fdShellbar_Input_Background); + --fdInputGroup_Input_Background: var(--fdShellbar_Input_Background); + } + + .#{$block}__search-category { + box-shadow: var(--sapContent_Interaction_Shadow); + } - &::placeholder { - color: var(--sapShell_InteractiveTextColor); + .#{$block}__search-dropdown { + background-color: var(--fdShellbar_Search_Category_Button_Hover_Background); + } + } + + > * { + @include fd-set-margin-right(var(--fdShellbar_Search_Category_Offset_Right)); + @include fd-set-margins-y-equal(); + } + .#{$block}__search-dropdown { + background-color: var(--fdShellbar_Input_Background); + outline: none; + position: static; + + --fdInput_Group_Button_Background: transparent; + --fdInput_Group_Button_Text_Color: var(--sapShell_InteractiveTextColor); + + @include fd-focus() { + &::after { + display: none; + } + } + } + .#{$block}__search-category { + --fdSelect_Background: transparent; + --fdSelect_Hover_Background: transparent; + --fdSelect_Focus_Background: transparent; + --fdSelect_Background_Color: var(--fdShellbar_Input_Background); + --fdSelect_Hover_Background_Color: var(--fdShellbar_Input_Background); + + border: var(--fdShellbar_Search_Category_Border); + border-width: var(--fdShellbar_Search_Category_Border_width); + border-radius: 0; + min-height: var(--fdShellbar_Input_Addon_Dimension); + height: var(--fdShellbar_Input_Addon_Dimension); + margin: 0; + position: relative; + + @include fd-set-margin-left(var(--fdShellbar_Search_Category_Offset_Left)); + + &::after { + box-shadow: none; + } + + &::before { + content: ""; + position: absolute; + top: 0; + right: 0; + bottom: 0; + background: var(--sapShell_InteractiveBorderColor); + width: 0.0625rem; + display: var(--fdShellbar_Search_Separator_Display); + } + + @include fd-rtl() { + &::before { + left: 0; + right: auto; + } + } + + @include fd-focus() { + --fdSelect_Text_Content_Color: var(--sapButton_Active_TextColor); + --fdShellbar_Input_Background: var(--fdShellbar_Search_Category_Button_Hover_Background); + --fdSelect_Focus_Background: var(--fdShellbar_Search_Container_Hover_Background); + + border-radius: var(--fdShellbar_Input_Border_Radius); + outline-color: var(--sapButton_Lite_Active_BorderColor); + outline-width: 0.0625rem; + outline-offset: -0.0625rem; + + .#{$block}__search-dropdown { + --fdInput_Group_Button_Text_Color: var(--sapButton_Active_TextColor); + } + + &::before { + display: none; + } + } } } @include fd-hover() { - background: var(--sapShell_Hover_Background); - border-color: var(--sapShell_InteractiveBorderColor); + --fdInputGroup_Hover_Background_Color: var(--fdShellbar_Search_Container_Hover_Background); + + .#{$block}__search-field-helper { + &::before { + box-shadow: var(--sapField_Hover_Shadow); + } + + &::after { + box-shadow: var(--fdShellbar_Hover_Helper_Bottom_Shadow); + } + } + + .#{$block}__search-field { + &-category .#{$block}__search-category { + --fdSelect_Background_Color: var(--fdShellbar_Search_Container_Hover_Background); + --fdSelect_Hover_Background_Color: var(--fdShellbar_Search_Container_Hover_Background); + + @include fd-hover() { + border-radius: var(--fdShellbar_Input_Border_Radius); + + &::before { + display: none; + } + } + } + } + + .#{$block}__search-field-category:not(:hover) { + .#{$block}__search-dropdown { + background-color: var(--fdShellbar_Search_Container_Hover_Background); + } + } + } + + @include fd-focus() { + outline: none; + box-shadow: var(--fdShellbar_Active_Shadow); + background-color: var(--fdShellbar_Active_Background); + + .#{$block}__search-field-helper { + &::before { + outline: var(--fdShellbar_Search_Active_Outline); + outline-offset: -0.125rem; + } + + &::after, + &::before { + box-shadow: none; + } + } + + .#{$block}__search-field-addon { + --fdInputGroup_Addon_Background: var(--fdShellbar_Search_Hover_Background); + } + + .#{$block}__search-category { + background-color: var(--fdShellbar_Search_Hover_Background); + + &::before { + // display: none; + } + } + + .#{$block}__search-field-category { + .#{$block}__search-dropdown { + background-color: var(--fdShellbar_Search_Hover_Category_Button_Background); + } + } } } From f32d12999e40fca17278c52363f5daae0edf2638 Mon Sep 17 00:00:00 2001 From: IB002 <132930816+IB002@users.noreply.github.com> Date: Wed, 12 Jul 2023 16:59:32 -0400 Subject: [PATCH 02/15] docs(styles): updated input text field [ci visual] --- .../tool-header/horizontal-paddings.example.html | 14 ++++++++------ .../Components/tool-header/menu.example.html | 11 +++++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html b/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html index 51283b0c88..772d38a6e8 100644 --- a/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html +++ b/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html @@ -96,17 +96,19 @@

Size XL (3rem)

-
+
-
- +
+ - - +
+
+
-
+
-
- +
+ - +
+
+
+
-
+
diff --git a/packages/styles/stories/Components/tool-header/menu.example.html b/packages/styles/stories/Components/tool-header/menu.example.html index 58691098ac..4c56689bfa 100644 --- a/packages/styles/stories/Components/tool-header/menu.example.html +++ b/packages/styles/stories/Components/tool-header/menu.example.html @@ -15,7 +15,7 @@

Product Name

-
+
From 455045532a7c6a27c6f81abe308e2afee8485b30 Mon Sep 17 00:00:00 2001 From: IB002 <132930816+IB002@users.noreply.github.com> Date: Mon, 17 Jul 2023 15:32:14 -0400 Subject: [PATCH 07/15] chore: added seperate folder for tool-header files --- .../common/tool-header/_sap_horizon.scss | 47 +++++++++++++++++++ .../common/tool-header/_sap_horizon_hc.scss | 27 +++++++++++ packages/styles/src/theming/sap_horizon.scss | 1 + .../styles/src/theming/sap_horizon_dark.scss | 1 + .../styles/src/theming/sap_horizon_hcb.scss | 1 + .../styles/src/theming/sap_horizon_hcw.scss | 1 + 6 files changed, 78 insertions(+) create mode 100644 packages/styles/src/theming/common/tool-header/_sap_horizon.scss create mode 100644 packages/styles/src/theming/common/tool-header/_sap_horizon_hc.scss diff --git a/packages/styles/src/theming/common/tool-header/_sap_horizon.scss b/packages/styles/src/theming/common/tool-header/_sap_horizon.scss new file mode 100644 index 0000000000..892ce011b2 --- /dev/null +++ b/packages/styles/src/theming/common/tool-header/_sap_horizon.scss @@ -0,0 +1,47 @@ +:root { + --fdToolHeader_Height: 3.25rem; + --fdToolHeader_Shadow: inset 0 -0.0625rem 0 0 var(--sapShell_BorderColor); + --fdToolHeader_Button_Hover_Border_Color: var(--sapButton_Lite_BorderColor); + --fdToolHeader_Button_Active_Border_Color: var(--sapButton_Lite_Active_BorderColor); + --fdToolHeader_Button_Outline_Color: var(--sapContent_FocusColor); + --fdToolHeader_Search_Border: none; + --fdToolHeader_Search_Category_Border: none; + --fdToolHeader_Search_Category_Border_width: 0; + --fdToolHeader_Search_Category_Offset_Left: 0.25rem; + --fdToolHeader_Search_Category_Offset_Right: var(--fdToolHeader_Search_Category_Offset_Left); + --fdToolHeader_Search_Category_Button_Hover_Background: var(--sapShell_Hover_Background); + --fdToolHeader_Search_Hover_Category_Button_Background: var(--fdToolHeader_Search_Category_Button_Hover_Background); + --fdToolHeader_Search_Input_Border: none; + --fdToolHeader_Search_Container_Background: var(--sapShell_InteractiveBackground); + --fdToolHeader_Search_Container_Hover_Background: var(--sapShell_Hover_Background); + --fdToolHeader_Input_Background: var(--sapShell_InteractiveBackground); + --fdToolHeader_Input_Hover_Background: var(--sapShell_Hover_Background); + --fdToolHeader_Input_Color: var(--sapShell_InteractiveTextColor); + --fdToolHeader_Input_Placeholder_Color: var(--sapField_PlaceholderTextColor); + --fdToolHeader_Input_Border_Radius: 1.125rem; + --fdToolHeader_Input_Hover_Border_Color: var(--sapField_BorderColor); + --fdToolHeader_Input_Addon_Dimension: 1.75rem; + --fdToolHeader_Input_Addon_Border_Width: var(--sapButton_BorderWidth); + --fdToolHeader_Search_Hover_Background: var(--sapShell_Hover_Background); + --fdToolHeader_Search_Height: 1.75rem; + --fdToolHeader_Search_Separator_Display: block; + --fdToolHeader_Search_Button_Hover_Background: var(--fdToolHeader_Input_Hover_Background); + --fdToolHeader_Search_Active_Button_Background: var(--sapButton_Lite_Active_BorderColor); + --fdToolHeader_Search_Active_Button_Hover_Background: var(--fdToolHeader_Search_Active_Button_Background); + --fdToolHeader_Search_Active_Button_Color: var(--sapButton_Emphasized_TextColor); + --fdToolHeader_Active_Background: var(--sapShell_Active_Background); + --fdToolHeader_Active_Shadow: 0 0 0 0.125rem var(--sapButton_Lite_Active_BorderColor); + --fdToolHeader_Search_Active_Outline: none; + --fdToolHeader_Input_Border: none; + --fdToolHeader_Input_Focus_Color: var(--sapShell_InteractiveTextColor); + --fdToolHeader_Input_Focus_Background: transparent; + --fdToolHeader_Input_Placeholder_Style: italic; + --fdToolHeader_Button_Left_Border: 0.0625rem solid transparent; + --fdToolHeader_Input_Group_Background: 0 100% / 100% 0.0625rem no-repeat linear-gradient(0deg, var(--sapField_BorderColor), var(--sapField_BorderColor)) border-box; + --fdToolHeader_Input_Group_Hover_Background: 0 100% / 100% 0.0625rem no-repeat linear-gradient(0deg, var(--sapField_Hover_BorderColor), var(--sapField_Hover_BorderColor)) border-box; + --fdToolHeader_Helper_Bottom_Shadow: inset 0 -0.0625rem 0 var(--sapField_BorderColor); + --fdToolHeader_Hover_Helper_Bottom_Shadow: inset 0 -0.0625rem 0 var(--sapField_Hover_BorderColor); + --fdToolHeader_Helper_Display: block; + --fdToolHeader_Button_Color: var(--sapShell_TextColor); + --fdToolHeader_Search_Input_X_Padding: 0.9rem; +} diff --git a/packages/styles/src/theming/common/tool-header/_sap_horizon_hc.scss b/packages/styles/src/theming/common/tool-header/_sap_horizon_hc.scss new file mode 100644 index 0000000000..19341b72ba --- /dev/null +++ b/packages/styles/src/theming/common/tool-header/_sap_horizon_hc.scss @@ -0,0 +1,27 @@ +@import "./sap_horizon"; + +:root { + --fdToolHeader_Search_Border: solid 0.0625rem var(--sapShell_InteractiveBorderColor); + --fdToolHeader_Search_Category_Offset: -0.0625rem; + --fdToolHeader_Search_Category_Offset_Left: -0.0625rem; + --fdToolHeader_Search_Category_Border: solid var(--sapShell_InteractiveBorderColor); + --fdToolHeader_Search_Category_Border_width: 0 0.0625rem; + --fdToolHeader_Search_Category_Button_Hover_Background: var(--sapButton_Selected_Hover_Background); + --fdToolHeader_Search_Hover_Category_Button_Background: var(--fdToolHeader_Input_Hover_Background); + --fdToolHeader_Search_Container_Hover_Background: var(--sapShellColor); + --fdToolHeader_Input_Hover_Background: var(--sapShellColor); + --fdToolHeader_Input_Border_Radius: 0; + --fdToolHeader_Input_Addon_Dimension: 2.25rem; + --fdToolHeader_Input_Addon_Border_Width: 0; + --fdToolHeader_Search_Separator_Display: none; + --fdToolHeader_Search_Hover_Background: var(--sapShellColor); + --fdToolHeader_Search_Button_Hover_Background: var(--fdToolHeader_Search_Active_Button_Background); + --fdToolHeader_Search_Active_Button_Background: var(--sapShell_Active_Background); + --fdToolHeader_Active_Background: var(--sapShellColor); + --fdToolHeader_Active_Shadow: none; + --fdToolHeader_Search_Active_Outline: var(--sapButton_Lite_BorderColor) dotted 0.125rem; + --fdToolHeader_Input_Placeholder_Style: normal; + --fdToolHeader_Button_Left_Border: solid 0.0625rem var(--fdToolHeader_Search_Active_Button_Color); + --fdToolHeader_Helper_Bottom_Shadow: none; + --fdToolHeader_Hover_Helper_Bottom_Shadow: none; +} diff --git a/packages/styles/src/theming/sap_horizon.scss b/packages/styles/src/theming/sap_horizon.scss index fb3d0e6c15..f1fa4d918a 100644 --- a/packages/styles/src/theming/sap_horizon.scss +++ b/packages/styles/src/theming/sap_horizon.scss @@ -41,6 +41,7 @@ @import "./common/calendar/sap_horizon"; @import "./common/step-input/sap_horizon"; @import "./common/object-status/sap_horizon"; +@import "./common/tool-header/sap_horizon"; @import "./sap_horizon/css_variables"; :root { diff --git a/packages/styles/src/theming/sap_horizon_dark.scss b/packages/styles/src/theming/sap_horizon_dark.scss index 0baf593842..cdf7044974 100644 --- a/packages/styles/src/theming/sap_horizon_dark.scss +++ b/packages/styles/src/theming/sap_horizon_dark.scss @@ -41,6 +41,7 @@ @import "./common/calendar/sap_horizon"; @import "./common/step-input/sap_horizon"; @import "./common/object-status/sap_horizon"; +@import "./common/tool-header/sap_horizon"; @import "./sap_horizon_dark/css_variables"; :root { diff --git a/packages/styles/src/theming/sap_horizon_hcb.scss b/packages/styles/src/theming/sap_horizon_hcb.scss index c0ef10b393..d203fdb67a 100644 --- a/packages/styles/src/theming/sap_horizon_hcb.scss +++ b/packages/styles/src/theming/sap_horizon_hcb.scss @@ -41,6 +41,7 @@ @import "./common/calendar/sap_horizon"; @import "./common/step-input/sap_horizon"; @import "./common/object-status/sap_horizon_hc"; +@import "./common/tool-header/sap_horizon_hc"; @import "./sap_horizon_hcb/css_variables"; :root { diff --git a/packages/styles/src/theming/sap_horizon_hcw.scss b/packages/styles/src/theming/sap_horizon_hcw.scss index 840b70dc46..06afb00aba 100644 --- a/packages/styles/src/theming/sap_horizon_hcw.scss +++ b/packages/styles/src/theming/sap_horizon_hcw.scss @@ -42,6 +42,7 @@ @import "./common/calendar/sap_horizon"; @import "./common/step-input/sap_horizon"; @import "./common/object-status/sap_horizon_hc"; +@import "./common/tool-header/sap_horizon_hc"; @import "./sap_horizon_hcw/css_variables"; :root { From d0a0f9509a040845775f2890e2240316c862bc56 Mon Sep 17 00:00:00 2001 From: IB002 <132930816+IB002@users.noreply.github.com> Date: Mon, 17 Jul 2023 15:33:37 -0400 Subject: [PATCH 08/15] chore: renamed tool-header variables to start with -- ToolHeader --- packages/styles/src/tool-header.scss | 120 +++++++++++++-------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/packages/styles/src/tool-header.scss b/packages/styles/src/tool-header.scss index 816090e628..cc86172580 100644 --- a/packages/styles/src/tool-header.scss +++ b/packages/styles/src/tool-header.scss @@ -263,25 +263,25 @@ $fd-tool-header-object-status-semantic-values: ( } .#{$block}__search-field { - --fdSelect_Text_Content_Color: var(--fdShellbar_Select_Content_Color); - --fdInputGroup_Input_Border: var(--fdShellbar_Input_Border); - --fdInputGroup_Input_Color: var(--fdShellbar_Input_Color); - --fdInputGroup_Input_Placeholder_Color: var(--fdShellbar_Input_Placeholder_Color); - --fdInputGroup_Input_Placeholder_Style: var(--fdShellbar_Input_Placeholder_Style); + --fdSelect_Text_Content_Color: var(--fdToolHeader_Select_Content_Color); + --fdInputGroup_Input_Border: var(--fdToolHeader_Input_Border); + --fdInputGroup_Input_Color: var(--fdToolHeader_Input_Color); + --fdInputGroup_Input_Placeholder_Color: var(--fdToolHeader_Input_Placeholder_Color); + --fdInputGroup_Input_Placeholder_Style: var(--fdToolHeader_Input_Placeholder_Style); --fdInputGroup_Background: none; - --fdInputGroup_Background_Color: var(--fdShellbar_Input_Background); + --fdInputGroup_Background_Color: var(--fdToolHeader_Input_Background); --fdInputGroup_Hover_Background: none; --fdInput_Group_Button_Box_Shadow: none; --fdInput_Box_Shadow_Hover: none; box-shadow: none; - border: var(--fdShellbar_Search_Border); - border-radius: var(--fdShellbar_Input_Border_Radius); + border: var(--fdToolHeader_Search_Border); + border-radius: var(--fdToolHeader_Input_Border_Radius); position: relative; cursor: text; &-helper { - display: var(--fdShellbar_Helper_Display); + display: var(--fdToolHeader_Helper_Display); &::before, &::after { @@ -290,13 +290,13 @@ $fd-tool-header-object-status-semantic-values: ( z-index: 20; pointer-events: none; box-shadow: var(--sapField_Shadow); - border-radius: var(--fdShellbar_Input_Border_Radius); + border-radius: var(--fdToolHeader_Input_Border_Radius); @include fd-set-equal-positions(0); } &::after { - box-shadow: var(--fdShellbar_Helper_Bottom_Shadow); + box-shadow: var(--fdToolHeader_Helper_Bottom_Shadow); border-radius: 0; } } @@ -304,13 +304,13 @@ $fd-tool-header-object-status-semantic-values: ( &-input { position: relative; - @include fd-set-paddings-x-equal(var(--fdShellbar_Search_Input_X_Padding)); + @include fd-set-paddings-x-equal(var(--fdToolHeader_Search_Input_X_Padding)); @include fd-hover() { - --fdInputGroup_Hover_Input_Background: var(--fdShellbar_Input_Hover_Background); - --fdInputGroup_Addon_Background: var(--fdShellbar_Search_Container_Hover_Background); + --fdInputGroup_Hover_Input_Background: var(--fdToolHeader_Input_Hover_Background); + --fdInputGroup_Addon_Background: var(--fdToolHeader_Search_Container_Hover_Background); & ~ .#{$block}__search-field-addon { - --fdInputGroup_Addon_Background: var(--fdShellbar_Search_Container_Hover_Background); + --fdInputGroup_Addon_Background: var(--fdToolHeader_Search_Container_Hover_Background); } & ~ .#{$block}__search-field-helper { @@ -321,8 +321,8 @@ $fd-tool-header-object-status-semantic-values: ( } @include fd-focus() { - --fdInputGroup_Input_Color: var(--fdShellbar_Input_Focus_Color); - --fdInputGroup_Input_Background: var(--fdShellbar_Input_Focus_Background); + --fdInputGroup_Input_Color: var(--fdToolHeader_Input_Focus_Color); + --fdInputGroup_Input_Background: var(--fdToolHeader_Input_Focus_Background); } &:placeholder-shown { @@ -334,15 +334,15 @@ $fd-tool-header-object-status-semantic-values: ( &:not(:placeholder-shown) { & ~ .#{$block}__search-submit { > * { - --fdButtonBackgroundColor: var(--fdShellbar_Search_Active_Button_Background); - --fdButtonColor: var(--fdShellbar_Search_Active_Button_Color); - --fdShellbar_Button_Active_Background: var(--fdButtonBackgroundColor); - --fdShellbar_Button_Active_Color: var(--fdShellbar_Search_Active_Button_Color); + --fdButtonBackgroundColor: var(--fdToolHeader_Search_Active_Button_Background); + --fdButtonColor: var(--fdToolHeader_Search_Active_Button_Color); + --fdToolHeader_Button_Active_Background: var(--fdButtonBackgroundColor); + --fdToolHeader_Button_Active_Color: var(--fdToolHeader_Search_Active_Button_Color); - @include fd-set-border-left(var(--fdShellbar_Button_Left_Border)); + @include fd-set-border-left(var(--fdToolHeader_Button_Left_Border)); &:hover { - --fdButtonBackgroundColor: var(--fdShellbar_Search_Active_Button_Hover_Background); + --fdButtonBackgroundColor: var(--fdToolHeader_Search_Active_Button_Hover_Background); } } } @@ -365,21 +365,21 @@ $fd-tool-header-object-status-semantic-values: ( .#{$block}__button { --fdButton_Outline_Offset: 0; - --fdButton_Focus_Border_Radius: var(--fdShellbar_Input_Border_Radius); + --fdButton_Focus_Border_Radius: var(--fdToolHeader_Input_Border_Radius); - height: var(--fdShellbar_Input_Addon_Dimension); - min-width: var(--fdShellbar_Input_Addon_Dimension); - border-radius: var(--fdShellbar_Input_Border_Radius); - border-width: var(--fdShellbar_Input_Addon_Border_Width); + height: var(--fdToolHeader_Input_Addon_Dimension); + min-width: var(--fdToolHeader_Input_Addon_Dimension); + border-radius: var(--fdToolHeader_Input_Border_Radius); + border-width: var(--fdToolHeader_Input_Addon_Border_Width); @include fd-hover () { - @include fd-set-border-left(var(--fdShellbar_Button_Left_Border)); + @include fd-set-border-left(var(--fdToolHeader_Button_Left_Border)); - --fdButtonBackgroundColor: var(--fdShellbar_Search_Button_Hover_Background); + --fdButtonBackgroundColor: var(--fdToolHeader_Search_Button_Hover_Background); } @include fd-active() { - border-color: var(--fdShellbar_Button_Active_Border_Color); + border-color: var(--fdToolHeader_Button_Active_Border_Color); } } } @@ -388,11 +388,11 @@ $fd-tool-header-object-status-semantic-values: ( flex-shrink: 0; @include fd-hover() { - --fdInputGroup_Addon_Background: var(--fdShellbar_Input_Background); + --fdInputGroup_Addon_Background: var(--fdToolHeader_Input_Background); & ~ .#{$block}__search-field-input, & ~ .#{$block}__search-field-addon { - --fdInputGroup_Addon_Background: var(--fdShellbar_Input_Background); - --fdInputGroup_Input_Background: var(--fdShellbar_Input_Background); + --fdInputGroup_Addon_Background: var(--fdToolHeader_Input_Background); + --fdInputGroup_Input_Background: var(--fdToolHeader_Input_Background); } .#{$block}__search-category { @@ -400,16 +400,16 @@ $fd-tool-header-object-status-semantic-values: ( } .#{$block}__search-dropdown { - background-color: var(--fdShellbar_Search_Category_Button_Hover_Background); + background-color: var(--fdToolHeader_Search_Category_Button_Hover_Background); } } > * { - @include fd-set-margin-right(var(--fdShellbar_Search_Category_Offset_Right)); + @include fd-set-margin-right(var(--fdToolHeader_Search_Category_Offset_Right)); @include fd-set-margins-y-equal(); } .#{$block}__search-dropdown { - background-color: var(--fdShellbar_Input_Background); + background-color: var(--fdToolHeader_Input_Background); outline: none; position: static; @@ -426,18 +426,18 @@ $fd-tool-header-object-status-semantic-values: ( --fdSelect_Background: transparent; --fdSelect_Hover_Background: transparent; --fdSelect_Focus_Background: transparent; - --fdSelect_Background_Color: var(--fdShellbar_Input_Background); - --fdSelect_Hover_Background_Color: var(--fdShellbar_Input_Background); + --fdSelect_Background_Color: var(--fdToolHeader_Input_Background); + --fdSelect_Hover_Background_Color: var(--fdToolHeader_Input_Background); - border: var(--fdShellbar_Search_Category_Border); - border-width: var(--fdShellbar_Search_Category_Border_width); + border: var(--fdToolHeader_Search_Category_Border); + border-width: var(--fdToolHeader_Search_Category_Border_width); border-radius: 0; - min-height: var(--fdShellbar_Input_Addon_Dimension); - height: var(--fdShellbar_Input_Addon_Dimension); + min-height: var(--fdToolHeader_Input_Addon_Dimension); + height: var(--fdToolHeader_Input_Addon_Dimension); margin: 0; position: relative; - @include fd-set-margin-left(var(--fdShellbar_Search_Category_Offset_Left)); + @include fd-set-margin-left(var(--fdToolHeader_Search_Category_Offset_Left)); &::after { box-shadow: none; @@ -451,7 +451,7 @@ $fd-tool-header-object-status-semantic-values: ( bottom: 0; background: var(--sapShell_InteractiveBorderColor); width: 0.0625rem; - display: var(--fdShellbar_Search_Separator_Display); + display: var(--fdToolHeader_Search_Separator_Display); } @include fd-rtl() { @@ -463,10 +463,10 @@ $fd-tool-header-object-status-semantic-values: ( @include fd-focus() { --fdSelect_Text_Content_Color: var(--sapButton_Active_TextColor); - --fdShellbar_Input_Background: var(--fdShellbar_Search_Category_Button_Hover_Background); - --fdSelect_Focus_Background: var(--fdShellbar_Search_Container_Hover_Background); + --fdToolHeader_Input_Background: var(--fdToolHeader_Search_Category_Button_Hover_Background); + --fdSelect_Focus_Background: var(--fdToolHeader_Search_Container_Hover_Background); - border-radius: var(--fdShellbar_Input_Border_Radius); + border-radius: var(--fdToolHeader_Input_Border_Radius); outline-color: var(--sapButton_Lite_Active_BorderColor); outline-width: 0.0625rem; outline-offset: -0.0625rem; @@ -483,7 +483,7 @@ $fd-tool-header-object-status-semantic-values: ( } @include fd-hover() { - --fdInputGroup_Hover_Background_Color: var(--fdShellbar_Search_Container_Hover_Background); + --fdInputGroup_Hover_Background_Color: var(--fdToolHeader_Search_Container_Hover_Background); .#{$block}__search-field-helper { &::before { @@ -491,17 +491,17 @@ $fd-tool-header-object-status-semantic-values: ( } &::after { - box-shadow: var(--fdShellbar_Hover_Helper_Bottom_Shadow); + box-shadow: var(--fdToolHeader_Hover_Helper_Bottom_Shadow); } } .#{$block}__search-field { &-category .#{$block}__search-category { - --fdSelect_Background_Color: var(--fdShellbar_Search_Container_Hover_Background); - --fdSelect_Hover_Background_Color: var(--fdShellbar_Search_Container_Hover_Background); + --fdSelect_Background_Color: var(--fdToolHeader_Search_Container_Hover_Background); + --fdSelect_Hover_Background_Color: var(--fdToolHeader_Search_Container_Hover_Background); @include fd-hover() { - border-radius: var(--fdShellbar_Input_Border_Radius); + border-radius: var(--fdToolHeader_Input_Border_Radius); &::before { display: none; @@ -512,19 +512,19 @@ $fd-tool-header-object-status-semantic-values: ( .#{$block}__search-field-category:not(:hover) { .#{$block}__search-dropdown { - background-color: var(--fdShellbar_Search_Container_Hover_Background); + background-color: var(--fdToolHeader_Search_Container_Hover_Background); } } } @include fd-focus() { outline: none; - box-shadow: var(--fdShellbar_Active_Shadow); - background-color: var(--fdShellbar_Active_Background); + box-shadow: var(--fdToolHeader_Active_Shadow); + background-color: var(--fdToolHeader_Active_Background); .#{$block}__search-field-helper { &::before { - outline: var(--fdShellbar_Search_Active_Outline); + outline: var(--fdToolHeader_Search_Active_Outline); outline-offset: -0.125rem; } @@ -535,16 +535,16 @@ $fd-tool-header-object-status-semantic-values: ( } .#{$block}__search-field-addon { - --fdInputGroup_Addon_Background: var(--fdShellbar_Search_Hover_Background); + --fdInputGroup_Addon_Background: var(--fdToolHeader_Search_Hover_Background); } .#{$block}__search-category { - background-color: var(--fdShellbar_Search_Hover_Background); + background-color: var(--fdToolHeader_Search_Hover_Background); } .#{$block}__search-field-category { .#{$block}__search-dropdown { - background-color: var(--fdShellbar_Search_Hover_Category_Button_Background); + background-color: var(--fdToolHeader_Search_Hover_Category_Button_Background); } } } From 3cef61fd6b4cb599be739ade1c0b9bf774279f35 Mon Sep 17 00:00:00 2001 From: IB002 <132930816+IB002@users.noreply.github.com> Date: Mon, 17 Jul 2023 16:06:14 -0400 Subject: [PATCH 09/15] chore: added missing addon classes --- .../tool-header/horizontal-paddings.example.html | 4 ++-- .../Components/tool-header/menu.example.html | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html b/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html index 7142ef42ce..dc19894b88 100644 --- a/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html +++ b/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html @@ -100,11 +100,11 @@

Size XL (3rem)

- +
- +
diff --git a/packages/styles/stories/Components/tool-header/menu.example.html b/packages/styles/stories/Components/tool-header/menu.example.html index 4c56689bfa..56c85219b5 100644 --- a/packages/styles/stories/Components/tool-header/menu.example.html +++ b/packages/styles/stories/Components/tool-header/menu.example.html @@ -16,14 +16,12 @@

Product Name

-
-
- - - - +
+ +
+
From c0705a616cb6966c0d89a93025e016d6ecb5e8d7 Mon Sep 17 00:00:00 2001 From: IB002 <132930816+IB002@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:49:32 -0400 Subject: [PATCH 10/15] chore: updated tool-header scss --- packages/styles/src/tool-header.scss | 69 ++++++++++++++-------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/packages/styles/src/tool-header.scss b/packages/styles/src/tool-header.scss index cc86172580..bee6b2edeb 100644 --- a/packages/styles/src/tool-header.scss +++ b/packages/styles/src/tool-header.scss @@ -69,9 +69,6 @@ $fd-tool-header-object-status-semantic-values: ( ); .#{$block} { - // Paddings - $fd-tool-header-item-spacing: 0.5rem !default; - @include fd-reset(); @include fd-flex-vertical-center() { @@ -88,20 +85,6 @@ $fd-tool-header-object-status-semantic-values: ( &__group { @include fd-reset(); @include fd-flex-vertical-center(); - - &--center { - display: none; - justify-content: center; - margin: 0 $fd-tool-header-item-spacing; - - .#{$block}__action { - width: 100%; - } - - @include fd-media-xl() { - display: inline-block; - } - } } &__element { @@ -262,6 +245,39 @@ $fd-tool-header-object-status-semantic-values: ( } } + .#{$block}__input-group { + background: var(--sapShellColor); + border: 0.0625rem solid var(--sapShell_InteractiveBorderColor); + + input { + color: var(--sapShell_TextColor); + + &::placeholder { + color: var(--sapShell_InteractiveTextColor); + } + } + + @include fd-hover() { + background: var(--sapShell_Hover_Background); + border-color: var(--sapShell_InteractiveBorderColor); + } + } + + // MODIFIER CLASSES + &--menu { + @include fd-set-paddings-x-equal(0.5rem); + } + + @each $set-name, $set-padding in $fd-tool-header-responsive-paddings { + &--#{$set-name} { + padding: map_get($set-padding, 'padding'); + } + } + + &--responsive-paddings { + @include fd-apply-responsive-paddings(); + } + .#{$block}__search-field { --fdSelect_Text_Content_Color: var(--fdToolHeader_Select_Content_Color); --fdInputGroup_Input_Border: var(--fdToolHeader_Input_Border); @@ -367,8 +383,8 @@ $fd-tool-header-object-status-semantic-values: ( --fdButton_Outline_Offset: 0; --fdButton_Focus_Border_Radius: var(--fdToolHeader_Input_Border_Radius); - height: var(--fdToolHeader_Input_Addon_Dimension); - min-width: var(--fdToolHeader_Input_Addon_Dimension); + // height: var(--fdToolHeader_Input_Addon_Dimension); + // min-width: var(--fdToolHeader_Input_Addon_Dimension); border-radius: var(--fdToolHeader_Input_Border_Radius); border-width: var(--fdToolHeader_Input_Addon_Border_Width); @@ -549,19 +565,4 @@ $fd-tool-header-object-status-semantic-values: ( } } } - - // MODIFIER CLASSES - &--menu { - @include fd-set-paddings-x-equal(0.5rem); - } - - @each $set-name, $set-padding in $fd-tool-header-responsive-paddings { - &--#{$set-name} { - padding: map_get($set-padding, 'padding'); - } - } - - &--responsive-paddings { - @include fd-apply-responsive-paddings(); - } } From 6fc1d01d1d51ee6a263ae559f1400d66c3648b4b Mon Sep 17 00:00:00 2001 From: IB002 <132930816+IB002@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:59:03 -0400 Subject: [PATCH 11/15] docs(styles): updated search field --- .../horizontal-paddings.example.html | 42 ++++++++++++++----- .../Components/tool-header/menu.example.html | 41 ++++++++++++++---- 2 files changed, 64 insertions(+), 19 deletions(-) diff --git a/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html b/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html index dc19894b88..d39fababe4 100644 --- a/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html +++ b/packages/styles/stories/Components/tool-header/horizontal-paddings.example.html @@ -96,16 +96,38 @@

Size XL (3rem)

-
-
-
- -
- -
-
+
+
+ +
+ +
+
+ +
+
diff --git a/packages/styles/stories/Components/tool-header/menu.example.html b/packages/styles/stories/Components/tool-header/menu.example.html index 56c85219b5..d76345f3c5 100644 --- a/packages/styles/stories/Components/tool-header/menu.example.html +++ b/packages/styles/stories/Components/tool-header/menu.example.html @@ -15,18 +15,41 @@

Product Name

-
-
- -
- -
+
+
+ +
+ +
+
+
+
+
-
-
+
Size XL (3rem) id="F4GcX348b1" placeholder="Search everything" /> -
- -
@@ -131,6 +121,11 @@

Size XL (3rem)

+
-
+
Product Name id="F4GcX348b1" placeholder="Search everything" /> -
- -
@@ -50,6 +40,11 @@

Product Name

+