|
29 | 29 | {% endif %} |
30 | 30 |
|
31 | 31 | <div class="master-wrapper {% if href == 'index' %}yellow-top-border{% else %}blue-top-border{% endif %}"> |
32 | | - <nav class="navbar navbar-toggleable-md navbar-inverse bg-inverse fixed-top"> |
| 32 | + <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top"> |
| 33 | + |
| 34 | + <a class="navbar-brand" href="{{ SITEURL }}/">{{ SITENAME }}</a> |
| 35 | + |
33 | 36 | <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"> |
34 | 37 | <span class="navbar-toggler-icon"></span> |
35 | 38 | </button> |
36 | 39 |
|
37 | | - <a class="navbar-brand" href="{{ SITEURL }}/">{{ SITENAME }}</a> |
38 | 40 |
|
39 | 41 | <div class="collapse navbar-collapse" id="navbar"> |
40 | | - <div class="navbar-nav mr-auto"> |
| 42 | + <ul class="navbar-nav mr-auto"> |
41 | 43 | {% for link in NAVBAR_HOME_LINKS[:-1] %} |
42 | 44 | <li class="nav-item dropdown"> |
43 | | - <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
| 45 | + <a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
44 | 46 | {{ link.title }} |
45 | 47 | </a> |
46 | | - <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink"> |
| 48 | + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> |
47 | 49 | {% for sublink in link.children %} |
48 | 50 | {% if sublink.href.startswith('http') %} |
49 | 51 | <a class="dropdown-item" href="{{ sublink.href }}">{{ sublink.title }}</a> |
|
54 | 56 | </div> |
55 | 57 | </li> |
56 | 58 | {% endfor %} |
57 | | - </div> |
| 59 | + </ul> |
58 | 60 |
|
59 | | - <div class="navbar-nav"> |
| 61 | + <ul class="navbar-nav"> |
60 | 62 | {% for link in NAVBAR_HOME_LINKS[-1:] %} |
61 | 63 | <li class="nav-item dropdown"> |
62 | | - <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
| 64 | + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
63 | 65 | {{ link.title }} |
64 | 66 | </a> |
65 | | - <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink"> |
| 67 | + <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown"> |
66 | 68 | {% for sublink in link.children %} |
67 | 69 | <a class="dropdown-item" href="{{ SITEURL }}/{{ sublink.href }}">{{ sublink.title }}</a> |
68 | 70 | {% endfor %} |
69 | 71 | </div> |
70 | 72 | </li> |
71 | 73 | {% endfor %} |
72 | | - </div> |
| 74 | + </ul> |
73 | 75 | </div> |
74 | 76 | </nav> |
75 | 77 |
|
|
0 commit comments