diff options
| author | Mark Otto <[email protected]> | 2016-10-09 15:04:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-09 15:04:32 -0700 |
| commit | 7dee5560a10785100996fb6affe644163b2db44e (patch) | |
| tree | fc2e60e698bdc2421d7d17d604044bb700da57e6 /docs/_includes | |
| parent | 1db3586dc0798485d5ca82a9b8de477e82ba351c (diff) | |
| parent | 8d162553fa7fe499a72569d42debed18dfc5791b (diff) | |
| download | bootstrap-7dee5560a10785100996fb6affe644163b2db44e.tar.xz bootstrap-7dee5560a10785100996fb6affe644163b2db44e.zip | |
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/nav-docs.html | 2 | ||||
| -rw-r--r-- | docs/_includes/nav-home.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/_includes/nav-docs.html b/docs/_includes/nav-docs.html index b4f4d1f9e..f9a7554f0 100644 --- a/docs/_includes/nav-docs.html +++ b/docs/_includes/nav-docs.html @@ -33,7 +33,7 @@ {% endif %} <li class="{{ active }}"> - <a href="{{ site.baseurl }}/{{ group.title | downcase | replace: ' ', '-' }}/{{ doc.title | downcase | replace: ' ', '-' | 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 a5a3088c7..6dd3723f6 100644 --- a/docs/_includes/nav-home.html +++ b/docs/_includes/nav-home.html @@ -1,7 +1,7 @@ <header class="navbar navbar-light navbar-static-top bd-navbar"> <div class="container"> {% comment %} - <nav class="nav navbar-nav pull-xs-right"> + <nav class="nav navbar-nav float-xs-right"> <div class="nav-item dropdown"> <a class="nav-item nav-link dropdown-toggle" href="#" id="bd-versions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> v{{ site.current_version }} @@ -27,7 +27,7 @@ <nav> <div class="clearfix"> - <button class="navbar-toggler pull-xs-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"></button> + <button class="navbar-toggler float-xs-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"></button> <a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/"> Bootstrap </a> |