diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-12-08 02:18:32 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-12-08 02:18:32 +0300 |
| commit | 5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4 (patch) | |
| tree | 2951782d8d0aadb61dae9122d0f508a75ed8e7eb /js/tests/visual | |
| parent | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (diff) | |
| parent | afbaf4350560eaf2135fb0dc6dd761ebb746ac40 (diff) | |
| download | bootstrap-5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4.tar.xz bootstrap-5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into patch-1
Diffstat (limited to 'js/tests/visual')
| -rw-r--r-- | js/tests/visual/alert.html | 7 | ||||
| -rw-r--r-- | js/tests/visual/button.html | 7 | ||||
| -rw-r--r-- | js/tests/visual/carousel.html | 17 | ||||
| -rw-r--r-- | js/tests/visual/collapse.html | 7 | ||||
| -rw-r--r-- | js/tests/visual/dropdown.html | 7 | ||||
| -rw-r--r-- | js/tests/visual/modal.html | 8 | ||||
| -rw-r--r-- | js/tests/visual/popover.html | 7 | ||||
| -rw-r--r-- | js/tests/visual/scrollspy.html | 9 | ||||
| -rw-r--r-- | js/tests/visual/tab.html | 8 | ||||
| -rw-r--r-- | js/tests/visual/tooltip.html | 7 |
10 files changed, 9 insertions, 75 deletions
diff --git a/js/tests/visual/alert.html b/js/tests/visual/alert.html index 9e6a939e9..60a140452 100644 --- a/js/tests/visual/alert.html +++ b/js/tests/visual/alert.html @@ -6,13 +6,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Alert</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> diff --git a/js/tests/visual/button.html b/js/tests/visual/button.html index a6eed7e05..a0388e777 100644 --- a/js/tests/visual/button.html +++ b/js/tests/visual/button.html @@ -6,13 +6,6 @@ <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> diff --git a/js/tests/visual/carousel.html b/js/tests/visual/carousel.html index 47dacaa6a..3930755b7 100644 --- a/js/tests/visual/carousel.html +++ b/js/tests/visual/carousel.html @@ -6,13 +6,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Carousel</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> @@ -21,7 +14,7 @@ <div class="page-header"> <h1>Carousel <small>Bootstrap Visual Test</small></h1> </div> - + <p>Also, the carousel shouldn't slide when its window/tab is hidden. Check the console log.</p> <div id="carousel-example-generic" class="carousel slide" data-ride="carousel"> <ol class="carousel-indicators"> <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li> @@ -53,6 +46,14 @@ <script src="../vendor/jquery.min.js"></script> <script src="../../dist/util.js"></script> <script src="../../dist/carousel.js"></script> +<script> + $(function () { + // Test to show that the carousel doesn't slide when the current tab isn't visible + $('#carousel-example-generic').on('slid.bs.carousel', function (event) { + console.log('slid at ', event.timeStamp); + }) + }); +</script> </body> </html> diff --git a/js/tests/visual/collapse.html b/js/tests/visual/collapse.html index 2ccc787ec..a930ab0c6 100644 --- a/js/tests/visual/collapse.html +++ b/js/tests/visual/collapse.html @@ -6,13 +6,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Collapse</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> diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html index 47e400d4b..f0d6f159e 100644 --- a/js/tests/visual/dropdown.html +++ b/js/tests/visual/dropdown.html @@ -6,13 +6,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Dropdown</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> diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html index 047916707..2e2f6eb63 100644 --- a/js/tests/visual/modal.html +++ b/js/tests/visual/modal.html @@ -6,14 +6,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Modal</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]--> - <style> #tall { height: 1500px; diff --git a/js/tests/visual/popover.html b/js/tests/visual/popover.html index ac6557256..533af2bbd 100644 --- a/js/tests/visual/popover.html +++ b/js/tests/visual/popover.html @@ -6,13 +6,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Popover</title> <link rel="stylesheet" href="../../../dist/css/bootstrap.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> diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html index e8ae05108..dc1dfc82f 100644 --- a/js/tests/visual/scrollspy.html +++ b/js/tests/visual/scrollspy.html @@ -6,17 +6,9 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Scrollspy</title> <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css"> - <style> body { padding-top: 70px; } </style> - - <!-- 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 data-spy="scroll" data-target=".navbar" data-offset="70"> @@ -84,7 +76,6 @@ <p>Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.</p> <p>Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.</p> <p>Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.</p> - </p> </div> diff --git a/js/tests/visual/tab.html b/js/tests/visual/tab.html index 22a918ed7..ae7511f55 100644 --- a/js/tests/visual/tab.html +++ b/js/tests/visual/tab.html @@ -6,7 +6,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Tab</title> <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css"> - <style> h4 { margin: 40px 0 10px; @@ -16,13 +15,6 @@ margin-bottom: 15px; } </style> - - <!-- 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> diff --git a/js/tests/visual/tooltip.html b/js/tests/visual/tooltip.html index 1946dff97..96ede67ef 100644 --- a/js/tests/visual/tooltip.html +++ b/js/tests/visual/tooltip.html @@ -6,13 +6,6 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Tooltip</title> <link rel="stylesheet" href="../../../dist/css/bootstrap.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> |
