aboutsummaryrefslogtreecommitdiff
path: root/docs/examples/dashboard
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-06 20:33:26 -0800
committerMark Otto <[email protected]>2016-02-06 20:33:26 -0800
commitd7d0e186bdfb52856a455c438538582fe95324e6 (patch)
tree43484b5b58471431662e0a8be2b3bb9eb7f00d31 /docs/examples/dashboard
parentf6ad665c26f8a376a806721feaf3f38ceadc7e79 (diff)
parentcb7b78087690e756e33b6f6abdb3548f73f8bb1b (diff)
downloadbootstrap-d7d0e186bdfb52856a455c438538582fe95324e6.tar.xz
bootstrap-d7d0e186bdfb52856a455c438538582fe95324e6.zip
Merge branch 'v4-dev' into v4-split-buttons
Diffstat (limited to 'docs/examples/dashboard')
-rw-r--r--docs/examples/dashboard/index.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index 31f6e8bec..65cc380cb 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -63,7 +63,7 @@
<li><a href="">Another nav item</a></li>
</ul>
</div>
- <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+ <div class="col-sm-9 offset-sm-3 col-md-10 offset-md-2 main">
<h1 class="page-header">Dashboard</h1>
<div class="row placeholders">
@@ -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"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js" integrity="sha384-8gBf6Y4YYq7Jx97PIqmTwLPin4hxIzQw5aDmUg/DDhul9fFpbbLcLh3nTIIDJKhx" 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"></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="../../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>