diff options
| author | Mark Otto <[email protected]> | 2016-05-11 11:07:06 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-05-11 11:07:06 -0700 |
| commit | b280e36b788e4b42bbb359f0a13db410adf7dd8c (patch) | |
| tree | bc8115b9b11cb78767655917a482c25c9f711526 /docs/examples/dashboard | |
| parent | ef50b7839cb2ca9171eec12c2bf22fc38ad9d7ae (diff) | |
| parent | 9d6b41c1276af04d5e81043059035660add82b8d (diff) | |
| download | bootstrap-b280e36b788e4b42bbb359f0a13db410adf7dd8c.tar.xz bootstrap-b280e36b788e4b42bbb359f0a13db410adf7dd8c.zip | |
Merge branch 'v4-dev' into v4-split-buttons
Diffstat (limited to 'docs/examples/dashboard')
| -rw-r--r-- | docs/examples/dashboard/dashboard.css | 3 | ||||
| -rw-r--r-- | docs/examples/dashboard/index.html | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index e0e3632b8..e7c6a21df 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -80,9 +80,6 @@ body { padding-left: 40px; } } -.main .page-header { - margin-top: 0; -} /* diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index 65cc380cb..3b39ea216 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -64,7 +64,7 @@ </ul> </div> <div class="col-sm-9 offset-sm-3 col-md-10 offset-md-2 main"> - <h1 class="page-header">Dashboard</h1> + <h1>Dashboard</h1> <div class="row placeholders"> <div class="col-xs-6 col-sm-3 placeholder"> @@ -224,9 +224,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/2.1.4/jquery.min.js" integrity="sha384-8gBf6Y4YYq7Jx97PIqmTwLPin4hxIzQw5aDmUg/DDhul9fFpbbLcLh3nTIIDJKhx" crossorigin="anonymous"></script> + <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" 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.1.1/js/tether.min.js" integrity="sha384-MWq1Lnqj72tmjGdOKuNBn3E0gj3vWfy/1EmR5TVL8d8nGvwgy32YkCpKpTUhwBVv" crossorigin="anonymous"></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="../../dist/js/bootstrap.min.js"></script> <!-- Just to make our placeholder images work. Don't actually copy the next line! --> <script src="../../assets/js/vendor/holder.min.js"></script> |