diff options
| author | Mark Otto <[email protected]> | 2013-01-17 20:23:33 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-01-17 20:23:33 -0800 |
| commit | d9b35c2602b18c78a72ba4b1698b3ec93ccb868d (patch) | |
| tree | 9ad02dd103c908c5c9008d2296623e896d4498f7 /docs/examples | |
| parent | f068cdeb63770182b9e954eac9cbd11bf8df5d57 (diff) | |
| parent | 01b465928ec47d460ea1fd705e49aa2e0e9a4d28 (diff) | |
| download | bootstrap-d9b35c2602b18c78a72ba4b1698b3ec93ccb868d.tar.xz bootstrap-d9b35c2602b18c78a72ba4b1698b3ec93ccb868d.zip | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/css.html
docs/customize.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
less/navbar.less
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/carousel.html | 2 | ||||
| -rw-r--r-- | docs/examples/fluid.html | 163 | ||||
| -rw-r--r-- | docs/examples/hero.html | 2 | ||||
| -rw-r--r-- | docs/examples/justified-nav.html | 2 | ||||
| -rw-r--r-- | docs/examples/marketing-narrow.html | 2 | ||||
| -rw-r--r-- | docs/examples/signin.html | 2 | ||||
| -rw-r--r-- | docs/examples/starter-template.html | 2 | ||||
| -rw-r--r-- | docs/examples/sticky-footer-navbar.html | 2 | ||||
| -rw-r--r-- | docs/examples/sticky-footer.html | 2 |
9 files changed, 171 insertions, 8 deletions
diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 328fe5a1e..50f34e648 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -255,7 +255,7 @@ <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <script src="../assets/js/html5shiv.js"></script> <![endif]--> <!-- Fav and touch icons --> diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html new file mode 100644 index 000000000..b004ffad6 --- /dev/null +++ b/docs/examples/fluid.html @@ -0,0 +1,163 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="utf-8"> + <title>Bootstrap, from Twitter</title> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="description" content=""> + <meta name="author" content=""> + + <!-- Le styles --> + <link href="../assets/css/bootstrap.css" rel="stylesheet"> + <style type="text/css"> + body { + padding-top: 60px; + padding-bottom: 40px; + } + .sidebar-nav { + padding: 9px 0; + } + + @media (max-width: 980px) { + /* Enable use of floated navbar text */ + .navbar-text.pull-right { + float: none; + padding-left: 5px; + padding-right: 5px; + } + } + </style> + <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet"> + + <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> + <!--[if lt IE 9]> + <script src="../assets/js/html5shiv.js"></script> + <![endif]--> + + <!-- Fav and touch icons --> + <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png"> + <link rel="shortcut icon" href="../assets/ico/favicon.png"> + </head> + + <body> + + <div class="navbar navbar-inverse navbar-fixed-top"> + <div class="navbar-inner"> + <div class="container-fluid"> + <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </a> + <a class="brand" href="#">Project name</a> + <div class="nav-collapse collapse"> + <p class="navbar-text pull-right"> + Logged in as <a href="#" class="navbar-link">Username</a> + </p> + <ul class="nav"> + <li class="active"><a href="#">Home</a></li> + <li><a href="#about">About</a></li> + <li><a href="#contact">Contact</a></li> + </ul> + </div><!--/.nav-collapse --> + </div> + </div> + </div> + + <div class="container-fluid"> + <div class="row-fluid"> + <div class="span3"> + <div class="well sidebar-nav"> + <ul class="nav nav-list"> + <li class="nav-header">Sidebar</li> + <li class="active"><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + <li class="nav-header">Sidebar</li> + <li><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + <li class="nav-header">Sidebar</li> + <li><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + <li><a href="#">Link</a></li> + </ul> + </div><!--/.well --> + </div><!--/span--> + <div class="span9"> + <div class="hero-unit"> + <h1>Hello, world!</h1> + <p>This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.</p> + <p><a class="btn btn-primary btn-large">Learn more »</a></p> + </div> + <div class="row-fluid"> + <div class="span4"> + <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> + </div><!--/span--> + <div class="span4"> + <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> + </div><!--/span--> + <div class="span4"> + <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> + </div><!--/span--> + </div><!--/row--> + <div class="row-fluid"> + <div class="span4"> + <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> + </div><!--/span--> + <div class="span4"> + <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> + </div><!--/span--> + <div class="span4"> + <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> + </div><!--/span--> + </div><!--/row--> + </div><!--/span--> + </div><!--/row--> + + <hr> + + <footer> + <p>© Company 2013</p> + </footer> + + </div><!--/.fluid-container--> + + <!-- Le javascript + ================================================== --> + <!-- Placed at the end of the document so the pages load faster --> + <script src="../assets/js/jquery.js"></script> + <script src="../assets/js/bootstrap-transition.js"></script> + <script src="../assets/js/bootstrap-alert.js"></script> + <script src="../assets/js/bootstrap-modal.js"></script> + <script src="../assets/js/bootstrap-dropdown.js"></script> + <script src="../assets/js/bootstrap-scrollspy.js"></script> + <script src="../assets/js/bootstrap-tab.js"></script> + <script src="../assets/js/bootstrap-tooltip.js"></script> + <script src="../assets/js/bootstrap-popover.js"></script> + <script src="../assets/js/bootstrap-button.js"></script> + <script src="../assets/js/bootstrap-collapse.js"></script> + <script src="../assets/js/bootstrap-carousel.js"></script> + <script src="../assets/js/bootstrap-typeahead.js"></script> + + </body> +</html> diff --git a/docs/examples/hero.html b/docs/examples/hero.html index 6c585eac2..c28b757b9 100644 --- a/docs/examples/hero.html +++ b/docs/examples/hero.html @@ -19,7 +19,7 @@ <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <script src="../assets/js/html5shiv.js"></script> <![endif]--> <!-- Fav and touch icons --> diff --git a/docs/examples/justified-nav.html b/docs/examples/justified-nav.html index 9071a8d81..ef8f8d428 100644 --- a/docs/examples/justified-nav.html +++ b/docs/examples/justified-nav.html @@ -84,7 +84,7 @@ <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <script src="../assets/js/html5shiv.js"></script> <![endif]--> <!-- Fav and touch icons --> diff --git a/docs/examples/marketing-narrow.html b/docs/examples/marketing-narrow.html index 996f8a1da..f6f5d1685 100644 --- a/docs/examples/marketing-narrow.html +++ b/docs/examples/marketing-narrow.html @@ -50,7 +50,7 @@ <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <script src="../assets/js/html5shiv.js"></script> <![endif]--> <!-- Fav and touch icons --> diff --git a/docs/examples/signin.html b/docs/examples/signin.html index 17578483a..031052789 100644 --- a/docs/examples/signin.html +++ b/docs/examples/signin.html @@ -46,7 +46,7 @@ <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <script src="../assets/js/html5shiv.js"></script> <![endif]--> <!-- Fav and touch icons --> diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html index 93ba809e3..b81f21d17 100644 --- a/docs/examples/starter-template.html +++ b/docs/examples/starter-template.html @@ -18,7 +18,7 @@ <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <script src="../assets/js/html5shiv.js"></script> <![endif]--> <!-- Fav and touch icons --> diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html index ad4f87a04..cb5de6de2 100644 --- a/docs/examples/sticky-footer-navbar.html +++ b/docs/examples/sticky-footer-navbar.html @@ -70,7 +70,7 @@ <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <script src="../assets/js/html5shiv.js"></script> <![endif]--> <!-- Fav and touch icons --> diff --git a/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html index 80490ffd0..d307d7938 100644 --- a/docs/examples/sticky-footer.html +++ b/docs/examples/sticky-footer.html @@ -67,7 +67,7 @@ <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> - <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <script src="../assets/js/html5shiv.js"></script> <![endif]--> <!-- Fav and touch icons --> |