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
b04a1de9
Commit
b04a1de9
authored
11 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Fixes #11402: Updated fix for select.form-control width in inline-forms
parent
24eee65c
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dist/css/bootstrap.css
+6
-0
dist/css/bootstrap.css
dist/css/bootstrap.min.css
+1
-1
dist/css/bootstrap.min.css
less/forms.less
+5
-0
less/forms.less
with
12 additions
and
1 deletion
+12
-1
dist/css/bootstrap.css
+
6
-
0
View file @
b04a1de9
...
...
@@ -1871,6 +1871,9 @@ textarea.input-lg {
.form-inline
select
.form-control
{
width
:
auto
;
}
.form-inline
>
select
.form-control
{
width
:
auto
;
}
.form-inline
.radio
,
.form-inline
.checkbox
{
display
:
inline-block
;
...
...
@@ -3786,6 +3789,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-form
select
.form-control
{
width
:
auto
;
}
.navbar-form
>
select
.form-control
{
width
:
auto
;
}
.navbar-form
.radio
,
.navbar-form
.checkbox
{
display
:
inline-block
;
...
...
This diff is collapsed.
Click to expand it.
dist/css/bootstrap.min.css
+
1
-
1
View file @
b04a1de9
This diff is collapsed.
Click to expand it.
less/forms.less
+
5
-
0
View file @
b04a1de9
...
...
@@ -311,6 +311,11 @@ input[type="checkbox"],
width: auto;
}
// Override `width: 100%;` when not within a `.form-group`
> select.form-control {
width: auto;
}
// Remove default margin on radios/checkboxes that were used for stacking, and
// then undo the floating of radios and checkboxes to match (which also avoids
// a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
...
...
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