diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_includes/footer.html | 2 | ||||
| -rw-r--r-- | docs/_layouts/default.html | 4 | ||||
| -rw-r--r-- | docs/_layouts/docs.html | 2 | ||||
| -rw-r--r-- | docs/components/forms.md | 8 | ||||
| -rw-r--r-- | docs/components/modal.md | 4 | ||||
| -rw-r--r-- | docs/content/typography.md | 14 | ||||
| -rw-r--r-- | docs/examples/offcanvas/index.html | 24 |
7 files changed, 25 insertions, 33 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 429056ff3f..3e12c58b8b 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -12,7 +12,7 @@ </footer> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> -<script>window.jQuery || document.write('<script src="../assets/js/vendor/jquery.min.js"><\/script>')</script> +<script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery.min.js"><\/script>')</script> {% if site.github %} <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script> diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 274f51f8d3..dab3d56655 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -12,7 +12,9 @@ {% include nav-home.html %} - {{ content }} + <div id="content"> + {{ content }} + </div> {% include footer.html %} </body> diff --git a/docs/_layouts/docs.html b/docs/_layouts/docs.html index 9bcf55cd74..fc47e6f405 100644 --- a/docs/_layouts/docs.html +++ b/docs/_layouts/docs.html @@ -25,7 +25,7 @@ {% include nav-docs.html %} </div> <div class="col-md-9 col-md-pull-3 bd-content"> - <h1 class="bd-title">{{ page.title }}</h1> + <h1 class="bd-title" id="content">{{ page.title }}</h1> {{ content }} </div> </div> diff --git a/docs/components/forms.md b/docs/components/forms.md index 94588c79fd..7f5d1496cf 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -535,7 +535,7 @@ Block help text—for below inputs or for longer lines of help text—can be eas ## Validation -Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add `.has-warning`, `.has-error`, or `.has-success` to the parent element. Any `.control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles. +Bootstrap includes validation styles for error, warning, and success states on form controls. To use, add `.has-warning`, `.has-error`, or `.has-success` to the parent element. Any `.form-control-label`, `.form-control`, and `.text-help` within that element will receive the validation styles. {% comment %} {% callout warning %} @@ -549,15 +549,15 @@ Ensure that an alternative indication of state is also provided. For instance, y {% example html %} <div class="form-group has-success"> - <label class="control-label" for="inputSuccess1">Input with success</label> + <label class="form-control-label" for="inputSuccess1">Input with success</label> <input type="text" class="form-control form-control-success" id="inputSuccess1"> </div> <div class="form-group has-warning"> - <label class="control-label" for="inputWarning1">Input with warning</label> + <label class="form-control-label" for="inputWarning1">Input with warning</label> <input type="text" class="form-control form-control-warning" id="inputWarning1"> </div> <div class="form-group has-error"> - <label class="control-label" for="inputError1">Input with error</label> + <label class="form-control-label" for="inputError1">Input with error</label> <input type="text" class="form-control form-control-error" id="inputError1"> </div> diff --git a/docs/components/modal.md b/docs/components/modal.md index c4869255b2..6bda50798d 100644 --- a/docs/components/modal.md +++ b/docs/components/modal.md @@ -336,11 +336,11 @@ Have a bunch of buttons that all trigger the same modal, just with slightly diff <div class="modal-body"> <form> <div class="form-group"> - <label for="recipient-name" class="control-label">Recipient:</label> + <label for="recipient-name" class="form-control-label">Recipient:</label> <input type="text" class="form-control" id="recipient-name"> </div> <div class="form-group"> - <label for="message-text" class="control-label">Message:</label> + <label for="message-text" class="form-control-label">Message:</label> <textarea class="form-control" id="message-text"></textarea> </div> </form> diff --git a/docs/content/typography.md b/docs/content/typography.md index 264686b054..e97593e2ef 100644 --- a/docs/content/typography.md +++ b/docs/content/typography.md @@ -85,26 +85,26 @@ Traditional heading elements are designed to work best in the meat of your page <table class="table"> <tbody> <tr> - <td><h1 class="display-4">Display 4</h1></td> + <td><h1 class="display-1">Display 1</h1></td> </tr> <tr> - <td><h1 class="display-3">Display 3</h1></td> + <td><h1 class="display-2">Display 2</h1></td> </tr> <tr> - <td><h1 class="display-2">Display 2</h1></td> + <td><h1 class="display-3">Display 3</h1></td> </tr> <tr> - <td><h1 class="display-1">Display 1</h1></td> + <td><h1 class="display-4">Display 4</h1></td> </tr> </tbody> </table> </div> {% highlight html %} -<h1 class="display-4">Display 4</h1> -<h1 class="display-3">Display 3</h1> -<h1 class="display-2">Display 2</h1> <h1 class="display-1">Display 1</h1> +<h1 class="display-2">Display 2</h1> +<h1 class="display-3">Display 3</h1> +<h1 class="display-4">Display 4</h1> {% endhighlight %} ## Lead diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index bd12b22bdd..5382011f7f 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -22,24 +22,14 @@ </head> <body> - <nav class="navbar navbar-fixed-top navbar-inverse"> + <nav class="navbar navbar-fixed-top navbar-dark bg-inverse"> <div class="container"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="#">Project name</a> - </div> - <div id="navbar" class="collapse navbar-collapse"> - <ul class="nav navbar-nav"> - <li class="active"><a href="#">Home</a></li> - <li><a href="#">About</a></li> - <li><a href="#">Contact</a></li> - </ul> - </div><!-- /.nav-collapse --> + <a class="navbar-brand" href="#">Project name</a> + <ul class="nav navbar-nav"> + <li class="nav-item active"><a class="nav-link" href="#">Home</a></li> + <li class="nav-item"><a class="nav-link" href="#about">About</a></li> + <li class="nav-item"><a class="nav-link" href="#contact">Contact</a></li> + </ul> </div><!-- /.container --> </nav><!-- /.navbar --> |