Skip to content
GitLab
Commit 75943868 authored by Mark Otto's avatar Mark Otto
Browse files

update home and side nav to use new navbar structure

parent 639a2113
Hide whitespace changes
Inline Side-by-side
Showing
with 63 additions and 88 deletions
+63 -88
dist/css/bootstrap.css.map
-2 bytes (0%)
View file @ 75943868
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
docs/_includes/docs-nav.html
+ 41
- 53
View file @ 75943868
<header class="navbar navbar-static-top bs-docs-sidebar" id="top" role="banner"> <header class="navbar navbar-static-top bs-docs-sidebar" id="top" role="banner">
<div class="container-fluid"> <a href="{{ site.baseurl }}" class="navbar-brand">
<div class="navbar-header"> Bootstrap
<button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-sidenav-collapse"> </a>
<span class="sr-only">Toggle navigation</span> {% for group in site.data.nav %}
<span class="icon-bar"></span> {% assign link = group.pages | first %}
<span class="icon-bar"></span> {% assign slug = group.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' %}
<span class="icon-bar"></span> {% assign active = nil %}
</button>
<a href="{{ site.baseurl }}" class="navbar-brand">
Bootstrap
</a>
</div>
<nav class="collapse navbar-collapse bs-sidenav-collapse" role="navigation">
{% for group in site.data.nav %}
{% assign link = group.pages | first %}
{% assign slug = group.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' %}
{% assign active = nil %}
{% if page.url contains slug %} {% if page.url contains slug %}
{% assign active = 'active' %} {% assign active = 'active' %}
{% endif %} {% endif %}
<div class="bs-docs-toc-item {{ active }}"> <div class="bs-docs-toc-item {{ active }}">
<a class="bs-docs-toc-link" href="{{ site.baseurl }}{{ group.title | downcase | replace: ' ', '-' }}/{{ link.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' }}"> <a class="bs-docs-toc-link" href="{{ site.baseurl }}{{ group.title | downcase | replace: ' ', '-' }}/{{ link.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' }}">
{{ group.title }} {{ group.title }}
</a> </a>
<ul class="nav bs-docs-sidenav"> <ul class="nav bs-docs-sidenav">
{% for doc in group.pages %} {% for doc in group.pages %}
{% assign slug = doc.title | downcase | replace: ' ', '-' %} {% assign slug = doc.title | downcase | replace: ' ', '-' %}
{% assign active = nil %} {% assign active = nil %}
{% if page.url contains slug %} {% if page.url contains slug %}
{% assign active = 'active' %} {% assign active = 'active' %}
{% endif %} {% endif %}
<li class="{{ active }}"> <li class="{{ active }}">
<a href="{{ site.baseurl }}{{ group.title | downcase | replace: ' ', '-' }}/{{ doc.title | downcase | replace: ' ', '-' }}"> <a href="{{ site.baseurl }}{{ group.title | downcase | replace: ' ', '-' }}/{{ doc.title | downcase | replace: ' ', '-' }}">
{{ doc.title }} {{ doc.title }}
</a> </a>
{% unless doc.sections == nil %} {% unless doc.sections == nil %}
<ul class="nav"> <ul class="nav">
{% for section in doc.sections %} {% for section in doc.sections %}
<li> <li>
<a href="{{ site.baseurl }}{{ group.title | downcase | replace: ' ', '-' }}/{{ doc.title | downcase | replace: ' ', '-' }}/#{{ section.title | downcase | replace: ' ', '-' }}"> <a href="{{ site.baseurl }}{{ group.title | downcase | replace: ' ', '-' }}/{{ doc.title | downcase | replace: ' ', '-' }}/#{{ section.title | downcase | replace: ' ', '-' }}">
{{ section.title }} {{ section.title }}
</a> </a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endunless %} {% endunless %}
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
{% endfor %} {% endfor %}
</nav>
</div>
</header> </header>
docs/_includes/home-nav.html
+ 20
- 33
View file @ 75943868
<header class="navbar navbar-inverse navbar-static-top bs-docs-nav" id="top" role="banner"> <header class="navbar navbar-inverse navbar-static-top bs-docs-nav" id="top" role="banner">
<div class="container"> <a href="../" class="navbar-brand">Bootstrap</a>
<div class="navbar-header"> <ul class="nav nav-pills pull-left">
<button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse"> {% for group in site.data.nav %}
<span class="sr-only">Toggle navigation</span> {% assign link = group.pages | first %}
<span class="icon-bar"></span> {% assign slug = group.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' %}
<span class="icon-bar"></span> <li class="nav-item">
<span class="icon-bar"></span> <a class="nav-link" href="{{ site.baseurl }}{{ group.title | downcase | replace: ' ', '-' }}/{{ link.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' }}">
</button> {{ group.title }}
<a href="../" class="navbar-brand">Bootstrap</a> </a>
</div> </li>
<nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation"> {% endfor %}
<ul class="nav navbar-nav"> </ul>
{% for group in site.data.nav %} <ul class="nav nav-pills pull-right">
{% assign link = group.pages | first %} <li class="nav-item">
{% assign slug = group.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' %} <a class="nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a>
<li class="nav-item"> </li>
<a class="nav-link" href="{{ site.baseurl }}{{ group.title | downcase | replace: ' ', '-' }}/{{ link.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' }}"> <li class="nav-item">
{{ group.title }} <a class="nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a>
</a> </li>
</li> </ul>
{% endfor %}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="nav-item">
<a class="nav-link" href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a>
</li>
</ul>
</nav>
</div>
</header> </header>
docs/assets/js/customize.min.js
+ 1
- 1
View file @ 75943868
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/assets/js/raw-files.min.js
+ 1
- 1
View file @ 75943868
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/dist/css/bootstrap.css.map
-2 bytes (0%)
View file @ 75943868
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment