Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
73a88dbe
Commit
73a88dbe
authored
9 years ago
by
Heinrich Fenkart
Browse files
Options
Download
Email Patches
Plain Diff
Docs: Update all dropdowns to new HTML structure
parent
70e4c720
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
docs/_includes/nav-docs.html
+1
-1
docs/_includes/nav-docs.html
docs/components/button-group.md
+20
-20
docs/components/button-group.md
docs/components/input-group.md
+28
-28
docs/components/input-group.md
docs/components/scrollspy.md
+6
-6
docs/components/scrollspy.md
docs/examples/sticky-footer-navbar/index.html
+9
-9
docs/examples/sticky-footer-navbar/index.html
js/tests/visual/dropdown.html
+4
-4
js/tests/visual/dropdown.html
with
68 additions
and
68 deletions
+68
-68
docs/_includes/nav-docs.html
+
1
-
1
View file @
73a88dbe
...
...
@@ -2,7 +2,7 @@
<form
class=
"bd-search hidden-sm-down"
>
<input
type=
"text"
class=
"form-control"
id=
"search-input"
placeholder=
"Search..."
>
<
ul
class=
"dropdown-menu bd-search-results"
id=
"search-results"
></
ul
>
<
div
class=
"dropdown-menu bd-search-results"
id=
"search-results"
></
div
>
</form>
<nav
class=
"bd-links"
id=
"docsNavbarContent"
>
...
...
This diff is collapsed.
Click to expand it.
docs/components/button-group.md
+
20
-
20
View file @
73a88dbe
...
...
@@ -96,10 +96,10 @@ Place a `.btn-group` within another `.btn-group` when you want dropdown menus mi
<button
id=
"btnGroupDrop1"
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
Dropdown
</button>
<
ul
class=
"dropdown-menu"
aria-labelledby=
"btnGroupDrop1"
>
<
li><a
href=
"#"
>
Dropdown link
</a>
</li>
<
li><a
href=
"#"
>
Dropdown link
</a>
</li>
</
ul
>
<
div
class=
"dropdown-menu"
aria-labelledby=
"btnGroupDrop1"
>
<
a
class=
"dropdown-item"
href=
"#"
>
Dropdown link
</a>
<
a
class=
"dropdown-item"
href=
"#"
>
Dropdown link
</a>
</
div
>
</div>
</div>
{% endexample %}
...
...
@@ -116,10 +116,10 @@ Make a set of buttons appear vertically stacked rather than horizontally. **Spli
<button
id=
"btnGroupVerticalDrop1"
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
Dropdown
</button>
<
ul
class=
"dropdown-menu"
aria-labelledby=
"btnGroupVerticalDrop1"
>
<
li><a
href=
"#"
>
Dropdown link
</a>
</li>
<
li><a
href=
"#"
>
Dropdown link
</a>
</li>
</
ul
>
<
div
class=
"dropdown-menu"
aria-labelledby=
"btnGroupVerticalDrop1"
>
<
a
class=
"dropdown-item"
href=
"#"
>
Dropdown link
</a>
<
a
class=
"dropdown-item"
href=
"#"
>
Dropdown link
</a>
</
div
>
</div>
<button
type=
"button"
class=
"btn btn-secondary"
>
Button
</button>
<button
type=
"button"
class=
"btn btn-secondary"
>
Button
</button>
...
...
@@ -127,28 +127,28 @@ Make a set of buttons appear vertically stacked rather than horizontally. **Spli
<button
id=
"btnGroupVerticalDrop2"
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
Dropdown
</button>
<
ul
class=
"dropdown-menu"
aria-labelledby=
"btnGroupVerticalDrop2"
>
<
li><a
href=
"#"
>
Dropdown link
</a>
</li>
<
li><a
href=
"#"
>
Dropdown link
</a>
</li>
</
ul
>
<
div
class=
"dropdown-menu"
aria-labelledby=
"btnGroupVerticalDrop2"
>
<
a
class=
"dropdown-item"
href=
"#"
>
Dropdown link
</a>
<
a
class=
"dropdown-item"
href=
"#"
>
Dropdown link
</a>
</
div
>
</div>
<div
class=
"btn-group"
role=
"group"
>
<button
id=
"btnGroupVerticalDrop3"
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
Dropdown
</button>
<
ul
class=
"dropdown-menu"
aria-labelledby=
"btnGroupVerticalDrop3"
>
<
li><a
href=
"#"
>
Dropdown link
</a>
</li>
<
li><a
href=
"#"
>
Dropdown link
</a>
</li>
</
ul
>
<
div
class=
"dropdown-menu"
aria-labelledby=
"btnGroupVerticalDrop3"
>
<
a
class=
"dropdown-item"
href=
"#"
>
Dropdown link
</a>
<
a
class=
"dropdown-item"
href=
"#"
>
Dropdown link
</a>
</
div
>
</div>
<div
class=
"btn-group"
role=
"group"
>
<button
id=
"btnGroupVerticalDrop4"
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
Dropdown
</button>
<
ul
class=
"dropdown-menu"
aria-labelledby=
"btnGroupVerticalDrop4"
>
<
li><a
href=
"#"
>
Dropdown link
</a>
</li>
<
li><a
href=
"#"
>
Dropdown link
</a>
</li>
</
ul
>
<
div
class=
"dropdown-menu"
aria-labelledby=
"btnGroupVerticalDrop4"
>
<
a
class=
"dropdown-item"
href=
"#"
>
Dropdown link
</a>
<
a
class=
"dropdown-item"
href=
"#"
>
Dropdown link
</a>
</
div
>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
docs/components/input-group.md
+
28
-
28
View file @
73a88dbe
...
...
@@ -120,13 +120,13 @@ Buttons in input groups are a bit different and require one extra level of nesti
<button
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
Action
</button>
<
ul
class=
"dropdown-menu"
>
<
li><a
href=
"#"
>
Action
</a>
</li>
<
li><a
href=
"#"
>
Another action
</a>
</li>
<
li><a
href=
"#"
>
Something else here
</a>
</li>
<
li
role=
"separator"
class=
"divider"
></
li
>
<
li><a
href=
"#"
>
Separated link
</a>
</li>
</
ul
>
<
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
role=
"separator"
class=
"
dropdown-
divider"
></
div
>
<
a
class=
"dropdown-item"
href=
"#"
>
Separated link
</a>
</
div
>
</div>
<input
type=
"text"
class=
"form-control"
aria-label=
"Text input with dropdown button"
>
</div>
...
...
@@ -138,13 +138,13 @@ Buttons in input groups are a bit different and require one extra level of nesti
<button
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
Action
</button>
<
ul
class=
"dropdown-menu dropdown-menu-right"
>
<
li><a
href=
"#"
>
Action
</a>
</li>
<
li><a
href=
"#"
>
Another action
</a>
</li>
<
li><a
href=
"#"
>
Something else here
</a>
</li>
<
li
role=
"separator"
class=
"divider"
></
li
>
<
li><a
href=
"#"
>
Separated link
</a>
</li>
</
ul
>
<
div
class=
"dropdown-menu dropdown-menu-right"
>
<
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
role=
"separator"
class=
"
dropdown-
divider"
></
div
>
<
a
class=
"dropdown-item"
href=
"#"
>
Separated link
</a>
</
div
>
</div>
</div>
</div>
...
...
@@ -162,13 +162,13 @@ Buttons in input groups are a bit different and require one extra level of nesti
<button
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
<span
class=
"sr-only"
>
Toggle Dropdown
</span>
</button>
<
ul
class=
"dropdown-menu"
>
<
li><a
href=
"#"
>
Action
</a>
</li>
<
li><a
href=
"#"
>
Another action
</a>
</li>
<
li><a
href=
"#"
>
Something else here
</a>
</li>
<
li
role=
"separator"
class=
"divider"
></
li
>
<
li><a
href=
"#"
>
Separated link
</a>
</li>
</
ul
>
<
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
role=
"separator"
class=
"
dropdown-
divider"
></
div
>
<
a
class=
"dropdown-item"
href=
"#"
>
Separated link
</a>
</
div
>
</div>
<input
type=
"text"
class=
"form-control"
aria-label=
"Text input with segmented button dropdown"
>
</div>
...
...
@@ -181,13 +181,13 @@ Buttons in input groups are a bit different and require one extra level of nesti
<button
type=
"button"
class=
"btn btn-secondary dropdown-toggle"
data-toggle=
"dropdown"
aria-haspopup=
"true"
aria-expanded=
"false"
>
<span
class=
"sr-only"
>
Toggle Dropdown
</span>
</button>
<
ul
class=
"dropdown-menu dropdown-menu-right"
>
<
li><a
href=
"#"
>
Action
</a>
</li>
<
li><a
href=
"#"
>
Another action
</a>
</li>
<
li><a
href=
"#"
>
Something else here
</a>
</li>
<
li
role=
"separator"
class=
"divider"
></
li
>
<
li><a
href=
"#"
>
Separated link
</a>
</li>
</
ul
>
<
div
class=
"dropdown-menu dropdown-menu-right"
>
<
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
role=
"separator"
class=
"
dropdown-
divider"
></
div
>
<
a
class=
"dropdown-item"
href=
"#"
>
Separated link
</a>
</
div
>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
docs/components/scrollspy.md
+
6
-
6
View file @
73a88dbe
...
...
@@ -21,12 +21,12 @@ The ScrollSpy plugin is for automatically updating nav targets based on scroll p
<li
class=
"nav-item"
><a
class=
"nav-link"
href=
"#mdo"
>
@mdo
</a></li>
<li
class=
"nav-item dropdown"
>
<a
class=
"nav-link dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
role=
"button"
aria-haspopup=
"true"
aria-expanded=
"false"
>
Dropdown
</a>
<
ul
class=
"dropdown-menu"
>
<li>
<a
class=
"dropdown-item"
href=
"#one"
>
one
</a>
</li>
<li>
<a
class=
"dropdown-item"
href=
"#two"
>
two
</a>
</li>
<
li
role=
"separator"
class=
"dropdown-divider"
></
li
>
<li>
<a
class=
"dropdown-item"
href=
"#three"
>
three
</a>
</li>
</
ul
>
<
div
class=
"dropdown-menu"
>
<a
class=
"dropdown-item"
href=
"#one"
>
one
</a>
<a
class=
"dropdown-item"
href=
"#two"
>
two
</a>
<
div
role=
"separator"
class=
"dropdown-divider"
></
div
>
<a
class=
"dropdown-item"
href=
"#three"
>
three
</a>
</
div
>
</li>
</ul>
</nav>
...
...
This diff is collapsed.
Click to expand it.
docs/examples/sticky-footer-navbar/index.html
+
9
-
9
View file @
73a88dbe
...
...
@@ -42,15 +42,15 @@
<li><a
href=
"#contact"
>
Contact
</a></li>
<li
class=
"dropdown"
>
<a
href=
"#"
class=
"dropdown-toggle"
data-toggle=
"dropdown"
role=
"button"
aria-expanded=
"false"
>
Dropdown
</a>
<
ul
class=
"dropdown-menu"
>
<
li><a
href=
"#"
>
Action
</a>
</li>
<
li><a
href=
"#"
>
Another action
</a>
</li>
<
li><a
href=
"#"
>
Something else here
</a>
</li>
<
li
role=
"separator"
class=
"divider"
></
li
>
<
li
class=
"dropdown-header"
>
Nav header
</
li
>
<
li><a
href=
"#"
>
Separated link
</a>
</li>
<
li><a
href=
"#"
>
One more separated link
</a>
</li>
</
ul
>
<
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
role=
"separator"
class=
"
dropdown-
divider"
></
div
>
<
h6
class=
"dropdown-header"
>
Nav header
</
h6
>
<
a
class=
"dropdown-item"
href=
"#"
>
Separated link
</a>
<
a
class=
"dropdown-item"
href=
"#"
>
One more separated link
</a>
</
div
>
</li>
</ul>
</div>
<!--/.nav-collapse -->
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/dropdown.html
+
4
-
4
View file @
73a88dbe
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets