Skip to content
GitLab
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
6307dc40
Commit
6307dc40
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Fixes
#7898
: ensure button type
Sets `type="button"` on all buttons in the docs
parent
31dcb911
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/css/docs.css
+3
-0
docs/assets/css/docs.css
docs/components.html
+24
-24
docs/components.html
docs/css.html
+10
-10
docs/css.html
with
37 additions
and
34 deletions
+37
-34
docs/assets/css/docs.css
+
3
-
0
View file @
6307dc40
...
...
@@ -269,6 +269,9 @@ body {
.bs-example
>
.well
:last-child
{
margin-bottom
:
0
;
}
.bs-example
>
.close
{
float
:
none
;
}
/* Typography */
.bs-example-type
.table
td
{
...
...
This diff is collapsed.
Click to expand it.
docs/components.html
+
24
-
24
View file @
6307dc40
...
...
@@ -602,7 +602,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
<div
class=
"bs-example"
>
<div
class=
"btn-toolbar"
style=
"margin-bottom: 10px;"
>
<div
class=
"btn-group"
>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -612,7 +612,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<button
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -622,7 +622,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<button
class=
"btn btn-danger dropdown-toggle"
data-toggle=
"dropdown"
>
Danger
<span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-danger dropdown-toggle"
data-toggle=
"dropdown"
>
Danger
<span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -632,7 +632,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<button
class=
"btn btn-warning dropdown-toggle"
data-toggle=
"dropdown"
>
Warning
<span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-warning dropdown-toggle"
data-toggle=
"dropdown"
>
Warning
<span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -642,7 +642,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<button
class=
"btn btn-success dropdown-toggle"
data-toggle=
"dropdown"
>
Success
<span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-success dropdown-toggle"
data-toggle=
"dropdown"
>
Success
<span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -656,7 +656,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
{% highlight html %}
<!-- Single button -->
<div
class=
"btn-group"
>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span>
</button>
<ul
class=
"dropdown-menu"
>
...
...
@@ -674,8 +674,8 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
<div
class=
"bs-example"
>
<div
class=
"btn-toolbar"
style=
"margin: 0;"
>
<div
class=
"btn-group"
>
<button
class=
"btn btn-default"
>
Action
</button>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-default"
>
Action
</button>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -685,8 +685,8 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<button
class=
"btn btn-primary"
>
Action
</button>
<button
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-primary"
>
Action
</button>
<button
type=
"button"
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -696,8 +696,8 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<button
class=
"btn btn-danger"
>
Danger
</button>
<button
class=
"btn btn-danger dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-danger"
>
Danger
</button>
<button
type=
"button"
class=
"btn btn-danger dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -707,8 +707,8 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<button
class=
"btn btn-warning"
>
Warning
</button>
<button
class=
"btn btn-warning dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-warning"
>
Warning
</button>
<button
type=
"button"
class=
"btn btn-warning dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -718,8 +718,8 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group"
>
<button
class=
"btn btn-success"
>
Success
</button>
<button
class=
"btn btn-success dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-success"
>
Success
</button>
<button
type=
"button"
class=
"btn btn-success dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -733,8 +733,8 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
{% highlight html %}
<!-- Split button -->
<div
class=
"btn-group"
>
<button
class=
"btn btn-default"
>
Action
</button>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
<button
type=
"button"
class=
"btn btn-default"
>
Action
</button>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
<span
class=
"caret"
></span>
</button>
<ul
class=
"dropdown-menu"
>
...
...
@@ -805,8 +805,8 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
<div
class=
"bs-example"
>
<div
class=
"btn-toolbar"
>
<div
class=
"btn-group dropup"
>
<button
class=
"btn btn-default"
>
Dropup
</button>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-default"
>
Dropup
</button>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -816,8 +816,8 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</ul>
</div>
<!-- /btn-group -->
<div
class=
"btn-group dropup"
>
<button
class=
"btn btn-primary"
>
Right dropup
</button>
<button
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-primary"
>
Right dropup
</button>
<button
type=
"button"
class=
"btn btn-primary dropdown-toggle"
data-toggle=
"dropdown"
><span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu pull-right"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -830,8 +830,8 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</div>
<!-- /example -->
{% highlight html %}
<div
class=
"btn-group dropup"
>
<button
class=
"btn btn-default"
>
Dropup
</button>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
<button
type=
"button"
class=
"btn btn-default"
>
Dropup
</button>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
<span
class=
"caret"
></span>
</button>
<ul
class=
"dropdown-menu"
>
...
...
This diff is collapsed.
Click to expand it.
docs/css.html
+
10
-
10
View file @
6307dc40
...
...
@@ -1506,7 +1506,7 @@ For example, <code><section></code> should be wrapped as inline.
<form
class=
"bs-example"
>
<div
class=
"input-group col col-lg-7"
>
<div
class=
"input-group-btn"
>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -1521,7 +1521,7 @@ For example, <code><section></code> should be wrapped as inline.
<div
class=
"input-group col col-lg-7"
>
<input
type=
"text"
>
<div
class=
"input-group-btn"
>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -1535,7 +1535,7 @@ For example, <code><section></code> should be wrapped as inline.
{% highlight html %}
<div
class=
"input-group col col-lg-7"
>
<div
class=
"input-group-btn"
>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -1550,7 +1550,7 @@ For example, <code><section></code> should be wrapped as inline.
<div
class=
"input-group col col-lg-7"
>
<input
type=
"text"
>
<div
class=
"input-group-btn"
>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
>
Action
<span
class=
"caret"
></span></button>
<ul
class=
"dropdown-menu"
>
<li><a
href=
"#"
>
Action
</a></li>
<li><a
href=
"#"
>
Another action
</a></li>
...
...
@@ -1566,8 +1566,8 @@ For example, <code><section></code> should be wrapped as inline.
<form
class=
"bs-example"
>
<div
class=
"input-group col col-lg-7"
>
<div
class=
"input-group-btn"
>
<button
class=
"btn btn-default"
tabindex=
"-1"
>
Action
</button>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
tabindex=
"-1"
>
<button
type=
"button"
class=
"btn btn-default"
tabindex=
"-1"
>
Action
</button>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
tabindex=
"-1"
>
<span
class=
"caret"
></span>
</button>
<ul
class=
"dropdown-menu"
>
...
...
@@ -1586,8 +1586,8 @@ For example, <code><section></code> should be wrapped as inline.
<div
class=
"input-group col col-lg-7"
>
<input
type=
"text"
>
<div
class=
"input-group-btn"
>
<button
class=
"btn btn-default"
tabindex=
"-1"
>
Action
</button>
<button
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
tabindex=
"-1"
>
<button
type=
"button"
class=
"btn btn-default"
tabindex=
"-1"
>
Action
</button>
<button
type=
"button"
class=
"btn btn-default dropdown-toggle"
data-toggle=
"dropdown"
tabindex=
"-1"
>
<span
class=
"caret"
></span>
</button>
<ul
class=
"dropdown-menu"
>
...
...
@@ -1875,10 +1875,10 @@ For example, <code><section></code> should be wrapped as inline.
<h3>
Close icon
</h3>
<p>
Use the generic close icon for dismissing content like modals and alerts.
</p>
<div
class=
"bs-example"
>
<p><button
class=
"close"
style=
"float: none;
"
>
×
</button></p>
<p><button
type=
"button"
class=
"close
"
>
×
</button></p>
</div>
{% highlight html %}
<button
class=
"close"
style=
"float: none;
"
>
×
</button>
<button
type=
"button"
class=
"close
"
>
×
</button>
{% endhighlight %}
<h3>
.pull-left
</h3>
...
...
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