diff options
| author | Mark Otto <[email protected]> | 2017-05-27 15:26:48 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-05-27 15:26:48 -0700 |
| commit | 8f67ac19a761b8d3ecc80485c3f54aa6ba4fa910 (patch) | |
| tree | d5a2aba4e2e762b283e7cfe60f00e1f239105bbe /docs/examples/dashboard | |
| parent | 6c3f833076a9fa68601741e3e21bd07ad79b7d8a (diff) | |
| parent | db44e4b311317ef760f8412cc33c84146959b248 (diff) | |
| download | bootstrap-8f67ac19a761b8d3ecc80485c3f54aa6ba4fa910.tar.xz bootstrap-8f67ac19a761b8d3ecc80485c3f54aa6ba4fa910.zip | |
Merge branch 'v4-dev' into v4-docs-streamlined
Diffstat (limited to 'docs/examples/dashboard')
| -rw-r--r-- | docs/examples/dashboard/dashboard.css | 4 | ||||
| -rw-r--r-- | docs/examples/dashboard/index.html | 18 |
2 files changed, 10 insertions, 12 deletions
diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index 99f2962b5..b1248cd68 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -2,9 +2,9 @@ * Base structure */ -/* Move down content because we have a fixed navbar that is 50px tall */ +/* Move down content because we have a fixed navbar that is 3.5rem tall */ body { - padding-top: 50px; + padding-top: 3.5rem; } /* diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index 3d44249d3..241ffcbc3 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -2,9 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge"> <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="author" content=""> <link rel="icon" href="../../favicon.ico"> @@ -19,11 +17,11 @@ </head> <body> - <nav class="navbar navbar-toggleable-md navbar-inverse navbar-fixed-top bg-inverse"> - <button class="navbar-toggler navbar-toggler-right hidden-lg-up" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation"> + <nav class="navbar navbar-expand-md navbar-inverse fixed-top bg-inverse"> + <a class="navbar-brand" href="#">Dashboard</a> + <button class="navbar-toggler d-lg-none" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> </button> - <a class="navbar-brand" href="#">Dashboard</a> <div class="collapse navbar-collapse" id="navbarsExampleDefault"> <ul class="navbar-nav mr-auto"> @@ -41,7 +39,7 @@ </li> </ul> <form class="form-inline mt-2 mt-md-0"> - <input class="form-control mr-sm-2" type="text" placeholder="Search"> + <input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search"> <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button> </form> </div> @@ -49,7 +47,7 @@ <div class="container-fluid"> <div class="row"> - <nav class="col-sm-3 col-md-2 hidden-xs-down bg-faded sidebar"> + <nav class="col-sm-3 col-md-2 d-none d-sm-block bg-faded sidebar"> <ul class="nav nav-pills flex-column"> <li class="nav-item"> <a class="nav-link active" href="#">Overview <span class="sr-only">(current)</span></a> @@ -93,7 +91,7 @@ </ul> </nav> - <main class="col-sm-9 offset-sm-3 col-md-10 offset-md-2 pt-3"> + <main class="col-sm-9 offset-sm-3 col-md-10 offset-md-2 pt-3" role="main"> <h1>Dashboard</h1> <section class="row text-center placeholders"> @@ -254,9 +252,9 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> - <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js" integrity="sha384-THPy051/pYDQGanwU6poAc/hOdQxjnOEXzbT+OuUAFqNqFjL+4IGLBgCJC3ZOShY" crossorigin="anonymous"></script> + <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script> <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.9.9/umd/popper.min.js" integrity="sha256-c477vRLKQv1jt9o7w6TTBzFyFznTaZjoMLTDFi7Hlxc=" crossorigin="anonymous"></script> <script src="../../dist/js/bootstrap.min.js"></script> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> |