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
239e6a7d
Commit
239e6a7d
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fixes #5082 manually: reset font-size for .dropdown-menu within .input-prepend/-append
parent
cedb3c7c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docs/assets/css/bootstrap.css
+11
-1
docs/assets/css/bootstrap.css
less/forms.less
+9
-2
less/forms.less
with
20 additions
and
3 deletions
+20
-3
docs/assets/css/bootstrap.css
+
11
-
1
View file @
239e6a7d
...
@@ -1545,6 +1545,17 @@ select:focus:required:invalid:focus {
...
@@ -1545,6 +1545,17 @@ select:focus:required:invalid:focus {
white-space
:
nowrap
;
white-space
:
nowrap
;
}
}
.input-append
input
,
.input-prepend
input
,
.input-append
select
,
.input-prepend
select
,
.input-append
.uneditable-input
,
.input-prepend
.uneditable-input
,
.input-append
.dropdown-menu
,
.input-prepend
.dropdown-menu
{
font-size
:
14px
;
}
.input-append
input
,
.input-append
input
,
.input-prepend
input
,
.input-prepend
input
,
.input-append
select
,
.input-append
select
,
...
@@ -1554,7 +1565,6 @@ select:focus:required:invalid:focus {
...
@@ -1554,7 +1565,6 @@ select:focus:required:invalid:focus {
position
:
relative
;
position
:
relative
;
margin-bottom
:
0
;
margin-bottom
:
0
;
*
margin-left
:
0
;
*
margin-left
:
0
;
font-size
:
14px
;
vertical-align
:
top
;
vertical-align
:
top
;
-webkit-border-radius
:
0
3px
3px
0
;
-webkit-border-radius
:
0
3px
3px
0
;
-moz-border-radius
:
0
3px
3px
0
;
-moz-border-radius
:
0
3px
3px
0
;
...
...
This diff is collapsed.
Click to expand it.
less/forms.less
+
9
-
2
View file @
239e6a7d
...
@@ -418,16 +418,23 @@ select:focus:required:invalid {
...
@@ -418,16 +418,23 @@ select:focus:required:invalid {
.input-append,
.input-append,
.input-prepend {
.input-prepend {
margin-bottom: 5px;
margin-bottom: 5px;
font-size: 0;
font-size: 0;
// white space collapse hack
white-space: nowrap; // Prevent span and input from separating
white-space: nowrap; // Prevent span and input from separating
// Reset the white space collapse hack
input,
select,
.uneditable-input,
.dropdown-menu {
font-size: @baseFontSize;
}
input,
input,
select,
select,
.uneditable-input {
.uneditable-input {
position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
*margin-left: 0;
*margin-left: 0;
font-size: @baseFontSize;
vertical-align: top;
vertical-align: top;
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
// Make input on top when focused so blue border and shadow always show
// Make input on top when focused so blue border and shadow always show
...
...
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