diff options
| author | Mark Otto <[email protected]> | 2013-12-08 02:00:37 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-08 02:00:37 -0800 |
| commit | c37b710e85e379ddffb305af8a765013c0cd0333 (patch) | |
| tree | 8c23e05b150a14a39c2be90b39d03343b8c994f7 /_includes | |
| parent | b5008ebf9ca1c9c90a6ec73ae12e55a8f155017f (diff) | |
| parent | e43e87b2f30a9f4967818f1ce8d25a4f88a1f490 (diff) | |
| download | bootstrap-c37b710e85e379ddffb305af8a765013c0cd0333.tar.xz bootstrap-c37b710e85e379ddffb305af8a765013c0cd0333.zip | |
Merge branch 'master' into pr/11744
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/footer.html | 2 | ||||
| -rw-r--r-- | _includes/header.html | 5 | ||||
| -rw-r--r-- | _includes/nav-components.html | 1 | ||||
| -rw-r--r-- | _includes/nav-css.html | 10 |
4 files changed, 14 insertions, 4 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index 1188e10cf..095e96eb5 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -2,7 +2,7 @@ ================================================== --> <!-- Placed at the end of the document so the pages load faster --> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> -<script src="{{ page.base_url }}dist/js/bootstrap.js"></script> +<script src="{{ page.base_url }}dist/js/bootstrap.min.js"></script> <script src="{{ page.base_url }}docs-assets/js/holder.js"></script> diff --git a/_includes/header.html b/_includes/header.html index 41ecfc8e4..93594b4bc 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,8 +1,9 @@ <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> -<meta name="description" content=""> -<meta name="author" content=""> +<meta name="description" content="Bootstrap, a sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development."> +<meta name="keywords" content="HTML, CSS, JS, JavaScript, framework, bootstrap, front-end, frontend, web development"> +<meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contibutors"> <title> {% if page.title == "Bootstrap" %} diff --git a/_includes/nav-components.html b/_includes/nav-components.html index f7a705b5f..131114883 100644 --- a/_includes/nav-components.html +++ b/_includes/nav-components.html @@ -121,6 +121,7 @@ <li><a href="#list-group-basic">Basic example</a></li> <li><a href="#list-group-badges">Badges</a></li> <li><a href="#list-group-linked">Linked items</a></li> + <li><a href="#list-group-contextual-classes">Contextual classes</a></li> <li><a href="#list-group-custom-content">Custom content</a></li> </ul> </li> diff --git a/_includes/nav-css.html b/_includes/nav-css.html index 543d004f3..0228932dd 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -16,6 +16,7 @@ <li><a href="#grid-media-queries">Media queries</a></li> <li><a href="#grid-options">Grid options</a></li> <li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li> + <li><a href="#grid-example-fluid">Ex: Fluid container</a></li> <li><a href="#grid-example-mixed">Ex: Mobile and desktops</a></li> <li><a href="#grid-example-mixed-complete">Ex: Mobile, tablet, desktops</a></li> <li><a href="#grid-responsive-resets">Responsive column resets</a></li> @@ -37,7 +38,14 @@ <li><a href="#type-lists">Lists</a></li> </ul> </li> -<li><a href="#code">Code</a></li> +<li> + <a href="#code">Code</a> + <ul class="nav"> + <li><a href="#code-inline">Inline code</a></li> + <li><a href="#code-user-input">User input</a></li> + <li><a href="#code-block">Blocks of code</a></li> + </ul> +</li> <li> <a href="#tables">Tables</a> <ul class="nav"> |