Skip to content

Commit

Permalink
fix(styles): update User menu for VEGA (#5893)
Browse files Browse the repository at this point in the history
* fix(styles): update User Menu to latest VEGA design [ci visual]

* fix(styles): update User Menu to latest VEGA design [ci visual]
  • Loading branch information
InnaAtanasova authored Jan 16, 2025
1 parent 17413ac commit 53463ae
Show file tree
Hide file tree
Showing 18 changed files with 530 additions and 122 deletions.
52 changes: 40 additions & 12 deletions packages/styles/src/navigation-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,17 @@ $block: #{$fd-namespace}-navigation-list;
--fdNavigationList_Content_Selection_Indicator_Color: transparent;

// Text
--fdNavigationList_Text_Shadow: none;
--fdNavigationList_Text_Offset: 1rem;
--fdNavigationList_Text_Color: var(--sapList_TextColor);
--fdNavigationList_Text_Font_Size: var(--sapFontSize);
--fdNavigationList_Text_Font_Family: var(--sapFontBoldFamily);

// Icon
--fdNavigationList_Icon_Width: 2.5rem;
--fdNavigationList_Icon_Font_Size: 1.125rem;
--fdNavigationList_Icon_Font_Size: 1rem;


// Expander
--fdNavigationList_Expander_Width: 2.5rem;
--fdNavigationList_Expander_Width: 2.25rem;
--fdNavigationList_Expander_Font_Size: 1rem;

@include fd-reset();
Expand Down Expand Up @@ -60,14 +59,22 @@ $block: #{$fd-namespace}-navigation-list;

&__content {
@include fd-reset();
@include fd-flex-vertical-center();

@include fd-flex-vertical-center() {
gap: 0.5rem;
};

cursor: pointer;
position: relative;
overflow: hidden;
border-radius: var(--sapButton_BorderCornerRadius);
padding-inline-end: 0.375rem;
border-radius: var(--fdNavigationList_Content_Border_Radius);
height: var(--fdNavigationList_Content_Height);
background: var(--fdNavigationList_Content_Background);
border-width: var(--sapList_BorderWidth);
border-style: solid;
border-color: var(--fdNavigationList_Content_Border_Top_Color, transparent) var(--fdNavigationList_Content_Border_Right_Color, transparent) var(--fdNavigationList_Content_Border_Bottom_Color, var(--fdNavigationList_Content_Border_Color)) var(--fdNavigationList_Content_Border_Left_Color, transparent);


&::before {
content: "";
Expand All @@ -92,27 +99,47 @@ $block: #{$fd-namespace}-navigation-list;

@include fd-hover() {
--fdNavigationList_Content_Background: var(--sapList_Hover_Background);
--fdNavigationList_Content_Border_Top_Color: var(--fdNavigationList_Content_Border_Color);
--fdNavigationList_Content_Border_Left_Color: var(--fdNavigationList_Content_Border_Color);
--fdNavigationList_Content_Border_Right_Color: var(--fdNavigationList_Content_Border_Color);
}

@include fd-active() {
--fdNavigationList_Text_Color: var(--sapList_Active_TextColor);
--fdNavigationList_Content_Background: var(--sapList_Active_Background);
--fdNavigationList_Content_Border_Top_Color: var(--fdNavigationList_Content_Border_Color);
--fdNavigationList_Content_Border_Left_Color: var(--fdNavigationList_Content_Border_Color);
--fdNavigationList_Content_Border_Right_Color: var(--fdNavigationList_Content_Border_Color);
}

@include fd-selected() {
--fdNavigationList_Text_Shadow: var(--sapContent_TextShadow);
--fdNavigationList_Content_Background: var(--sapList_SelectionBackgroundColor);
--fdNavigationList_Content_Selection_Indicator_Color: var(--sapList_SelectionBorderColor);
--fdNavigationList_Content_Border_Top_Color: var(--fdNavigationList_Content_Border_Color);
--fdNavigationList_Content_Border_Left_Color: var(--fdNavigationList_Content_Border_Color);
--fdNavigationList_Content_Border_Right_Color: var(--fdNavigationList_Content_Border_Color);

@include fd-hover() {
--fdNavigationList_Text_Shadow: var(--sapContent_TextShadow);
--fdNavigationList_Content_Background: var(--sapList_Hover_SelectionBackground);
--fdNavigationList_Content_Selection_Indicator_Color: var(--sapList_SelectionBorderColor);
--fdNavigationList_Content_Border_Top_Color: var(--fdNavigationList_Content_Border_Color);
--fdNavigationList_Content_Border_Left_Color: var(--fdNavigationList_Content_Border_Color);
--fdNavigationList_Content_Border_Right_Color: var(--fdNavigationList_Content_Border_Color);
}
}

@include fd-focus() {
--fdNavigationList_Content_Border_Top_Color: var(--fdNavigationList_Content_Border_Color);
--fdNavigationList_Content_Border_Left_Color: var(--fdNavigationList_Content_Border_Color);
--fdNavigationList_Content_Border_Right_Color: var(--fdNavigationList_Content_Border_Color);

outline: var(--sapContent_FocusStyle) var(--sapContent_FocusWidth) var(--sapContent_FocusColor);
outline-offset: var(--fdNavigationList_Content_Outline_Offset);
}

@include fd-disabled() {
pointer-events: none;
opacity: var(--sapContent_DisabledOpacity);
}
}

Expand All @@ -127,10 +154,11 @@ $block: #{$fd-namespace}-navigation-list;

&__icon {
@include fd-reset();
@include fd-flex-center();
@include fd-set-width(var(--fdNavigationList_Icon_Width));

@include fd-flex-vertical-center();

height: 100%;
padding-inline: 1rem 0.5rem;
color: var(--fdNavigationList_Text_Color);

[class*="sap-icon"] {
font-size: var(--fdNavigationList_Icon_Font_Size);
Expand All @@ -147,7 +175,6 @@ $block: #{$fd-namespace}-navigation-list;

width: 100%;
color: var(--fdNavigationList_Text_Color);
text-shadow: var(--fdNavigationList_Text_Shadow);
font-size: var(--fdNavigationList_Text_Font_Size);
font-family: var(--fdNavigationList_Text_Font_Family);
padding-inline-start: var(--fdNavigationList_Text_Offset);
Expand All @@ -159,6 +186,7 @@ $block: #{$fd-namespace}-navigation-list;
@include fd-set-width(var(--fdNavigationList_Expander_Width));

height: 100%;
color: var(--fdNavigationList_Text_Color);

[class*="sap-icon"] {
font-size: var(--fdNavigationList_Expander_Font_Size);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@use "sass:map";

:root {
--fdNavigationList_Content_Border_Radius: 0;
--fdNavigationList_Content_Border_Color: var(--sapList_BorderColor);
--fdNavigationList_Content_Outline_Offset: -0.1875rem;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@use "sass:map";

@import "./sap_fiori";

:root {
--fdNavigationList_Content_Border_Radius: 0;
--fdNavigationList_Content_Border_Color: var(--sapList_BorderColor);
--fdNavigationList_Content_Outline_Offset: -0.1875rem;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@use "sass:map";

:root {
--fdNavigationList_Content_Border_Radius: var(--sapButton_BorderCornerRadius);
--fdNavigationList_Content_Border_Color: transparent;
--fdNavigationList_Content_Outline_Offset: 0;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@use "sass:map";

@import "./sap_horizon";

:root {
--fdNavigationList_Content_Border_Radius: 0;
--fdNavigationList_Content_Border_Color: var(--sapList_BorderColor);
--fdNavigationList_Content_Outline_Offset: -0.1875rem;
}
1 change: 1 addition & 0 deletions packages/styles/src/theming/sap_fiori_3.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
@import "./common/search-field/sap_fiori";
@import "./common/navigation/sap_fiori";
@import "./common/navigation-menu/sap_fiori";
@import "./common/navigation-list/sap_fiori";
@import "./common/tool-header/sap_fiori";
@import "./common/textarea/sap_fiori";

Expand Down
1 change: 1 addition & 0 deletions packages/styles/src/theming/sap_fiori_3_dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
@import "./common/search-field/sap_fiori";
@import "./common/navigation/sap_fiori";
@import "./common/navigation-menu/sap_fiori";
@import "./common/navigation-list/sap_fiori";
@import "./common/tool-header/sap_fiori";
@import "./common/textarea/sap_fiori";

Expand Down
1 change: 1 addition & 0 deletions packages/styles/src/theming/sap_fiori_3_hcb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
@import "./common/search-field/sap_fiori_hc";
@import "./common/navigation/sap_fiori_hc";
@import "./common/navigation-menu/sap_fiori_hc";
@import "./common/navigation-list/sap_fiori_hc";
@import "./common/tool-header/sap_fiori_hc";
@import "./common/textarea/sap_fiori";

Expand Down
1 change: 1 addition & 0 deletions packages/styles/src/theming/sap_fiori_3_hcw.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
@import "./common/search-field/sap_fiori_hc";
@import "./common/navigation/sap_fiori_hc";
@import "./common/navigation-menu/sap_fiori_hc";
@import "./common/navigation-list/sap_fiori_hc";
@import "./common/tool-header/sap_fiori_hc";
@import "./common/step-input/sap_fiori";
@import "./common/textarea/sap_fiori";
Expand Down
1 change: 1 addition & 0 deletions packages/styles/src/theming/sap_fiori_3_light_dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
@import "./common/search-field/sap_fiori";
@import "./common/navigation/sap_fiori";
@import "./common/navigation-menu/sap_fiori";
@import "./common/navigation-list/sap_fiori";
@import "./common/tool-header/sap_fiori";
@import "./common/textarea/sap_fiori";

Expand Down
1 change: 1 addition & 0 deletions packages/styles/src/theming/sap_horizon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
@import "./common/search-field/sap_horizon";
@import "./common/navigation/sap_horizon";
@import "./common/navigation-menu/sap_horizon";
@import "./common/navigation-list/sap_horizon";
@import "./common/tool-header/sap_horizon";
@import "./common/textarea/sap_horizon";

Expand Down
1 change: 1 addition & 0 deletions packages/styles/src/theming/sap_horizon_dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
@import "./common/search-field/sap_horizon";
@import "./common/navigation/sap_horizon";
@import "./common/navigation-menu/sap_horizon";
@import "./common/navigation-list/sap_horizon";
@import "./common/tool-header/sap_horizon";
@import "./common/textarea/sap_horizon";

Expand Down
1 change: 1 addition & 0 deletions packages/styles/src/theming/sap_horizon_hcb.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
@import "./common/search-field/sap_horizon_hc";
@import "./common/navigation/sap_horizon_hc";
@import "./common/navigation-menu/sap_horizon_hc";
@import "./common/navigation-list/sap_horizon_hc";
@import "./common/tool-header/sap_horizon_hc";
@import "./common/textarea/sap_horizon";

Expand Down
1 change: 1 addition & 0 deletions packages/styles/src/theming/sap_horizon_hcw.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
@import "./common/search-field/sap_horizon_hc";
@import "./common/navigation/sap_horizon_hc";
@import "./common/navigation-menu/sap_horizon_hc";
@import "./common/navigation-list/sap_horizon_hc";
@import "./common/tool-header/sap_horizon_hc";
@import "./common/textarea/sap_horizon";

Expand Down
1 change: 1 addition & 0 deletions packages/styles/src/user-menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ $panel: #{$fd-namespace}-panel;
};
}

&__header-container,
&__subheader {
@include fd-reset();

Expand Down
Loading

0 comments on commit 53463ae

Please sign in to comment.