Skip to content

Commit

Permalink
Merge branch 'quick_menu_active_trail' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Ilkka Veteläsuo committed Aug 7, 2018
2 parents bc18f37 + 1acfab8 commit 16587ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion templates/15_1_2_header-bar.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1 class="logo__sitename">Helsingin yliopisto</h1>
<ul class="menu">
<li><a href="#" title="Ajankohtaista">Ajankohtaista</a></li>
<li><a href="#" title="Tutkimus">Tutkimus</a></li>
<li class="is-active"><a href="#" title="Opiskelu" class="active">Opiskelu</a></li>
<li class="is-active"><a href="#" title="Opiskelu" class="active active-trail">Opiskelu</a></li>
<li><a href="#" title="Yhteistyö">Yhteistyö</a></li>
<li><a href="#" title="Yliopisto">Yliopisto</a></li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion templates/5_1_1_quick-menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ul class="menu">
<li><a href="#" title="Ajankohtaista">Ajankohtaista</a></li>
<li><a href="#" title="Tutkimus">Tutkimus</a></li>
<li class="is-active"><a href="#" title="Opiskelu" class="active">Opiskelu</a></li>
<li class="is-active"><a href="#" title="Opiskelu" class="active active-trail">Opiskelu</a></li>
<li><a href="#" title="Yhteistyö">Yhteistyö</a></li>
<li><a href="#" title="Yliopisto">Yliopisto</a></li>
</ul>
Expand Down

0 comments on commit 16587ef

Please sign in to comment.