1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

Normalize examples and update where relevant.

This commit is contained in:
Bardi Harborow 2016-10-20 01:45:00 +11:00
parent dd22d99254
commit ba49d709ba
10 changed files with 40 additions and 39 deletions

View file

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<link rel="icon" href="../../favicon.ico"> <link rel="icon" href="../../favicon.ico">
@ -35,7 +36,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="navbar navbar-static-top navbar-dark bg-inverse"> <div class="navbar navbar-full navbar-static-top navbar-dark bg-inverse">
<div class="container-fluid"> <div class="container-fluid">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button>
<a href="#" class="navbar-brand">Album</a> <a href="#" class="navbar-brand">Album</a>

View file

@ -3,6 +3,7 @@
/* Padding below the footer and lighter body text */ /* Padding below the footer and lighter body text */
body { body {
padding-top: 3rem;
padding-bottom: 3rem; padding-bottom: 3rem;
color: #5a5a5a; color: #5a5a5a;
} }

View file

@ -19,7 +19,7 @@
</head> </head>
<body> <body>
<nav class="navbar navbar-static-top navbar-light bg-faded"> <nav class="navbar navbar-fixed-top navbar-dark bg-inverse">
<a href="#" class="navbar-brand">Carousel</a> <a href="#" class="navbar-brand">Carousel</a>
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="nav-item active"> <li class="nav-item active">

View file

@ -135,7 +135,7 @@
<hr> <hr>
<h3>Column clearing</h3> <h3>Column clearing</h3>
<p><a href="https://getbootstrap.com/css/#grid-responsive-resets">Clear floats</a> at specific breakpoints to prevent awkward wrapping with uneven content.</p> <p><a href="../../layout/grid/#example-responsive-column-resets">Clear floats</a> at specific breakpoints to prevent awkward wrapping with uneven content.</p>
<div class="row"> <div class="row">
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-3">
.col-xs-6 .col-sm-3 .col-xs-6 .col-sm-3
@ -164,10 +164,8 @@
<div class="col-sm-6 col-md-5 offset-md-2 col-lg-6 offset-lg-0">.col-sm-6 .col-md-5 .offset-md-2 .col-lg-6 .offset-lg-0</div> <div class="col-sm-6 col-md-5 offset-md-2 col-lg-6 offset-lg-0">.col-sm-6 .col-md-5 .offset-md-2 .col-lg-6 .offset-lg-0</div>
</div> </div>
</div> <!-- /container --> </div> <!-- /container -->
<!-- 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 -->

View file

@ -20,7 +20,7 @@
<body> <body>
<nav class="navbar navbar-static-top navbar-dark bg-inverse"> <nav class="navbar navbar-fixed-top navbar-dark bg-inverse">
<a class="navbar-brand" href="#">Project name</a> <a class="navbar-brand" href="#">Project name</a>
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li class="nav-item active"> <li class="nav-item active">

View file

@ -1,4 +1,4 @@
/* Move down content because we have a fixed navbar that is 50px tall */ /* Move down content because we have a fixed navbar that is 50px tall */
body { body {
padding-bottom: 2rem; padding-top: 2rem;
} }

View file

@ -74,7 +74,6 @@
</div> <!-- /container --> </div> <!-- /container -->
<!-- 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 -->

View file

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<link rel="icon" href="../../favicon.ico"> <link rel="icon" href="../../favicon.ico">
@ -21,12 +22,12 @@
<div class="pos-f-t"> <div class="pos-f-t">
<div class="collapse" id="navbar-header"> <div class="collapse" id="navbar-header">
<div class="container-fluid bg-inverse p-1"> <div class="container-fluid bg-inverse text-white pt-1">
<h3>Collapsed content</h3> <h3>Collapsed content</h3>
<p>Toggleable via the navbar brand.</p> <p>Toggleable via the navbar brand.</p>
</div> </div>
</div> </div>
<div class="navbar navbar-light bg-faded navbar-static-top"> <div class="navbar navbar-light bg-faded">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button>
</div> </div>
</div> </div>

View file

@ -1,5 +1,5 @@
/* Show it is fixed to the top */
body { body {
/* Show it's not fixed to the top */
min-height: 75rem; min-height: 75rem;
padding-top: 6rem; padding-top: 4.5rem;
} }

View file

@ -4,6 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<link rel="icon" href="../../favicon.ico"> <link rel="icon" href="../../favicon.ico">
@ -20,12 +21,12 @@
<body> <body>
<div class="collapse" id="navbar-header"> <div class="collapse" id="navbar-header">
<div class="container-fluid bg-inverse p-1"> <div class="container-fluid bg-inverse text-white pt-1">
<h3>Collapsed content</h3> <h3>Collapsed content</h3>
<p>Toggleable via the navbar brand.</p> <p>Toggleable via the navbar brand.</p>
</div> </div>
</div> </div>
<div class="navbar navbar-light bg-faded navbar-static-top mb-1"> <div class="navbar navbar-light bg-faded mb-1">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-header" aria-controls="navbar-header" aria-expanded="false" aria-label="Toggle navigation"></button>
</div> </div>