diff options
| author | Mark Otto <[email protected]> | 2015-05-27 15:49:55 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-05-27 15:49:55 -0700 |
| commit | 663576a7ae77fb3f6143ce59ea16511cdaf8e9c3 (patch) | |
| tree | 4c205f99d57e85308abc01ee431b6008bdf8c641 /js/tests/visual/button.html | |
| parent | bd971c49b0883452af2e1278a8628eaf351504a1 (diff) | |
| parent | 3fe894ba3620c7e5d2e040f83948488d1911aedc (diff) | |
| download | bootstrap-663576a7ae77fb3f6143ce59ea16511cdaf8e9c3.tar.xz bootstrap-663576a7ae77fb3f6143ce59ea16511cdaf8e9c3.zip | |
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
dist/css/bootstrap.css
dist/css/bootstrap.css.map
docs/assets/css/docs.min.css
Diffstat (limited to 'js/tests/visual/button.html')
| -rw-r--r-- | js/tests/visual/button.html | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/js/tests/visual/button.html b/js/tests/visual/button.html index c3be92141..a6eed7e05 100644 --- a/js/tests/visual/button.html +++ b/js/tests/visual/button.html @@ -6,6 +6,13 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Button</title> <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css"> + + <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> + <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> + <!--[if lt IE 9]> + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> + <![endif]--> </head> <body> @@ -45,8 +52,8 @@ <!-- JavaScript Includes --> <script src="../vendor/jquery.min.js"></script> -<script src="../../util.js"></script> -<script src="../../button.js"></script> +<script src="../../dist/util.js"></script> +<script src="../../dist/button.js"></script> <!-- JavaScript Test --> <script> |