Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Side Navigation - Refactor icons usage #1656

Closed
wants to merge 1 commit into from
+34 −32
Closed

fix: Side Navigation - Refactor icons usage #1656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/_nested-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,15 @@ $block: #{$fd-namespace}-nested-list;
}

&__icon {
@include fd-reset();
@include fd-flex-center();
@include fd-icon-element-base() {
@include fd-reset();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure you need a reset here?

@include fd-flex-center();

height: 100%;
min-width: 2.75rem;
color: var(--sapList_TextColor);
font-size: var(--sapFontHeader4Size);
height: 100%;
min-width: 2.75rem;
color: var(--sapList_TextColor);
font-size: var(--sapFontHeader4Size);
}
}

&__title {
Expand Down
52 changes: 26 additions & 26 deletions stories/side-navigation/side-navigation.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ export const complexCompactSideNav = () => `
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link" href="#">
<span class="fd-nested-list__icon sap-icon--chain-link"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--chain-link"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
Expand Down Expand Up @@ -697,20 +697,20 @@ export const nestedListWithIconsOnlyInFirstLevel = () => `
<ul class="fd-nested-list">
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--home"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--home"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link is-selected"href="#/">
<span class="fd-nested-list__icon sap-icon--calendar"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--calendar"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<div class="fd-nested-list__content has-child is-expanded" tabindex="0">
<a class="fd-nested-list__link" href="#" tabindex="-1">
<span class="fd-nested-list__icon sap-icon--employee"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--employee"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
<button class="fd-button fd-nested-list__button"
Expand Down Expand Up @@ -787,13 +787,13 @@ export const nestedListWithIconsOnlyInFirstLevel = () => `
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--activities"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--activities"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--bar-chart"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--bar-chart"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
Expand All @@ -818,20 +818,20 @@ export const nestedListWithGroupHeaders = () => `
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--home"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--home"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link is-selected"href="#/">
<span class="fd-nested-list__icon sap-icon--calendar"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--calendar"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<div class="fd-nested-list__content has-child" tabindex="0">
<a class="fd-nested-list__link" href="#" tabindex="-1">
<span class="fd-nested-list__icon sap-icon--employee"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--employee"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
<button class="fd-button fd-nested-list__button"
Expand Down Expand Up @@ -908,7 +908,7 @@ export const nestedListWithGroupHeaders = () => `
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--activities"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--activities"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
Expand All @@ -917,7 +917,7 @@ export const nestedListWithGroupHeaders = () => `
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--bar-chart"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--bar-chart"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
Expand All @@ -942,20 +942,20 @@ export const nestedListWithGroupHeadersCompactMode = () => `
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--home"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--home"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link is-selected"href="#/">
<span class="fd-nested-list__icon sap-icon--calendar"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--calendar"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<div class="fd-nested-list__content has-child" tabindex="0">
<a class="fd-nested-list__link" href="#" tabindex="-1">
<span class="fd-nested-list__icon sap-icon--employee"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--employee"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
<button class="fd-button fd-nested-list__button"
Expand Down Expand Up @@ -1032,7 +1032,7 @@ export const nestedListWithGroupHeadersCompactMode = () => `
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--activities"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--activities"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
Expand All @@ -1041,7 +1041,7 @@ export const nestedListWithGroupHeadersCompactMode = () => `
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--bar-chart"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--bar-chart"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
Expand All @@ -1066,19 +1066,19 @@ export const nestedListWithoutLinks = () => `
</li>
<li class="fd-nested-list__item">
<div class="fd-nested-list__content">
<span class="fd-nested-list__icon sap-icon--home"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--home"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</div>
</li>
<li class="fd-nested-list__item">
<div class="fd-nested-list__content is-selected">
<span class="fd-nested-list__icon sap-icon--calendar"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--calendar"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</div>
</li>
<li class="fd-nested-list__item">
<div class="fd-nested-list__content has-child" tabindex="0">
<span class="fd-nested-list__icon sap-icon--employee"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--employee"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
<button class="fd-button fd-nested-list__button"
aria-controls="EX600L2"
Expand Down Expand Up @@ -1150,7 +1150,7 @@ export const nestedListWithoutLinks = () => `
</li>
<li class="fd-nested-list__item">
<div class="fd-nested-list__content">
<span class="fd-nested-list__icon sap-icon--activities"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--activities"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</div>
</li>
Expand All @@ -1159,7 +1159,7 @@ export const nestedListWithoutLinks = () => `
</li>
<li class="fd-nested-list__item">
<div class="fd-nested-list__content">
<span class="fd-nested-list__icon sap-icon--bar-chart"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--bar-chart"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</div>
</li>
Expand All @@ -1185,20 +1185,20 @@ export const rtlExample = () => `
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--home"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--home" aria-hidden="true"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link is-selected"href="#/">
<span class="fd-nested-list__icon sap-icon--calendar"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--calendar"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<div class="fd-nested-list__content has-child" tabindex="0">
<a class="fd-nested-list__link" href="#" tabindex="-1">
<span class="fd-nested-list__icon sap-icon--employee"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--employee"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
<button class="fd-button fd-nested-list__button"
Expand Down Expand Up @@ -1275,7 +1275,7 @@ export const rtlExample = () => `
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--activities"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--activities"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
Expand All @@ -1284,7 +1284,7 @@ export const rtlExample = () => `
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"href="#/">
<span class="fd-nested-list__icon sap-icon--bar-chart"></span>
<span aria-hidden="true" class="fd-nested-list__icon sap-icon--bar-chart"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
Expand Down