diff options
| author | Mark Otto <[email protected]> | 2017-05-26 21:22:08 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-05-26 21:22:08 -0700 |
| commit | 04724939a39d68b495da638e58eb794dafe8ab93 (patch) | |
| tree | 7648460f56c35778514e388fc2933b8d55c6cce8 /js/tests/visual | |
| parent | e0e1e849e6cda0d4af88a46f7e7e5a91f8b8498d (diff) | |
| parent | f2829dd6ea10d1af7e451397f7228087cff95b8a (diff) | |
| download | bootstrap-04724939a39d68b495da638e58eb794dafe8ab93.tar.xz bootstrap-04724939a39d68b495da638e58eb794dafe8ab93.zip | |
Merge branch 'v4-dev' into form-tweaks
Diffstat (limited to 'js/tests/visual')
| -rw-r--r-- | js/tests/visual/dropdown.html | 60 | ||||
| -rw-r--r-- | js/tests/visual/modal.html | 2 | ||||
| -rw-r--r-- | js/tests/visual/popover.html | 8 | ||||
| -rw-r--r-- | js/tests/visual/scrollspy.html | 1 | ||||
| -rw-r--r-- | js/tests/visual/tooltip.html | 26 |
5 files changed, 92 insertions, 5 deletions
diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html index cc8a6e709..fee096c6c 100644 --- a/js/tests/visual/dropdown.html +++ b/js/tests/visual/dropdown.html @@ -58,9 +58,67 @@ </div> </li> </ul> - </div> + + <div class="row"> + <div class="col-sm-12 mt-4"> + <div class="btn-group dropup"> + <button type="button" class="btn btn-secondary">Dropup split</button> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <span class="sr-only">Dropup split</span> + </button> + <div class="dropdown-menu"> + <a class="dropdown-item" href="#">Action</a> + <a class="dropdown-item" href="#">Another action</a> + <a class="dropdown-item" href="#">Something else here</a> + </div> + </div> + + <div class="btn-group dropup"> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropup</button> + <div class="dropdown-menu"> + <a class="dropdown-item" href="#">Action</a> + <a class="dropdown-item" href="#">Another action</a> + <a class="dropdown-item" href="#">Something else here</a> + </div> + </div> + + <div class="btn-group"> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + This dropdown's menu is right-aligned + </button> + <div class="dropdown-menu dropdown-menu-right"> + <button class="dropdown-item" type="button">Action</button> + <button class="dropdown-item" type="button">Another action</button> + <button class="dropdown-item" type="button">Something else here</button> + </div> + </div> + </div> + <div class="col-sm-12 mt-4"> + <div class="btn-group dropup" role="group"> + <a href="#" class="btn btn-secondary">Dropup split align right</a> + <button type="button" id="dropdown-page-subheader-button-3" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + <span class="sr-only">Product actions</span> + </button> + <div class="dropdown-menu dropdown-menu-right"> + <button class="dropdown-item" type="button">Action</button> + <button class="dropdown-item" type="button">Another action</button> + <button class="dropdown-item" type="button">Something else here with a long text</button> + </div> + </div> + <div class="btn-group dropup"> + <button type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropup align right</button> + <div class="dropdown-menu dropdown-menu-right"> + <button class="dropdown-item" type="button">Action</button> + <button class="dropdown-item" type="button">Another action</button> + <button class="dropdown-item" type="button">Something else here with a long text</button> + </div> + </div> + </div> + </div> + </div> <script src="../../../docs/assets/js/vendor/jquery-slim.min.js"></script> + <script src="../../../docs/assets/js/vendor/popper.min.js"></script> <script src="../../dist/util.js"></script> <script src="../../dist/dropdown.js"></script> <script src="../../dist/collapse.js"></script> diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html index e999514f7..90b814e67 100644 --- a/js/tests/visual/modal.html +++ b/js/tests/visual/modal.html @@ -170,7 +170,7 @@ </div> <script src="../../../docs/assets/js/vendor/jquery-slim.min.js"></script> - <script src="../../../docs/assets/js/vendor/tether.min.js"></script> + <script src="../../../docs/assets/js/vendor/popper.min.js"></script> <script src="../../dist/util.js"></script> <script src="../../dist/modal.js"></script> <script src="../../dist/collapse.js"></script> diff --git a/js/tests/visual/popover.html b/js/tests/visual/popover.html index 51b5fe506..2354abf42 100644 --- a/js/tests/visual/popover.html +++ b/js/tests/visual/popover.html @@ -10,7 +10,11 @@ <div class="container"> <h1>Popover <small>Bootstrap Visual Test</small></h1> - <button type="button" class="btn btn-secondary" data-container="body" data-toggle="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."> + <button type="button" class="btn btn-secondary" data-container="body" data-toggle="popover" data-placement="auto" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus."> + Popover on auto + </button> + + <button type="button" class="btn btn-secondary" data-container="body" data-toggle="popover" data-placement="top" data-content="Default placement was on top but not enough place"> Popover on top </button> @@ -29,7 +33,7 @@ </div> <script src="../../../docs/assets/js/vendor/jquery-slim.min.js"></script> - <script src="../../../docs/assets/js/vendor/tether.min.js"></script> + <script src="../../../docs/assets/js/vendor/popper.min.js"></script> <script src="../../dist/util.js"></script> <script src="../../dist/tooltip.js"></script> <script src="../../dist/popover.js"></script> diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html index c0c3dc749..0f115e035 100644 --- a/js/tests/visual/scrollspy.html +++ b/js/tests/visual/scrollspy.html @@ -87,6 +87,7 @@ </div> <script src="../../../docs/assets/js/vendor/jquery-slim.min.js"></script> + <script src="../../../docs/assets/js/vendor/popper.min.js"></script> <script src="../../dist/util.js"></script> <script src="../../dist/scrollspy.js"></script> <script src="../../dist/dropdown.js"></script> diff --git a/js/tests/visual/tooltip.html b/js/tests/visual/tooltip.html index f447a533b..172cb29ad 100644 --- a/js/tests/visual/tooltip.html +++ b/js/tests/visual/tooltip.html @@ -5,6 +5,19 @@ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <link rel="stylesheet" href="../../../dist/css/bootstrap.min.css"> <title>Tooltip</title> + <style> + #target { + border: 1px solid; + width: 100px; + height: 50px; + border: 1px solid; + margin-left: 50px; + -webkit-transform: rotate(270deg); + -ms-transform: rotate(270deg); + transform: rotate(270deg); + margin-top: 100px; + } + </style> </head> <body> <div class="container"> @@ -15,6 +28,9 @@ <hr> <p> + <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="auto" title="Tooltip on auto"> + Tooltip on auto + </button> <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-placement="top" title="Tooltip on top"> Tooltip on top </button> @@ -30,17 +46,25 @@ <button type="button" class="btn btn-secondary" data-toggle="tooltip" data-html="true" title="<em>Tooltip</em> <u>with</u> <b>HTML</b>"> Tooltip with HTML </button> + <svg width="30" height="20"> + <circle cx="15" cy="10" r="10" fill="#62448F" data-toggle="tooltip" data-placement="top" title="Tooltip on SVG" /> + </svg> </p> + <div id="target" title="Test tooltip on transformed element"></div> </div> <script src="../../../docs/assets/js/vendor/jquery-slim.min.js"></script> - <script src="../../../docs/assets/js/vendor/tether.min.js"></script> + <script src="../../../docs/assets/js/vendor/popper.min.js"></script> <script src="../../dist/util.js"></script> <script src="../../dist/tooltip.js"></script> <script> $(function () { $('[data-toggle="tooltip"]').tooltip() + $('#target').tooltip({ + placement : 'top', + trigger : 'manual' + }).tooltip('show') }) </script> </body> |
