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
cad8f2b4
Commit
cad8f2b4
authored
12 years ago
by
Jacob Thornton
Browse files
Options
Download
Plain Diff
Merge branch '2.0.3-wip' of
https://github.com/twitter/bootstrap
into 2.0.3-wip
Conflicts: docs/assets/bootstrap.zip
parents
e9856817
6c221d65
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/css/bootstrap.css
+1
-0
docs/assets/css/bootstrap.css
docs/javascript.html
+1
-1
docs/javascript.html
docs/templates/pages/javascript.mustache
+1
-1
docs/templates/pages/javascript.mustache
less/forms.less
+1
-0
less/forms.less
with
4 additions
and
2 deletions
+4
-2
docs/assets/css/bootstrap.css
+
1
-
0
View file @
cad8f2b4
...
@@ -729,6 +729,7 @@ input[type="hidden"] {
...
@@ -729,6 +729,7 @@ input[type="hidden"] {
}
}
.radio
,
.radio
,
.checkbox
{
.checkbox
{
overflow
:
auto
;
padding-left
:
18px
;
padding-left
:
18px
;
}
}
.radio
input
[
type
=
"radio"
],
.radio
input
[
type
=
"radio"
],
...
...
This diff is collapsed.
Click to expand it.
docs/javascript.html
+
1
-
1
View file @
cad8f2b4
...
@@ -767,7 +767,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
...
@@ -767,7 +767,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h2>
Example use of Tooltips
</h2>
<h2>
Example use of Tooltips
</h2>
<p>
Hover over the links below to see tooltips:
</p>
<p>
Hover over the links below to see tooltips:
</p>
<div
class=
"tooltip-demo well"
>
<div
class=
"tooltip-demo well"
>
<p
class=
"muted"
style=
"margin-bottom: 0;"
>
Tight pants next level keffiyeh
<a
href=
"#"
rel=
"tooltip"
title=
"first tooltip"
>
you probably
</a>
haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel
<a
href=
"#"
rel=
"tooltip"
title=
"Another tooltip"
>
have a
</a>
terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A
<a
href=
"#"
rel=
"tooltip"
title=
"Another one here too"
>
really ironic
</a>
artisan
whatever keytar, scenester farm-to-table banksy Austin
<a
href=
"#"
rel=
"tooltip"
title=
"The last tip!"
>
twitter handle
</a>
freegan cred raw denim single-origin coffee viral.
<p
class=
"muted"
style=
"margin-bottom: 0;"
>
Tight pants next level keffiyeh
<a
href=
"#"
rel=
"tooltip"
title=
"first tooltip"
>
you probably
</a>
haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel
<a
href=
"#"
rel=
"tooltip"
title=
"Another tooltip"
>
have a
</a>
terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A
really ironic artisan
<a
href=
"#"
rel=
"tooltip"
title=
"Another one here too"
>
whatever keytar
</a>
, scenester farm-to-table banksy Austin
<a
href=
"#"
rel=
"tooltip"
title=
"The last tip!"
>
twitter handle
</a>
freegan cred raw denim single-origin coffee viral.
</p>
</p>
</div>
</div>
<hr>
<hr>
...
...
This diff is collapsed.
Click to expand it.
docs/templates/pages/javascript.mustache
+
1
-
1
View file @
cad8f2b4
...
@@ -690,7 +690,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
...
@@ -690,7 +690,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h2>
{{
_i
}}
Example use of Tooltips
{{/
i
}}
</h2>
<h2>
{{
_i
}}
Example use of Tooltips
{{/
i
}}
</h2>
<p>
{{
_i
}}
Hover over the links below to see tooltips:
{{/
i
}}
</p>
<p>
{{
_i
}}
Hover over the links below to see tooltips:
{{/
i
}}
</p>
<div
class=
"tooltip-demo well"
>
<div
class=
"tooltip-demo well"
>
<p
class=
"muted"
style=
"margin-bottom: 0;"
>
{{
_i
}}
Tight pants next level keffiyeh
<a
href=
"#"
rel=
"tooltip"
title=
"first tooltip"
>
you probably
</a>
haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel
<a
href=
"#"
rel=
"tooltip"
title=
"Another tooltip"
>
have a
</a>
terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A
<a
href=
"#"
rel=
"tooltip"
title=
"Another one here too"
>
really ironic
</a>
artisan
whatever keytar, scenester farm-to-table banksy Austin
<a
href=
"#"
rel=
"tooltip"
title=
"The last tip!"
>
twitter handle
</a>
freegan cred raw denim single-origin coffee viral.
{{/
i
}}
<p
class=
"muted"
style=
"margin-bottom: 0;"
>
{{
_i
}}
Tight pants next level keffiyeh
<a
href=
"#"
rel=
"tooltip"
title=
"first tooltip"
>
you probably
</a>
haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel
<a
href=
"#"
rel=
"tooltip"
title=
"Another tooltip"
>
have a
</a>
terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A
really ironic artisan
<a
href=
"#"
rel=
"tooltip"
title=
"Another one here too"
>
whatever keytar
</a>
, scenester farm-to-table banksy Austin
<a
href=
"#"
rel=
"tooltip"
title=
"The last tip!"
>
twitter handle
</a>
freegan cred raw denim single-origin coffee viral.
{{/
i
}}
</p>
</p>
</div>
</div>
<hr>
<hr>
...
...
This diff is collapsed.
Click to expand it.
less/forms.less
+
1
-
0
View file @
cad8f2b4
...
@@ -172,6 +172,7 @@ input[type="hidden"] {
...
@@ -172,6 +172,7 @@ input[type="hidden"] {
// Indent the labels to position radios/checkboxes as hanging
// Indent the labels to position radios/checkboxes as hanging
.radio,
.radio,
.checkbox {
.checkbox {
overflow: auto; // clear the floating input if there is no label text
padding-left: 18px;
padding-left: 18px;
}
}
.radio input[type="radio"],
.radio input[type="radio"],
...
...
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