clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-27 13:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Browse Source
This commit is contained in:
fat 2013-08-18 00:29:15 -07:00
commit b790bbbafc
16 changed files with 91 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/carousel/index.html
View File

@ -13,6 +13,12 @@
<link href="../../dist/css/bootstrap.css" rel="stylesheet"> <link href="../../dist/css/bootstrap.css" rel="stylesheet">
<link href="../../dist/css/bootstrap-glyphicons.css" rel="stylesheet"> <link href="../../dist/css/bootstrap-glyphicons.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="carousel.css" rel="stylesheet"> <link href="carousel.css" rel="stylesheet">
</head> </head>
@ -190,7 +196,6 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
<script src="../../assets/js/holder.js"></script> <script src="../../assets/js/holder.js"></script>
</body> </body>

7
examples/grid/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="grid.css" rel="stylesheet"> <link href="grid.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -109,6 +115,5 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/respond.min.js"></script>
</body> </body>
</html> </html>

7
examples/jumbotron-narrow/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="jumbotron-narrow.css" rel="stylesheet"> <link href="jumbotron-narrow.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -68,6 +74,5 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/respond.min.js"></script>
</body> </body>
</html> </html>

7
examples/jumbotron/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="jumbotron.css" rel="stylesheet"> <link href="jumbotron.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -104,7 +110,6 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

7
examples/justified-nav/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="justified-nav.css" rel="stylesheet"> <link href="justified-nav.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -74,6 +80,5 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/respond.min.js"></script>
</body> </body>
</html> </html>

7
examples/navbar-fixed-top/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar-fixed-top.css" rel="stylesheet"> <link href="navbar-fixed-top.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -75,7 +81,6 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

7
examples/navbar-static-top/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar-static-top.css" rel="stylesheet"> <link href="navbar-static-top.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -76,7 +82,6 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

7
examples/navbar/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="navbar.css" rel="stylesheet"> <link href="navbar.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -72,7 +78,6 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

7
examples/non-responsive/index.html
View File

@ -16,6 +16,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="non-responsive.css" rel="stylesheet"> <link href="non-responsive.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -42,6 +48,5 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/respond.min.js"></script>
</body> </body>
</html> </html>

7
examples/offcanvas/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="offcanvas.css" rel="stylesheet"> <link href="offcanvas.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -115,7 +121,6 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
<script src="offcanvas.js"></script> <script src="offcanvas.js"></script>
</body> </body>

7
examples/signin/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="signin.css" rel="stylesheet"> <link href="signin.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -36,6 +42,5 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/respond.min.js"></script>
</body> </body>
</html> </html>

7
examples/starter-template/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="starter-template.css" rel="stylesheet"> <link href="starter-template.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -52,7 +58,6 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

7
examples/sticky-footer-navbar/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="sticky-footer-navbar.css" rel="stylesheet"> <link href="sticky-footer-navbar.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -75,7 +81,6 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
</body> </body>
</html> </html>

7
examples/sticky-footer/index.html
View File

@ -14,6 +14,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="sticky-footer.css" rel="stylesheet"> <link href="sticky-footer.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -41,6 +47,5 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/respond.min.js"></script>
</body> </body>
</html> </html>

7
examples/theme/index.html
View File

@ -16,6 +16,12 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link href="theme.css" rel="stylesheet"> <link href="theme.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../../assets/js/html5shiv.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<![endif]-->
</head> </head>
<body> <body>
@ -375,7 +381,6 @@
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../../assets/js/jquery.js"></script> <script src="../../assets/js/jquery.js"></script>
<script src="../../assets/js/respond.min.js"></script>
<script src="../../dist/js/bootstrap.min.js"></script> <script src="../../dist/js/bootstrap.min.js"></script>
<script src="../../assets/js/holder.js"></script> <script src="../../assets/js/holder.js"></script>
</body> </body>

2
getting-started.html
View File

@ -262,7 +262,7 @@ bootstrap/
<div class="page-header"> <div class="page-header">
<h1 id="disable-responsive">Disabling responsiveness</h1> <h1 id="disable-responsive">Disabling responsiveness</h1>
</div> </div>
<p class="lead">Don't want your site or application to be scaled on different devices? With a little bit of work, you can disable the responsive features of Bootstrap so that mobile users see your full desktop-version site.</p> <p class="lead">Don't want your site or application to be scaled on different devices? With a little bit of work, you can disable the responsive features of Bootstrap so that mobile users see your full desktop-version site. Read below or check out <a href="../examples/non-responsive/">the non-responsive example</a>.</p>
<h3>Steps to disable responsive views</h3> <h3>Steps to disable responsive views</h3>
<p>To disable responsive features, follow these steps. See it in action in the modified template below.</p> <p>To disable responsive features, follow these steps. See it in action in the modified template below.</p>