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
685039d6
Commit
685039d6
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
add a super jank fix for horizontal-forms and .input-prepend/append in IE7
parent
c35b04cc
1 merge request
!1952
Tabulation navigation with Typeahead
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
+6
-0
docs/assets/css/bootstrap.css
less/forms.less
+5
-0
less/forms.less
with
11 additions
and
0 deletions
+11
-0
docs/assets/bootstrap.zip
+
0
-
0
View file @
685039d6
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
6
-
0
View file @
685039d6
...
...
@@ -990,6 +990,7 @@ select:focus:required:invalid:focus {
.input-append
select
,
.input-prepend
.uneditable-input
,
.input-append
.uneditable-input
{
*
margin-left
:
0
;
-webkit-border-radius
:
0
3px
3px
0
;
-moz-border-radius
:
0
3px
3px
0
;
border-radius
:
0
3px
3px
0
;
...
...
@@ -1167,6 +1168,11 @@ legend + .control-group {
}
.form-horizontal
.controls
{
margin-left
:
160px
;
/* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */
*
display
:
inline-block
;
*
margin-left
:
0
;
*
padding-left
:
20px
;
}
.form-horizontal
.help-block
{
margin-top
:
9px
;
...
...
This diff is collapsed.
Click to expand it.
less/forms.less
+
5
-
0
View file @
685039d6
...
...
@@ -365,6 +365,7 @@ select:focus:required:invalid {
input,
select,
.uneditable-input {
*margin-left: 0;
.border-radius(0 3px 3px 0);
&:focus {
position: relative;
...
...
@@ -537,6 +538,10 @@ legend + .control-group {
// Move over all input controls and content
.controls {
margin-left: 160px;
/* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */
*display: inline-block;
*margin-left: 0;
*padding-left: 20px;
}
// Remove bottom margin on block level help text since that's accounted for on .control-group
.help-block {
...
...
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