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
609142ee
Commit
609142ee
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fixes
#4729
: only use margin-top on .help-block when it follows an input, select, textarea
parent
7d412b1e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+6
-1
docs/assets/css/bootstrap.css
less/forms.less
+8
-1
less/forms.less
with
14 additions
and
2 deletions
+14
-2
docs/assets/css/bootstrap.css
+
6
-
1
View file @
609142ee
...
@@ -1792,10 +1792,15 @@ legend + .control-group {
...
@@ -1792,10 +1792,15 @@ legend + .control-group {
}
}
.form-horizontal
.help-block
{
.form-horizontal
.help-block
{
margin-top
:
10px
;
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
.form-horizontal
input
+
.help-block
,
.form-horizontal
select
+
.help-block
,
.form-horizontal
textarea
+
.help-block
{
margin-top
:
10px
;
}
.form-horizontal
.form-actions
{
.form-horizontal
.form-actions
{
padding-left
:
160px
;
padding-left
:
160px
;
}
}
...
...
This diff is collapsed.
Click to expand it.
less/forms.less
+
8
-
1
View file @
609142ee
...
@@ -633,9 +633,16 @@ legend + .control-group {
...
@@ -633,9 +633,16 @@ legend + .control-group {
}
}
// Remove bottom margin on block level help text since that's accounted for on .control-group
// Remove bottom margin on block level help text since that's accounted for on .control-group
.help-block {
.help-block {
margin-top: @baseLineHeight / 2;
margin-bottom: 0;
margin-bottom: 0;
}
}
// And apply it only to .help-block instances that follow a form control
input,
select,
textarea {
+ .help-block {
margin-top: @baseLineHeight / 2;
}
}
// Move over buttons in .form-actions to align with .controls
// Move over buttons in .form-actions to align with .controls
.form-actions {
.form-actions {
padding-left: 160px;
padding-left: 160px;
...
...
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