diff options
| -rw-r--r-- | docs/_includes/nav-home.html | 69 | ||||
| -rw-r--r-- | docs/assets/scss/_nav.scss | 13 |
2 files changed, 34 insertions, 48 deletions
diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html index f77f02084..e325d8605 100644 --- a/docs/_includes/nav-home.html +++ b/docs/_includes/nav-home.html @@ -1,5 +1,5 @@ -<header class="navbar navbar-light navbar-static-top bd-navbar"> - <div class="container"> +<header class="navbar navbar-light navbar-toggleable-md bd-navbar"> + <nav class="container"> {% comment %} <nav class="nav navbar-nav float-right"> <div class="nav-item dropdown"> @@ -25,37 +25,36 @@ </nav> {% endcomment %} - <nav> - <div class="clearfix"> - <button class="navbar-toggler float-right hidden-sm-up" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation"> - <span class="navbar-toggler-icon"></span> - </button> - <a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/"> - Bootstrap - </a> - </div> - <div class="collapse navbar-toggleable" id="bd-main-nav"> - <ul class="nav navbar-nav"> - <li class="nav-item active"> - <a class="nav-item nav-link {% if page.layout == "home" %}active{% endif %}" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a> - </li> - <li class="nav-item"> - <a class="nav-item nav-link {% if page.layout == "docs" %}active{% endif %}" href="{{ site.baseurl }}/getting-started/introduction/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a> - </li> - <li class="nav-item"> - <a class="nav-item nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a> - </li> - <li class="nav-item"> - <a class="nav-item nav-link" href="{{ site.themes }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Themes');">Themes</a> - </li> - <li class="nav-item"> - <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a> - </li> - <li class="nav-item"> - <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a> - </li> - </ul> - </div> - </nav> - </div> + <div class="d-flex flex-items-between hidden-lg-up"> + <a class="navbar-brand" href="{{ site.baseurl }}/"> + Bootstrap + </a> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#bd-main-nav" aria-controls="bd-main-nav" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> + </button> + </div> + + <div class="collapse navbar-collapse" id="bd-main-nav"> + <ul class="nav navbar-nav"> + <li class="nav-item active"> + <a class="nav-item nav-link {% if page.layout == "home" %}active{% endif %}" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a> + </li> + <li class="nav-item"> + <a class="nav-item nav-link {% if page.layout == "docs" %}active{% endif %}" href="{{ site.baseurl }}/getting-started/introduction/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a> + </li> + <li class="nav-item"> + <a class="nav-item nav-link {% if page.title == "Examples" %}active{% endif %}" href="{{ site.baseurl }}/examples/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Examples');">Examples</a> + </li> + <li class="nav-item"> + <a class="nav-item nav-link" href="{{ site.themes }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Themes');">Themes</a> + </li> + <li class="nav-item"> + <a class="nav-item nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a> + </li> + <li class="nav-item"> + <a class="nav-item nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a> + </li> + </ul> + </div> + </nav> </header> diff --git a/docs/assets/scss/_nav.scss b/docs/assets/scss/_nav.scss index 141811d41..3e5953bf9 100644 --- a/docs/assets/scss/_nav.scss +++ b/docs/assets/scss/_nav.scss @@ -3,9 +3,6 @@ // .bd-navbar { - padding-right: 0; - padding-left: 0; - .navbar-nav { .nav-link { color: $bd-graphite-light; @@ -27,14 +24,4 @@ .dropdown-menu { font-size: inherit; } - - @include media-breakpoint-down(sm) { - .nav-link { - float: none; - - + .nav-link { - margin-left: 0; - } - } - } } |