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 2015-06-22 16:30:56 -07:00
parent 9b5fe0ca46
commit 96e7ceed90
14 changed files with 62 additions and 82 deletions

View File

@ -2265,17 +2265,12 @@ pre code {
color: #55595c;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border: .0625rem solid #ccc;
border-radius: .25rem;
-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.form-control:not(textarea),
.form-control:not(select[size]),
.form-control:not(select[multiple]) {
height: 2.625rem;
}
.form-control::-ms-expand {
background-color: transparent;
border: 0;
@ -2336,7 +2331,7 @@ pre code {
.input-group-sm input[type="datetime-local"].form-control,
input[type="month"].input-sm,
.input-group-sm input[type="month"].form-control {
line-height: 2rem;
line-height: 1.95rem;
}
input[type="date"].input-lg,
.input-group-lg input[type="date"].form-control,
@ -2370,8 +2365,8 @@ pre code {
.form-control-sm, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn {
height: 2rem;
padding: .3rem .75rem;
height: 1.95rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
border-radius: .2rem;
@ -2492,9 +2487,9 @@ fieldset[disabled] .checkbox label {
.input-sm + .form-control-feedback,
.input-group-sm + .form-control-feedback {
width: 2rem;
height: 2rem;
line-height: 2rem;
width: 1.95rem;
height: 1.95rem;
line-height: 1.95rem;
}
.has-success .help-block,
@ -3069,7 +3064,7 @@ fieldset[disabled] a.btn {
}
.btn-sm, .btn-group-sm > .btn {
padding: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
border-radius: .2rem;
@ -3502,7 +3497,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: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
border-radius: .2rem;
}
@ -4069,15 +4064,15 @@ input[type="button"].btn-block {
border-bottom-left-radius: 0;
}
.navbar-condensed {
.navbar-sm {
padding-top: 0;
padding-bottom: 0;
}
.navbar-condensed .navbar-brand {
.navbar-sm .navbar-brand {
padding-top: .95rem;
padding-bottom: .95rem;
}
.navbar-condensed .form-inline {
.navbar-sm .form-inline {
margin-top: .6rem;
}
@ -4525,7 +4520,7 @@ input[type="button"].btn-block {
.pagination-sm > li > a,
.pagination-sm > li > span {
padding: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1832,17 +1832,12 @@ pre code {
color: #55595c;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border: .0625rem solid #ccc;
border-radius: .25rem;
-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.form-control:not(textarea),
.form-control:not(select[size]),
.form-control:not(select[multiple]) {
height: 2.625rem;
}
.form-control::-ms-expand {
background-color: transparent;
border: 0;
@ -1903,7 +1898,7 @@ pre code {
.input-group-sm input[type="datetime-local"].form-control,
input[type="month"].input-sm,
.input-group-sm input[type="month"].form-control {
line-height: 2rem;
line-height: 1.95rem;
}
input[type="date"].input-lg,
.input-group-lg input[type="date"].form-control,
@ -1937,8 +1932,8 @@ pre code {
.form-control-sm, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn {
height: 2rem;
padding: .3rem .75rem;
height: 1.95rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
border-radius: .2rem;
@ -2059,9 +2054,9 @@ fieldset[disabled] .checkbox label {
.input-sm + .form-control-feedback,
.input-group-sm + .form-control-feedback {
width: 2rem;
height: 2rem;
line-height: 2rem;
width: 1.95rem;
height: 1.95rem;
line-height: 1.95rem;
}
.has-success .help-block,
@ -2636,7 +2631,7 @@ fieldset[disabled] a.btn {
}
.btn-sm, .btn-group-sm > .btn {
padding: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
border-radius: .2rem;
@ -3070,7 +3065,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: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
border-radius: .2rem;
}
@ -3637,15 +3632,15 @@ input[type="button"].btn-block {
border-bottom-left-radius: 0;
}
.navbar-condensed {
.navbar-sm {
padding-top: 0;
padding-bottom: 0;
}
.navbar-condensed .navbar-brand {
.navbar-sm .navbar-brand {
padding-top: .95rem;
padding-bottom: .95rem;
}
.navbar-condensed .form-inline {
.navbar-sm .form-inline {
margin-top: .6rem;
}
@ -4080,7 +4075,7 @@ input[type="button"].btn-block {
.pagination-sm > li > a,
.pagination-sm > li > span {
padding: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
}

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

File diff suppressed because one or more lines are too long

View File

@ -2265,17 +2265,12 @@ pre code {
color: #55595c;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border: .0625rem solid #ccc;
border-radius: .25rem;
-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.form-control:not(textarea),
.form-control:not(select[size]),
.form-control:not(select[multiple]) {
height: 2.625rem;
}
.form-control::-ms-expand {
background-color: transparent;
border: 0;
@ -2336,7 +2331,7 @@ pre code {
.input-group-sm input[type="datetime-local"].form-control,
input[type="month"].input-sm,
.input-group-sm input[type="month"].form-control {
line-height: 2rem;
line-height: 1.95rem;
}
input[type="date"].input-lg,
.input-group-lg input[type="date"].form-control,
@ -2370,8 +2365,8 @@ pre code {
.form-control-sm, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn {
height: 2rem;
padding: .3rem .75rem;
height: 1.95rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
border-radius: .2rem;
@ -2492,9 +2487,9 @@ fieldset[disabled] .checkbox label {
.input-sm + .form-control-feedback,
.input-group-sm + .form-control-feedback {
width: 2rem;
height: 2rem;
line-height: 2rem;
width: 1.95rem;
height: 1.95rem;
line-height: 1.95rem;
}
.has-success .help-block,
@ -3069,7 +3064,7 @@ fieldset[disabled] a.btn {
}
.btn-sm, .btn-group-sm > .btn {
padding: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
border-radius: .2rem;
@ -3502,7 +3497,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: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
border-radius: .2rem;
}
@ -4069,15 +4064,15 @@ input[type="button"].btn-block {
border-bottom-left-radius: 0;
}
.navbar-condensed {
.navbar-sm {
padding-top: 0;
padding-bottom: 0;
}
.navbar-condensed .navbar-brand {
.navbar-sm .navbar-brand {
padding-top: .95rem;
padding-bottom: .95rem;
}
.navbar-condensed .form-inline {
.navbar-sm .form-inline {
margin-top: .6rem;
}
@ -4525,7 +4520,7 @@ input[type="button"].btn-block {
.pagination-sm > li > a,
.pagination-sm > li > span {
padding: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -1832,17 +1832,12 @@ pre code {
color: #55595c;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border: .0625rem solid #ccc;
border-radius: .25rem;
-webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.form-control:not(textarea),
.form-control:not(select[size]),
.form-control:not(select[multiple]) {
height: 2.625rem;
}
.form-control::-ms-expand {
background-color: transparent;
border: 0;
@ -1903,7 +1898,7 @@ pre code {
.input-group-sm input[type="datetime-local"].form-control,
input[type="month"].input-sm,
.input-group-sm input[type="month"].form-control {
line-height: 2rem;
line-height: 1.95rem;
}
input[type="date"].input-lg,
.input-group-lg input[type="date"].form-control,
@ -1937,8 +1932,8 @@ pre code {
.form-control-sm, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn {
height: 2rem;
padding: .3rem .75rem;
height: 1.95rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
border-radius: .2rem;
@ -2059,9 +2054,9 @@ fieldset[disabled] .checkbox label {
.input-sm + .form-control-feedback,
.input-group-sm + .form-control-feedback {
width: 2rem;
height: 2rem;
line-height: 2rem;
width: 1.95rem;
height: 1.95rem;
line-height: 1.95rem;
}
.has-success .help-block,
@ -2636,7 +2631,7 @@ fieldset[disabled] a.btn {
}
.btn-sm, .btn-group-sm > .btn {
padding: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
border-radius: .2rem;
@ -3070,7 +3065,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: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
border-radius: .2rem;
}
@ -3637,15 +3632,15 @@ input[type="button"].btn-block {
border-bottom-left-radius: 0;
}
.navbar-condensed {
.navbar-sm {
padding-top: 0;
padding-bottom: 0;
}
.navbar-condensed .navbar-brand {
.navbar-sm .navbar-brand {
padding-top: .95rem;
padding-bottom: .95rem;
}
.navbar-condensed .form-inline {
.navbar-sm .form-inline {
margin-top: .6rem;
}
@ -4080,7 +4075,7 @@ input[type="button"].btn-block {
.pagination-sm > li > a,
.pagination-sm > li > span {
padding: .3rem .75rem;
padding: .275rem .75rem;
font-size: .85rem;
line-height: 1.5;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long