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: Align side-nav navigation arrow on IE11 #490

Merged
merged 4 commits into from
Jan 15, 2020
+45 −43
Merged

fix: Align side-nav navigation arrow on IE11 #490

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32bf456
Set height value lower than min-height to prevent align-items reset o…
salarenko Dec 4, 2019
04c23d9
Add reference images
JKMarkowski Dec 20, 2019
b5e524e
Restore previous test examples
salarenko Jan 8, 2020
ca81f98
Add reference images
JKMarkowski Jan 13, 2020
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
4 changes: 3 additions & 1 deletion src/_nested-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ $block: #{$fd-namespace}-nested-list;
&::after {
@include fd-flex-center();
@include fd-nested-list-arrow();

// `height: 0` is set to prevent breaking `align-items: center` on IE11
// Read more https://github.com/philipwalton/flexbugs/issues/231
height: 0;
min-height: 100%;
min-width: 2.75rem;
color: var(--sapList_TextColor);
Expand Down
196 changes: 175 additions & 21 deletions test/templates/side-nav/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,42 +7,196 @@
{% set example %}
<nav class="fd-side-nav">
<div class="fd-side-nav__main-navigation">
<ul class="test-sidenav-list">
<li>Item 1</li>
<li>Item 1</li>
<li>Item 1</li>
<li>Item 1</li>
</ul>
Comment on lines -10 to -15
Copy link
Contributor

Choose a reason for hiding this comment

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

We shouldn't bring the nested list in sidenav. There are tests for Nested list. Inside Sidenav tests we should only test the Sidenav styling because our components are self-contained. You should revert the test changes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Restored previous test cases

<ul class="fd-nested-list fd-nested-list--text-only">
<li class="fd-nested-list__item">
<a class="fd-nested-list__link" href="#">
<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__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__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__title">Level 1 Item</span>
</a>
</li>
</ul>
</div>
<div class="fd-side-nav__utility">
<ul class="test-sidenav-list">
<li>Item 1</li>
<li>Item 1</li>
</ul>
<ul class="fd-nested-list fd-nested-list--text-only">
<li class="fd-nested-list__item">
<a class="fd-nested-list__link" href="#">
<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__title">Level 1 Item</span>
</a>
</li>
</ul>
</div>
</nav>

{% endset %}
{{ format(example) }}

<br><br><br>
<h2>Side navigation with icons - condensed state</h2>
{% set example %}
<nav class="fd-side-nav fd-side-nav--condensed">
<div class="fd-side-nav__main-navigation">
<ul class="test-sidenav-list">
<li class="test-sidenav-list-icon sap-icon--home"></li>
<li class="test-sidenav-list-icon sap-icon--calendar"></li>
<li class="test-sidenav-list-icon sap-icon--employee"></li>
<li class="test-sidenav-list-icon sap-icon--activities"></li>
</ul>
<div class="fd-side-nav__main-navigation">
<ul class="fd-nested-list">
<li class="fd-nested-list__group-header">
Group Header 1
</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 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--calendar"></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 has-child" href="#">
<span class="fd-nested-list__icon sap-icon--employee"></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--activities"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__group-header">
Group Header 2
</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 class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
</ul>
</div>
<div class="fd-side-nav__utility">
<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--compare"></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--chain-link"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
</ul>
</div>
</nav>
{% endset %}
{{ format(example) }}

{% set example %}
<nav class="fd-side-nav">
<div class="fd-side-nav__main-navigation">
<ul class="fd-nested-list fd-nested-list--compact">
<li class="fd-nested-list__group-header">
Group Header 1
</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 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 class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link has-child" href="#" aria-controls="EX500L2" aria-haspopup="true">
<span class="fd-nested-list__icon sap-icon--employee"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
<ul class="fd-nested-list fd-nested-list--text-only level-2" id="EX500L2" aria-hidden="true">
<li class="fd-nested-list__item">
<a class="fd-nested-list__link" href="#">
<span class="fd-nested-list__title">Level 2 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link"
href="#" aria-controls="EX500L3" aria-haspopup="true">
<span class="fd-nested-list__title">Level 2 Item</span>
</a>
</li>
<li class="fd-nested-list__item">
<a class="fd-nested-list__link" href="#">
<span class="fd-nested-list__title">Level 2 Item</span>
</a>
</li>
</ul>
</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 class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
<li class="fd-nested-list__group-header">
Group Header 2
</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 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__title">Level 1 Item</span>
</a>
</li>
</ul>
</div>
<div class="fd-side-nav__utility">
<ul class="test-sidenav-list">
<li class="test-sidenav-list-icon sap-icon--bar-chart"></li>
<li class="test-sidenav-list-icon sap-icon--video"></li>
</ul>
<ul class="fd-nested-list fd-nested-list--compact">
<li class="fd-nested-list__item">
<a class="fd-nested-list__link" href="#">
<span class="fd-nested-list__icon sap-icon--compare"></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--chain-link"></span>
<span class="fd-nested-list__title">Level 1 Item</span>
</a>
</li>
</ul>
</div>
</nav>

{% endset %}
{{ format(example) }}

{% endblock %}
Binary file modified test/visual-regression-tests/reference_images/FS_side-nav_0_backstop_0_.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/visual-regression-tests/reference_images/FS_side-nav_1_backstop__n1_0_.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/visual-regression-tests/reference_images/FS_side-nav_2_backstop__n2_0_.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.