0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
This commit is contained in:
Mark Otto 2016-02-07 23:38:03 -08:00
parent e8b6e5fc69
commit 48df6e3b72
8 changed files with 50 additions and 50 deletions

View File

@ -2082,8 +2082,9 @@ pre code {
.form-control {
display: block;
width: 100%;
padding: 0.375rem 0.75rem;
padding: 0.5rem 0.75rem;
font-size: 1rem;
line-height: 1.25;
color: #55595c;
background-color: #fff;
background-image: none;
@ -2131,7 +2132,7 @@ pre code {
}
select.form-control:not([size]):not([multiple]) {
height: 2.25rem;
height: 2.5rem;
}
.form-control-file,
@ -2140,7 +2141,7 @@ select.form-control:not([size]):not([multiple]) {
}
.form-control-label {
padding: 0.375rem 0.75rem;
padding: 0.5rem 0.75rem;
margin-bottom: 0;
}
@ -2149,7 +2150,7 @@ input[type="date"].form-control,
input[type="time"].form-control,
input[type="datetime-local"].form-control,
input[type="month"].form-control {
line-height: 2.25rem;
line-height: 2.5rem;
}
_::-webkit-full-page-media.input-sm,
@ -2166,7 +2167,7 @@ input[type="datetime-local"].form-control,
input[type="month"].input-sm,
.input-group-sm
input[type="month"].form-control {
line-height: 1.8625rem;
line-height: 1.8125rem;
}
_::-webkit-full-page-media.input-lg,
@ -2187,9 +2188,9 @@ input[type="month"].form-control {
}
.form-control-static {
min-height: 2.25rem;
padding-top: 0.375rem;
padding-bottom: 0.375rem;
min-height: 2.5rem;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
margin-bottom: 0;
}
@ -2205,18 +2206,16 @@ input[type="month"].form-control {
.form-control-sm, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn {
padding: 0.275rem 0.75rem;
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
line-height: 1.5;
border-radius: 0.2rem;
}
.form-control-lg, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
padding: 0.75rem 1.25rem;
padding: 0.75rem 1.5rem;
font-size: 1.25rem;
line-height: 1.333333;
border-radius: 0.3rem;
}
@ -2294,9 +2293,9 @@ input[type="checkbox"].disabled {
.form-control-danger {
padding-right: 2.25rem;
background-repeat: no-repeat;
background-position: center right 0.5625rem;
-webkit-background-size: 1.125rem 1.125rem;
background-size: 1.125rem 1.125rem;
background-position: center right 0.625rem;
-webkit-background-size: 1.25rem 1.25rem;
background-size: 1.25rem 1.25rem;
}
.has-success .text-help,
@ -2446,6 +2445,7 @@ input[type="checkbox"].disabled {
.btn {
display: inline-block;
font-weight: normal;
line-height: 1.25;
text-align: center;
white-space: nowrap;
vertical-align: middle;
@ -2455,7 +2455,7 @@ input[type="checkbox"].disabled {
-ms-user-select: none;
user-select: none;
border: 1px solid transparent;
padding: 0.375rem 1rem;
padding: 0.5rem 1rem;
font-size: 1rem;
border-radius: 0.25rem;
}
@ -2957,13 +2957,13 @@ fieldset[disabled] a.btn {
}
.btn-lg, .btn-group-lg > .btn {
padding: 0.75rem 1.25rem;
padding: 0.75rem 1.5rem;
font-size: 1.25rem;
border-radius: 0.3rem;
}
.btn-sm, .btn-group-sm > .btn {
padding: 0.25rem 0.75rem;
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
border-radius: 0.2rem;
}
@ -3381,11 +3381,11 @@ input[type="button"].btn-block {
}
.input-group-addon {
padding: 0.375rem 0.75rem;
padding: 0.5rem 0.75rem;
margin-bottom: 0;
font-size: 1rem;
font-weight: normal;
line-height: 1.5;
line-height: 1.25;
color: #55595c;
text-align: center;
background-color: #eceeef;
@ -3396,7 +3396,7 @@ input[type="button"].btn-block {
.input-group-addon.form-control-sm,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .input-group-addon.btn {
padding: 0.275rem 0.75rem;
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
border-radius: 0.2rem;
}
@ -3404,7 +3404,7 @@ input[type="button"].btn-block {
.input-group-addon.form-control-lg,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .input-group-addon.btn {
padding: 0.75rem 1.25rem;
padding: 0.75rem 1.5rem;
font-size: 1.25rem;
border-radius: 0.3rem;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2082,8 +2082,9 @@ pre code {
.form-control {
display: block;
width: 100%;
padding: 0.375rem 0.75rem;
padding: 0.5rem 0.75rem;
font-size: 1rem;
line-height: 1.25;
color: #55595c;
background-color: #fff;
background-image: none;
@ -2131,7 +2132,7 @@ pre code {
}
select.form-control:not([size]):not([multiple]) {
height: 2.25rem;
height: 2.5rem;
}
.form-control-file,
@ -2140,7 +2141,7 @@ select.form-control:not([size]):not([multiple]) {
}
.form-control-label {
padding: 0.375rem 0.75rem;
padding: 0.5rem 0.75rem;
margin-bottom: 0;
}
@ -2149,7 +2150,7 @@ input[type="date"].form-control,
input[type="time"].form-control,
input[type="datetime-local"].form-control,
input[type="month"].form-control {
line-height: 2.25rem;
line-height: 2.5rem;
}
_::-webkit-full-page-media.input-sm,
@ -2166,7 +2167,7 @@ input[type="datetime-local"].form-control,
input[type="month"].input-sm,
.input-group-sm
input[type="month"].form-control {
line-height: 1.8625rem;
line-height: 1.8125rem;
}
_::-webkit-full-page-media.input-lg,
@ -2187,9 +2188,9 @@ input[type="month"].form-control {
}
.form-control-static {
min-height: 2.25rem;
padding-top: 0.375rem;
padding-bottom: 0.375rem;
min-height: 2.5rem;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
margin-bottom: 0;
}
@ -2205,18 +2206,16 @@ input[type="month"].form-control {
.form-control-sm, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn {
padding: 0.275rem 0.75rem;
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
line-height: 1.5;
border-radius: 0.2rem;
}
.form-control-lg, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
padding: 0.75rem 1.25rem;
padding: 0.75rem 1.5rem;
font-size: 1.25rem;
line-height: 1.333333;
border-radius: 0.3rem;
}
@ -2294,9 +2293,9 @@ input[type="checkbox"].disabled {
.form-control-danger {
padding-right: 2.25rem;
background-repeat: no-repeat;
background-position: center right 0.5625rem;
-webkit-background-size: 1.125rem 1.125rem;
background-size: 1.125rem 1.125rem;
background-position: center right 0.625rem;
-webkit-background-size: 1.25rem 1.25rem;
background-size: 1.25rem 1.25rem;
}
.has-success .text-help,
@ -2446,6 +2445,7 @@ input[type="checkbox"].disabled {
.btn {
display: inline-block;
font-weight: normal;
line-height: 1.25;
text-align: center;
white-space: nowrap;
vertical-align: middle;
@ -2455,7 +2455,7 @@ input[type="checkbox"].disabled {
-ms-user-select: none;
user-select: none;
border: 1px solid transparent;
padding: 0.375rem 1rem;
padding: 0.5rem 1rem;
font-size: 1rem;
border-radius: 0.25rem;
}
@ -2957,13 +2957,13 @@ fieldset[disabled] a.btn {
}
.btn-lg, .btn-group-lg > .btn {
padding: 0.75rem 1.25rem;
padding: 0.75rem 1.5rem;
font-size: 1.25rem;
border-radius: 0.3rem;
}
.btn-sm, .btn-group-sm > .btn {
padding: 0.25rem 0.75rem;
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
border-radius: 0.2rem;
}
@ -3381,11 +3381,11 @@ input[type="button"].btn-block {
}
.input-group-addon {
padding: 0.375rem 0.75rem;
padding: 0.5rem 0.75rem;
margin-bottom: 0;
font-size: 1rem;
font-weight: normal;
line-height: 1.5;
line-height: 1.25;
color: #55595c;
text-align: center;
background-color: #eceeef;
@ -3396,7 +3396,7 @@ input[type="button"].btn-block {
.input-group-addon.form-control-sm,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .input-group-addon.btn {
padding: 0.275rem 0.75rem;
padding: 0.25rem 0.5rem;
font-size: 0.875rem;
border-radius: 0.2rem;
}
@ -3404,7 +3404,7 @@ input[type="button"].btn-block {
.input-group-addon.form-control-lg,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .input-group-addon.btn {
padding: 0.75rem 1.25rem;
padding: 0.75rem 1.5rem;
font-size: 1.25rem;
border-radius: 0.3rem;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long