diff options
| author | Thomas McDonald <[email protected]> | 2015-08-09 23:33:52 -0700 |
|---|---|---|
| committer | Thomas McDonald <[email protected]> | 2015-08-09 23:33:52 -0700 |
| commit | b84bb4e218892a45c2c27a861da73900971b17a1 (patch) | |
| tree | b010ad9748480e6b80284051f1a5d9548c51634b /docs/_includes | |
| parent | 0ef0825d013dedd5f7c0e8acb8a23d033bf56be0 (diff) | |
| parent | 317c667d1c0d1d0984d863d9d4baad9e1a25b1c6 (diff) | |
| download | bootstrap-b84bb4e218892a45c2c27a861da73900971b17a1.tar.xz bootstrap-b84bb4e218892a45c2c27a861da73900971b17a1.zip | |
Merge branch 'v4' into force-expanded
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/nav-docs.html | 4 | ||||
| -rw-r--r-- | docs/_includes/nav-home.html | 2 | ||||
| -rw-r--r-- | docs/_includes/page-headers.html | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docs/_includes/nav-docs.html b/docs/_includes/nav-docs.html index ce094fd15..649f175a7 100644 --- a/docs/_includes/nav-docs.html +++ b/docs/_includes/nav-docs.html @@ -26,7 +26,7 @@ <ul class="nav bd-sidenav"> {% for doc in group.pages %} - {% assign slug = doc.title | downcase | replace: ' ', '-' %} + {% assign slug = doc.title | downcase | replace: ' ', '-' | replace:'-&-','-' %} {% assign active = nil %} {% if page.url contains slug %} @@ -34,7 +34,7 @@ {% endif %} <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: ' ', '-' | replace:'-&-','-' }}"> {{ doc.title }} </a> diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html index 9fe72d50d..d69251020 100644 --- a/docs/_includes/nav-home.html +++ b/docs/_includes/nav-home.html @@ -1,4 +1,4 @@ -<header class="navbar navbar-sm navbar-inverse navbar-fixed-top bd-navbar" role="banner"> +<header class="navbar navbar-sm navbar-inverse navbar-static-top bd-navbar" role="banner"> <nav class="nav navbar-nav"> <a class="nav-item nav-link" href="{{ site.baseurl }}/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Bootstrap');">Bootstrap</a> <a class="nav-item nav-link" href="{{ site.baseurl }}/getting-started/overview/" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Docs');">Documentation</a> diff --git a/docs/_includes/page-headers.html b/docs/_includes/page-headers.html index 37e69278d..bbb43d933 100644 --- a/docs/_includes/page-headers.html +++ b/docs/_includes/page-headers.html @@ -1,7 +1,7 @@ {% if page.group == "getting-started" %} <h1>Getting started</h1> <p class="lead"> - An overview of Bootstrap, how to download and use, basic templates and examples, and more. + An overview of Bootstrap, including how to download and use it, some basic templates and examples, and more. </p> {% elsif page.group == "layout" %} <h1>Layout</h1> |