mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-01 01:21:49 +02:00
Code Issues Releases Wiki Activity

Use .form-control in input sizing CSS

Browse Source
This commit is contained in:
Mark Otto
2013-07-26 15:41:16 -07:00
parent 73427f717d
commit 68827689e8
4 changed files with 7 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css.html
View File

@@ -1277,7 +1277,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</form> </form>
{% highlight html %} {% highlight html %}
<form class="form-horizontal"> <form class="form-horizontal">
<div class="row"> <div class="row form-group">
<label for="inputEmail" class="col-lg-2 control-label">Email</label> <label for="inputEmail" class="col-lg-2 control-label">Email</label>
<div class="col-lg-10"> <div class="col-lg-10">
<input type="text" class="form-control" id="inputEmail" placeholder="Email"> <input type="text" class="form-control" id="inputEmail" placeholder="Email">

34
dist/css/bootstrap.css vendored
View File

@@ -1432,44 +1432,14 @@ textarea.form-control {
margin-left: 10px; margin-left: 10px;
} }
select.input-large, .form-control.input-large {
textarea.input-large,
input[type="text"].input-large,
input[type="password"].input-large,
input[type="datetime"].input-large,
input[type="datetime-local"].input-large,
input[type="date"].input-large,
input[type="month"].input-large,
input[type="time"].input-large,
input[type="week"].input-large,
input[type="number"].input-large,
input[type="email"].input-large,
input[type="url"].input-large,
input[type="search"].input-large,
input[type="tel"].input-large,
input[type="color"].input-large {
height: 56px; height: 56px;
padding: 14px 16px; padding: 14px 16px;
font-size: 18px; font-size: 18px;
border-radius: 6px; border-radius: 6px;
} }
select.input-small, .form-control.input-small {
textarea.input-small,
input[type="text"].input-small,
input[type="password"].input-small,
input[type="datetime"].input-small,
input[type="datetime-local"].input-small,
input[type="date"].input-small,
input[type="month"].input-small,
input[type="time"].input-small,
input[type="week"].input-small,
input[type="number"].input-small,
input[type="email"].input-small,
input[type="url"].input-small,
input[type="search"].input-small,
input[type="tel"].input-small,
input[type="color"].input-small {
height: 30px; height: 30px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

20
less/forms.less
View File

@@ -215,24 +215,10 @@ input[type="number"] {
// Form control sizing // Form control sizing
// //
// Relative text size, padding, and border-radii changes for form controls. For // Relative text size, padding, and border-radii changes for form controls. For
// horizontal sizing, wrap controls in the predefined grid classes. // horizontal sizing, wrap controls in the predefined grid classes. `<select>`
// element gets special love because it's special, and that's a fact!
select, .form-control {
textarea,
input[type="text"],
input[type="password"],
input[type="datetime"],
input[type="datetime-local"],
input[type="date"],
input[type="month"],
input[type="time"],
input[type="week"],
input[type="number"],
input[type="email"],
input[type="url"],
input[type="search"],
input[type="tel"],
input[type="color"] {
&.input-large { &.input-large {
height: @input-height-large; height: @input-height-large;
padding: @padding-large-vertical @padding-large-horizontal; padding: @padding-large-vertical @padding-large-horizontal;