diff options
| author | Thomas McDonald <[email protected]> | 2015-08-24 16:19:19 -0700 |
|---|---|---|
| committer | Thomas McDonald <[email protected]> | 2015-08-24 16:19:19 -0700 |
| commit | 22717a12426af5567f65be1da3d4d968c22276a7 (patch) | |
| tree | 491c47f72160c5b1133fa138c1fbacd00e253377 /js | |
| parent | ec523617a3eb6da5b3e14f878931c769999f89a7 (diff) | |
| parent | 0da684ff8501768c0ecd4c60c0c7cf043bde1a1d (diff) | |
| download | bootstrap-22717a12426af5567f65be1da3d4d968c22276a7.tar.xz bootstrap-22717a12426af5567f65be1da3d4d968c22276a7.zip | |
Merge branch 'v4-dev' into fix-travis-v4
Diffstat (limited to 'js')
| -rw-r--r-- | js/.eslintrc | 1 | ||||
| -rw-r--r-- | js/tests/visual/dropdown.html | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/js/.eslintrc b/js/.eslintrc index 645dac16d..b21ede35a 100644 --- a/js/.eslintrc +++ b/js/.eslintrc @@ -153,7 +153,6 @@ "space-return-throw-case": 2, "space-unary-ops": 2, "spaced-comment": 2, - "spaced-comment": 2, // es6 "arrow-parens": 2, diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html index 5ade9dd18..47e400d4b 100644 --- a/js/tests/visual/dropdown.html +++ b/js/tests/visual/dropdown.html @@ -82,25 +82,25 @@ <a id="drop4" class="nav-link" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false"> Dropdown </a> - <ul id="menu1" class="dropdown-menu" aria-labelledby="drop4"> + <div id="menu1" class="dropdown-menu" aria-labelledby="drop4"> <a class="dropdown-item" href="https://twitter.com/fat">Action</a> <a class="dropdown-item" href="https://twitter.com/fat">Another action</a> <a class="dropdown-item" href="https://twitter.com/fat">Something else here</a> <div class="dropdown-divider"></div> <a class="dropdown-item" href="https://twitter.com/fat">Separated link</a> - </ul> + </div> </li> <li class="dropdown nav-item"> <a id="drop5" class="nav-link" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false"> Dropdown 2 </a> - <ul id="menu2" class="dropdown-menu" aria-labelledby="drop5"> + <div id="menu2" class="dropdown-menu" aria-labelledby="drop5"> <a class="dropdown-item" href="https://twitter.com/fat">Action</a> <a class="dropdown-item" href="https://twitter.com/fat">Another action</a> <a class="dropdown-item" href="https://twitter.com/fat">Something else here</a> <div class="dropdown-divider"></div> <a class="dropdown-item" href="https://twitter.com/fat">Separated link</a> - </ul> + </div> </li> </ul> |