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
c92a7599
Commit
c92a7599
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
fixes
#5127
: add @inputHeight to replace static instances of '30px' throughout forms
parent
532ee082
5 merge requests
!5565
Boostraptest
,
!5450
Fixed copy and paste caused typo in CAROUSEL DATA-API
,
!5326
Replace watchr with node-supervisor
,
!5277
Please delete
,
!5042
Pagination Javascript Component
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/css/bootstrap.css
+3
-3
docs/assets/css/bootstrap.css
less/forms.less
+5
-5
less/forms.less
less/mixins.less
+1
-1
less/mixins.less
less/variables.less
+1
-0
less/variables.less
with
10 additions
and
9 deletions
+10
-9
docs/assets/css/bootstrap.css
+
3
-
3
View file @
c92a7599
...
@@ -1148,14 +1148,14 @@ textarea::-webkit-input-placeholder {
...
@@ -1148,14 +1148,14 @@ textarea::-webkit-input-placeholder {
.radio
,
.radio
,
.checkbox
{
.checkbox
{
min-height
:
18
px
;
min-height
:
20
px
;
padding-left
:
18
px
;
padding-left
:
20
px
;
}
}
.radio
input
[
type
=
"radio"
],
.radio
input
[
type
=
"radio"
],
.checkbox
input
[
type
=
"checkbox"
]
{
.checkbox
input
[
type
=
"checkbox"
]
{
float
:
left
;
float
:
left
;
margin-left
:
-
18
px
;
margin-left
:
-
20
px
;
}
}
.controls
>
.radio
:first-child
,
.controls
>
.radio
:first-child
,
...
...
This diff is collapsed.
Click to expand it.
less/forms.less
+
5
-
5
View file @
c92a7599
...
@@ -154,9 +154,9 @@ input[type="checkbox"] {
...
@@ -154,9 +154,9 @@ input[type="checkbox"] {
// Set the height of select and file controls to match text inputs
// Set the height of select and file controls to match text inputs
select,
select,
input[type="file"] {
input[type="file"] {
height:
30px
; /* In IE7, the height of the select element cannot be changed by height, only font-size */
height:
@inputHeight
; /* In IE7, the height of the select element cannot be changed by height, only font-size */
*margin-top: 4px; /* For IE7, add top margin to align select with labels */
*margin-top: 4px; /* For IE7, add top margin to align select with labels */
line-height:
30px
;
line-height:
@inputHeight
;
}
}
// Make select elements obey height by applying a border
// Make select elements obey height by applying a border
...
@@ -223,13 +223,13 @@ textarea {
...
@@ -223,13 +223,13 @@ textarea {
// Indent the labels to position radios/checkboxes as hanging
// Indent the labels to position radios/checkboxes as hanging
.radio,
.radio,
.checkbox {
.checkbox {
min-height:
18px
; // clear the floating input if there is no label text
min-height:
@baseLineHeight
; // clear the floating input if there is no label text
padding-left:
18
px;
padding-left:
20
px;
}
}
.radio input[type="radio"],
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
.checkbox input[type="checkbox"] {
float: left;
float: left;
margin-left: -
18
px;
margin-left: -
20
px;
}
}
// Move the options list down to align with labels
// Move the options list down to align with labels
...
...
This diff is collapsed.
Click to expand it.
less/mixins.less
+
1
-
1
View file @
c92a7599
...
@@ -154,7 +154,7 @@
...
@@ -154,7 +154,7 @@
.input-block-level {
.input-block-level {
display: block;
display: block;
width: 100%;
width: 100%;
min-height:
30px;
// Make inputs at least the height of their button counterpart
min-height:
@inputHeight;
// Make inputs at least the height of their button counterpart
(base line-height + padding + border)
.box-sizing(border-box); // Makes inputs behave like true block-level elements
.box-sizing(border-box); // Makes inputs behave like true block-level elements
}
}
...
...
This diff is collapsed.
Click to expand it.
less/variables.less
+
1
-
0
View file @
c92a7599
...
@@ -114,6 +114,7 @@
...
@@ -114,6 +114,7 @@
@inputBorderRadius: @baseBorderRadius;
@inputBorderRadius: @baseBorderRadius;
@inputDisabledBackground: @grayLighter;
@inputDisabledBackground: @grayLighter;
@formActionsBackground: #f5f5f5;
@formActionsBackground: #f5f5f5;
@inputHeight: @baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
// Dropdowns
// Dropdowns
...
...
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