diff options
| author | Mark Otto <[email protected]> | 2016-09-15 10:20:57 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-09-15 10:20:57 -0700 |
| commit | 64dcb8b5073293daa911d2b274fd875f31693317 (patch) | |
| tree | 112821f9bdd9b51f8953521cc2f34a537ccf74a2 /docs/_includes | |
| parent | 15f522fd4ae3fe7933d526f045b0b2df22a35291 (diff) | |
| parent | 63129112bbea91f7cd62014f162f857f50084656 (diff) | |
| download | bootstrap-64dcb8b5073293daa911d2b274fd875f31693317.tar.xz bootstrap-64dcb8b5073293daa911d2b274fd875f31693317.zip | |
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/ads.html | 2 | ||||
| -rw-r--r-- | docs/_includes/header.html | 3 | ||||
| -rw-r--r-- | docs/_includes/nav-home.html | 4 | ||||
| -rw-r--r-- | docs/_includes/page-headers.html | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/docs/_includes/ads.html b/docs/_includes/ads.html index ba4775f5e..662b62971 100644 --- a/docs/_includes/ads.html +++ b/docs/_includes/ads.html @@ -1 +1 @@ -<div id="carbonads-container"><div class="carbonad"><div id="azcarbon"></div><script>var z = document.createElement("script"); z.async = true; z.src = "http://engine.carbonads.com/z/32341/azcarbon_2_1_0_HORIZ"; var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script></div></div> +<script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=getbootstrapcom" id="_carbonads_js"></script> diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 51b3cda8b..3fc75c058 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -15,6 +15,9 @@ <!-- Bootstrap core CSS --> {% if site.github %} <link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet"> + {% if page.title == "Flexbox grid system" %} + <link href="{{ site.baseurl }}/assets/css/docs-flexbox.min.css" rel="stylesheet"> + {% endif %} {% else %} <link href="{{ site.baseurl }}/dist/css/bootstrap.css" rel="stylesheet"> {% endif %} diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html index 0436e2dbe..a5a3088c7 100644 --- a/docs/_includes/nav-home.html +++ b/docs/_includes/nav-home.html @@ -27,9 +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 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> <a class="navbar-brand hidden-sm-up" href="{{ site.baseurl }}/"> Bootstrap </a> diff --git a/docs/_includes/page-headers.html b/docs/_includes/page-headers.html index 26f5f95b1..50b59a982 100644 --- a/docs/_includes/page-headers.html +++ b/docs/_includes/page-headers.html @@ -18,6 +18,11 @@ <p class="lead"> Over a dozen reusable components built to provide buttons, dropdowns, input groups, navigation, alerts, and much more. </p> +{% elsif page.group == "utilities" %} + <h1>Utilities</h1> + <p class="lead"> + Bootstrap includes dozens of utilities—classes with a single purpose to reduce the frequency of highly repetitive declarations. + </p> {% elsif page.group == "javascript" %} <h1>JavaScript plugins</h1> <p class="lead"> |