Skip to content

Commit 0c298b4

Browse files
authored
Merge pull request #34 from ELIXIR-Belgium/active-fix
Dangling active class
2 parents af1142b + 1547970 commit 0c298b4

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

_data/sidebars/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# title: About
2-
# version: 2.0
1+
title: About
2+
version: 2.0
33
# title_url: /events.html
44
subitems:
55
- title: About

_includes/sidebar.html

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,18 @@
1010
{{ page.sidebar | capitalize | replace: "_", " " }} menu <i title="navbar-toggler" class="fa fa-bars ms-2"></i>
1111
</button>
1212
<nav class="collapse" id="side-nav" aria-label="Side navigation">
13-
<ul id="menu" class="list-unstyled mb-4 mb-lg-0">
14-
{%- if sidebar.title or sidebar.version %}
15-
{%- if sidebar.title_url and page.url == sidebar.title_url %}
16-
<li class="sidebar-title active">
17-
{%- else %}
18-
<li class="sidebar-title">
19-
{%- endif %}
20-
{%- if sidebar.title_url %}
21-
<a class="btn active hover-primary text-start d-block mb-1" href="{{ sidebar.title_url | relative_url }}">{{sidebar.title}} {{sidebar.version}}</a>
22-
{%- else %}
23-
<a class="btn active hover-primary text-start d-block mb-1 disabled" aria-disabled="true">{{sidebar.title}} {{sidebar.version}}</a>
24-
{%- endif %}
25-
</li>
26-
{%- endif %}
13+
{%- if sidebar.title or sidebar.version %}
14+
{%- if sidebar.title_url %}
15+
{%- if page.url == sidebar.title_url %}
16+
<a class="btn hover-primary text-start d-block mb-1 sidebar-title active" href="{{ sidebar.title_url | relative_url }}">{{sidebar.title}} {{sidebar.version}}</a>
17+
{%- else %}
18+
<a class="btn hover-primary text-start d-block mb-1 sidebar-title" href="{{ sidebar.title_url | relative_url }}">{{sidebar.title}} {{sidebar.version}}</a>
19+
{%- endif %}
20+
{%- else %}
21+
<a class="btn text-start d-block mb-1 sidebar-title disabled" aria-disabled="true">{{sidebar.title}} {{sidebar.version}}</a>
22+
{%- endif %}
23+
{%- endif %}
24+
<ul class="list-unstyled mb-4 mb-lg-0">
2725
{%- for folder in sidebar.subitems %}
2826
{%- if page.url == folder.url %}
2927
<li class="active{%- if folder.hr %} mt-3{% endif %}">

assets/css/main.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ header .navbar {
271271
background-color: $sidebar-bg-active;
272272
}
273273

274-
ul#menu {
274+
#side-nav>ul {
275275
> li:not(.sidebar-title) > a {
276276
background-color: $sidebar-bg;
277277
color: $sidebar-color;

assets/js/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $(document).ready(function external_new_window() {
3131
*/
3232
$(document).ready(function () {
3333
// Initialize navgoco with default options
34-
$("#menu").navgoco({
34+
$("#side-nav>ul").navgoco({
3535
caretHtml: '',
3636
accordion: true,
3737
openClass: 'active', // open

0 commit comments

Comments
 (0)