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
9f732e90
Commit
9f732e90
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
make horizontal form labels map to default grid sizing
parent
fe160261
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
bootstrap.css
+4
-7
bootstrap.css
bootstrap.min.css
+3
-4
bootstrap.min.css
lib/forms.less
+3
-7
lib/forms.less
with
10 additions
and
18 deletions
+10
-18
bootstrap.css
+
4
-
7
View file @
9f732e90
...
...
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sun Jan 15 11:
29:00
PST 2012
* Date: Sun Jan 15 11:
32:55
PST 2012
*/
html
,
body
{
margin
:
0
;
...
...
@@ -963,20 +963,17 @@ input::-webkit-input-placeholder {
.control-group
{
margin-bottom
:
18px
;
}
.control-group
>
label
{
font-weight
:
bold
;
}
.form-horizontal
.control-group
>
label
{
float
:
left
;
width
:
1
3
0px
;
width
:
1
2
0px
;
padding-top
:
5px
;
text-align
:
right
;
}
.form-horizontal
.controls
{
margin-left
:
1
5
0px
;
margin-left
:
1
4
0px
;
}
.form-horizontal
.form-actions
{
padding-left
:
1
5
0px
;
padding-left
:
1
4
0px
;
}
table
{
width
:
100%
;
...
...
This diff is collapsed.
Click to expand it.
bootstrap.min.css
+
3
-
4
View file @
9f732e90
...
...
@@ -172,10 +172,9 @@ input::-webkit-input-placeholder{color:#999999;}
.form-search
input
,
.form-inline
input
,
.form-horizontal
input
,
.form-search
textarea
,
.form-inline
textarea
,
.form-horizontal
textarea
,
.form-search
select
,
.form-inline
select
,
.form-horizontal
select
,
.form-search
.uneditable-input
,
.form-inline
.uneditable-input
,
.form-horizontal
.uneditable-input
{
display
:
inline-block
;
margin-bottom
:
0
;}
.form-search
label
,
.form-inline
label
{
display
:
inline-block
;}
.control-group
{
margin-bottom
:
18px
;}
.control-group
>
label
{
font-weight
:
bold
;}
.form-horizontal
.control-group
>
label
{
float
:
left
;
width
:
130px
;
padding-top
:
5px
;
text-align
:
right
;}
.form-horizontal
.controls
{
margin-left
:
150px
;}
.form-horizontal
.form-actions
{
padding-left
:
150px
;}
.form-horizontal
.control-group
>
label
{
float
:
left
;
width
:
120px
;
padding-top
:
5px
;
text-align
:
right
;}
.form-horizontal
.controls
{
margin-left
:
140px
;}
.form-horizontal
.form-actions
{
padding-left
:
140px
;}
table
{
width
:
100%
;
margin-bottom
:
18px
;}
th
,
td
{
padding
:
8px
;
line-height
:
18px
;
text-align
:
left
;
border-top
:
1px
solid
#ddd
;}
th
{
font-weight
:
bold
;
vertical-align
:
bottom
;}
...
...
This diff is collapsed.
Click to expand it.
lib/forms.less
+
3
-
7
View file @
9f732e90
...
...
@@ -461,10 +461,6 @@ input::-webkit-input-placeholder {
.control-group {
margin-bottom: @baseLineHeight;
}
// Bold the labels so they stand out
.control-group > label {
font-weight: bold;
}
// Horizontal-specific styles
// --------------------------
...
...
@@ -473,16 +469,16 @@ input::-webkit-input-placeholder {
// Float the labels left
.control-group > label {
float: left;
width: 1
3
0px;
width: 1
2
0px;
padding-top: 5px;
text-align: right;
}
// Move over all input controls and content
.controls {
margin-left: 1
5
0px;
margin-left: 1
4
0px;
}
// Move over buttons in .form-actions to align with .controls
.form-actions {
padding-left: 1
5
0px;
padding-left: 1
4
0px;
}
}
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