diff options
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/carousel.html | 6 | ||||
| -rw-r--r-- | docs/examples/grid.html | 24 | ||||
| -rw-r--r-- | docs/examples/jumbotron.html | 8 | ||||
| -rw-r--r-- | docs/examples/justified-nav.html | 6 |
4 files changed, 31 insertions, 13 deletions
diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index cd6855aab..75e0838e3 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -327,19 +327,19 @@ body { <img class="img-circle" data-src="holder.js/140x140"> <h2>Heading</h2> <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p> - <p><a class="btn" href="#">View details »</a></p> + <p><a class="btn btn-default" href="#">View details »</a></p> </div><!-- /.col-lg-4 --> <div class="col col-lg-4"> <img class="img-circle" data-src="holder.js/140x140"> <h2>Heading</h2> <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p> - <p><a class="btn" href="#">View details »</a></p> + <p><a class="btn btn-default" href="#">View details »</a></p> </div><!-- /.col-lg-4 --> <div class="col col-lg-4"> <img class="img-circle" data-src="holder.js/140x140"> <h2>Heading</h2> <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p> - <p><a class="btn" href="#">View details »</a></p> + <p><a class="btn btn-default" href="#">View details »</a></p> </div><!-- /.col-lg-4 --> </div><!-- /.row --> diff --git a/docs/examples/grid.html b/docs/examples/grid.html index 580f69cbf..d14602e4e 100644 --- a/docs/examples/grid.html +++ b/docs/examples/grid.html @@ -11,10 +11,15 @@ title: Grid template padding-right: 15px; } + h4 { + margin-top: 25px; + } .row { margin-bottom: 20px; - margin-left: -15px; - margin-right: -15px; + } + .row .row { + margin-top: 10px; + margin-bottom: 0; } [class*="col-lg-"] { padding-top: 15px; @@ -51,6 +56,19 @@ title: Grid template </div> <h4>Full width, single column</h4> - <p class="text-muted">No grid classes are necessary for full-width elements.</p> + <p class="text-warning">No grid classes are necessary for full-width elements.</p> + + <h4>Two columns with two nested columns</h4> + <div class="row"> + <div class="col col-lg-8"> + .col .col-lg-8 + <div class="row"> + <div class="col col-lg-6">.col .col-lg-6</div> + <div class="col col-lg-6">.col .col-lg-6</div> + </div> + </div> + <div class="col col-lg-4">.col .col-lg-4</div> + </div> + </div> <!-- /container --> diff --git a/docs/examples/jumbotron.html b/docs/examples/jumbotron.html index 3982a34d9..3627f7ef4 100644 --- a/docs/examples/jumbotron.html +++ b/docs/examples/jumbotron.html @@ -63,7 +63,7 @@ title: Jumbotron template </ul> </li> </ul> - <form class="navbar-form pull-right"> + <form class="navbar-form form-inline pull-right"> <input type="text" placeholder="Email"> <input type="password" placeholder="Password"> <button type="submit" class="btn">Sign in</button> @@ -88,17 +88,17 @@ title: Jumbotron template <div class="col col-lg-4"> <h2>Heading</h2> <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p> - <p><a class="btn" href="#">View details »</a></p> + <p><a class="btn btn-default" href="#">View details »</a></p> </div> <div class="col col-lg-4"> <h2>Heading</h2> <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p> - <p><a class="btn" href="#">View details »</a></p> + <p><a class="btn btn-default" href="#">View details »</a></p> </div> <div class="col col-lg-4"> <h2>Heading</h2> <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p> - <p><a class="btn" href="#">View details »</a></p> + <p><a class="btn btn-default" href="#">View details »</a></p> </div> </div> diff --git a/docs/examples/justified-nav.html b/docs/examples/justified-nav.html index fdd706a8f..afc03a1a8 100644 --- a/docs/examples/justified-nav.html +++ b/docs/examples/justified-nav.html @@ -121,17 +121,17 @@ title: Justified nav template <div class="col col-lg-4"> <h2>Heading</h2> <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p> - <p><a class="btn" href="#">View details »</a></p> + <p><a class="btn btn-default" href="#">View details »</a></p> </div> <div class="col col-lg-4"> <h2>Heading</h2> <p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p> - <p><a class="btn" href="#">View details »</a></p> + <p><a class="btn btn-default" href="#">View details »</a></p> </div> <div class="col col-lg-4"> <h2>Heading</h2> <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.</p> - <p><a class="btn" href="#">View details »</a></p> + <p><a class="btn btn-default" href="#">View details »</a></p> </div> </div> |