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

Added fix for text improperly wrapping in sidenav #257

Merged
merged 1 commit into from
Jan 16, 2020
Merged

Added fix for text improperly wrapping in sidenav #257

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
114 changes: 64 additions & 50 deletions src/components/sidenav/sidenav.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,41 @@
<a href="#" class="rvt-sidenav__link">Section nav one</a>
</li>
<li class="rvt-sidenav__item">
<a href="#" class="rvt-sidenav__link" aria-current="page">Section nav two</a>
<button href="#" class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-1">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
<div class="rvt-sidenav__item-wrapper">
<a href="#" class="rvt-sidenav__link" aria-current="page">Section nav two (with some extra text for wrapping)</a>
<button href="#" class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-1">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
</div>
<ul class="rvt-sidenav__list" data-sidenav-list="toggle-1" role="menu">
<li class="rvt-sidenav__item">
<a href="#" class="rvt-sidenav__link">Level two</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-2">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
<div class="rvt-sidenav__item-wrapper">
<a href="#" class="rvt-sidenav__link">Level two</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-2">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
</div>
<ul class="rvt-sidenav__list" data-sidenav-list="toggle-2" role="menu">
<li class="rvt-sidenav__item">
<a href="#" class="rvt-sidenav__link">Level three</a>
</li>
</ul>
</li>
<li class="rvt-sidenav__item">
<a href="#" class="rvt-sidenav__link">
<span>Level two</span>
</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-3">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
<div class="rvt-sidenav__item-wrapper">
<a href="#" class="rvt-sidenav__link">
<span>Level two</span>
</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-3">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
</div>
<ul class="rvt-sidenav__list" data-sidenav-list="toggle-3" role="menu">
<li class="rvt-sidenav__item">
<a href="#" class="rvt-sidenav__link">Level three</a>
Expand All @@ -51,45 +57,53 @@
<a href="#" class="rvt-sidenav__link">Level two</a>
</li>
<li class="rvt-sidenav__item">
<a href="#" class="rvt-sidenav__link">
<span>Level two</span>
</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-4">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
<div class="rvt-sidenav__item-wrapper">
<a href="#" class="rvt-sidenav__link">
<span>Level two</span>
</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-4">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
</div>
<ul class="rvt-sidenav__list" data-sidenav-list="toggle-4" role="menu">
<li class="rvt-sidenav__item">
<a href="#" class="rvt-sidenav__link">
<span>Level three</span>
</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-5">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
<div class="rvt-sidenav__item-wrapper">
<a href="#" class="rvt-sidenav__link">
<span>Level three</span>
</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-5">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
</div>
<ul class="rvt-sidenav__list" data-sidenav-list="toggle-5" role="menu">
<li class="rvt-sidenav__item">
<a href="#" class="rvt-sidenav__link">Level four</a>
</li>
<li class="rvt-sidenav__item">
<a href="#" class="rvt-sidenav__link">
<span>Level four</span>
</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-6">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
<div class="rvt-sidenav__item-wrapper">
<a href="#" class="rvt-sidenav__link">
<span>Level four</span>
</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-6">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
</div>
<ul class="rvt-sidenav__list" data-sidenav-list="toggle-6" role="menu">
<li class="rvt-sidenav__item">
<a href="#" class="rvt-sidenav__link">Level five</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-7">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
<div class="rvt-sidenav__item-wrapper">
<a href="#" class="rvt-sidenav__link">Level five</a>
<button class="rvt-sidenav__toggle" data-sidenav-toggle="toggle-7">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<path fill="currentColor" d="M8,12.46a2,2,0,0,1-1.52-.7L1.24,5.65a1,1,0,1,1,1.52-1.3L8,10.46l5.24-6.11a1,1,0,0,1,1.52,1.3L9.52,11.76A2,2,0,0,1,8,12.46Z"/>
</svg>
</button>
</div>
<ul class="rvt-sidenav__list" data-sidenav-list="toggle-7" role="menu">
<li class="rvt-sidenav__item">
<a href="#" class="rvt-sidenav__link">Level six</a>
Expand Down
6 changes: 6 additions & 0 deletions src/sass/components/_sidenav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
margin-top: 0; // resets Rivet default margin-top
}

&__item-wrapper {
display: flex;
flex-basis: 100%;
}

&__link {
color: $color-black;
flex-grow: 1;
Expand Down Expand Up @@ -97,6 +102,7 @@ $level-styles: (
$index: index(($level-styles), ($indent $shade));

// Indent the link text
#{$indent-selector} > .rvt-sidenav__item-wrapper > .rvt-sidenav__link,
#{$indent-selector} > .rvt-sidenav__link {
text-indent: $indent + px;
}
Expand Down