1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-31 17:11:48 +02:00

rems: buttons

This commit is contained in:
Mark Otto
2014-07-08 01:22:02 -07:00
parent 413750a03c
commit 8d50d4a684
8 changed files with 128 additions and 127 deletions

112
dist/css/bootstrap.css vendored
View File

@@ -1705,7 +1705,7 @@ input[type="checkbox"]:focus {
} }
output { output {
display: block; display: block;
padding-top: 7px; padding-top: 1.5rem;
font-size: 1rem; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
color: #555; color: #555;
@@ -1713,8 +1713,8 @@ output {
.form-control { .form-control {
display: block; display: block;
width: 100%; width: 100%;
height: 38px; height: 27px;
padding: 6px 12px; padding: .5rem 1rem;
font-size: 1rem; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
color: #555; color: #555;
@@ -1761,20 +1761,20 @@ input[type="date"],
input[type="time"], input[type="time"],
input[type="datetime-local"], input[type="datetime-local"],
input[type="month"] { input[type="month"] {
line-height: 38px; line-height: 27px;
line-height: 1.5 \0; line-height: 1.5 \0;
} }
input[type="date"].input-sm, input[type="date"].input-sm,
input[type="time"].input-sm, input[type="time"].input-sm,
input[type="datetime-local"].input-sm, input[type="datetime-local"].input-sm,
input[type="month"].input-sm { input[type="month"].input-sm {
line-height: 13rem; line-height: 3.6rem;
} }
input[type="date"].input-lg, input[type="date"].input-lg,
input[type="time"].input-lg, input[type="time"].input-lg,
input[type="datetime-local"].input-lg, input[type="datetime-local"].input-lg,
input[type="month"].input-lg { input[type="month"].input-lg {
line-height: 24rem; line-height: 5.5rem;
} }
.form-group { .form-group {
margin-bottom: 15px; margin-bottom: 15px;
@@ -1841,8 +1841,8 @@ fieldset[disabled] .checkbox label {
cursor: not-allowed; cursor: not-allowed;
} }
.form-control-static { .form-control-static {
padding-top: 7px; padding-top: 1.5rem;
padding-bottom: 7px; padding-bottom: 1.5rem;
margin-bottom: 0; margin-bottom: 0;
} }
.form-control-static.input-lg, .form-control-static.input-lg,
@@ -1852,16 +1852,16 @@ fieldset[disabled] .checkbox label {
} }
.input-sm, .input-sm,
.form-group-sm .form-control { .form-group-sm .form-control {
height: 13rem; height: 3.6rem;
padding: 5px 10px; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
line-height: 1.5; line-height: 1.5;
border-radius: .2rem; border-radius: .2rem;
} }
select.input-sm, select.input-sm,
select.form-group-sm .form-control { select.form-group-sm .form-control {
height: 13rem; height: 3.6rem;
line-height: 13rem; line-height: 3.6rem;
} }
textarea.input-sm, textarea.input-sm,
textarea.form-group-sm .form-control, textarea.form-group-sm .form-control,
@@ -1871,16 +1871,16 @@ select[multiple].form-group-sm .form-control {
} }
.input-lg, .input-lg,
.form-group-lg .form-control { .form-group-lg .form-control {
height: 24rem; height: 5.5rem;
padding: 10px 16px; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.33; line-height: 1.33;
border-radius: .3rem; border-radius: .3rem;
} }
select.input-lg, select.input-lg,
select.form-group-lg .form-control { select.form-group-lg .form-control {
height: 24rem; height: 5.5rem;
line-height: 24rem; line-height: 5.5rem;
} }
textarea.input-lg, textarea.input-lg,
textarea.form-group-lg .form-control, textarea.form-group-lg .form-control,
@@ -1892,7 +1892,7 @@ select[multiple].form-group-lg .form-control {
position: relative; position: relative;
} }
.has-feedback .form-control { .has-feedback .form-control {
padding-right: 47.5px; padding-right: 33.75px;
} }
.form-control-feedback { .form-control-feedback {
position: absolute; position: absolute;
@@ -1900,20 +1900,20 @@ select[multiple].form-group-lg .form-control {
right: 0; right: 0;
z-index: 2; z-index: 2;
display: block; display: block;
width: 38px; width: 27px;
height: 38px; height: 27px;
line-height: 38px; line-height: 27px;
text-align: center; text-align: center;
} }
.input-lg + .form-control-feedback { .input-lg + .form-control-feedback {
width: 24rem; width: 5.5rem;
height: 24rem; height: 5.5rem;
line-height: 24rem; line-height: 5.5rem;
} }
.input-sm + .form-control-feedback { .input-sm + .form-control-feedback {
width: 13rem; width: 3.6rem;
height: 13rem; height: 3.6rem;
line-height: 13rem; line-height: 3.6rem;
} }
.has-success .help-block, .has-success .help-block,
.has-success .control-label, .has-success .control-label,
@@ -2068,13 +2068,13 @@ select[multiple].form-group-lg .form-control {
.form-horizontal .checkbox, .form-horizontal .checkbox,
.form-horizontal .radio-inline, .form-horizontal .radio-inline,
.form-horizontal .checkbox-inline { .form-horizontal .checkbox-inline {
padding-top: 7px; padding-top: 1.5rem;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
} }
.form-horizontal .radio, .form-horizontal .radio,
.form-horizontal .checkbox { .form-horizontal .checkbox {
min-height: 31px; min-height: 25.5px;
} }
.form-horizontal .form-group { .form-horizontal .form-group {
margin-right: -15px; margin-right: -15px;
@@ -2082,7 +2082,7 @@ select[multiple].form-group-lg .form-control {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .control-label { .form-horizontal .control-label {
padding-top: 7px; padding-top: 1.5rem;
margin-bottom: 0; margin-bottom: 0;
text-align: right; text-align: right;
} }
@@ -2092,17 +2092,17 @@ select[multiple].form-group-lg .form-control {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-lg .control-label { .form-horizontal .form-group-lg .control-label {
padding-top: 14.3px; padding-top: 1.9975rem;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-sm .control-label { .form-horizontal .form-group-sm .control-label {
padding-top: 6px; padding-top: 1.3rem;
} }
} }
.btn { .btn {
display: inline-block; display: inline-block;
padding: 6px 12px; padding: .5rem 1rem;
margin-bottom: 0; margin-bottom: 0;
font-size: 1rem; font-size: 1rem;
font-weight: normal; font-weight: normal;
@@ -2458,22 +2458,22 @@ fieldset[disabled] .btn-link:focus {
} }
.btn-lg, .btn-lg,
.btn-group-lg > .btn { .btn-group-lg > .btn {
padding: 10px 16px; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.33; line-height: 1.33;
border-radius: .3rem; border-radius: .3rem;
} }
.btn-sm, .btn-sm,
.btn-group-sm > .btn { .btn-group-sm > .btn {
padding: 5px 10px; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
line-height: 1.5; line-height: 1.5;
border-radius: .2rem; border-radius: .2rem;
} }
.btn-xs, .btn-xs,
.btn-group-xs > .btn { .btn-group-xs > .btn {
padding: 1px 5px; padding: .2rem .5rem;
font-size: .85rem; font-size: .75rem;
line-height: 1.5; line-height: 1.5;
border-radius: .2rem; border-radius: .2rem;
} }
@@ -2851,8 +2851,8 @@ tbody.collapse.in {
.input-group-lg > .form-control, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon, .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-group-lg > .input-group-btn > .btn {
height: 24rem; height: 5.5rem;
padding: 10px 16px; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.33; line-height: 1.33;
border-radius: .3rem; border-radius: .3rem;
@@ -2860,8 +2860,8 @@ tbody.collapse.in {
select.input-group-lg > .form-control, select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn { select.input-group-lg > .input-group-btn > .btn {
height: 24rem; height: 5.5rem;
line-height: 24rem; line-height: 5.5rem;
} }
textarea.input-group-lg > .form-control, textarea.input-group-lg > .form-control,
textarea.input-group-lg > .input-group-addon, textarea.input-group-lg > .input-group-addon,
@@ -2874,8 +2874,8 @@ select[multiple].input-group-lg > .input-group-btn > .btn {
.input-group-sm > .form-control, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon, .input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn { .input-group-sm > .input-group-btn > .btn {
height: 13rem; height: 3.6rem;
padding: 5px 10px; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
line-height: 1.5; line-height: 1.5;
border-radius: .2rem; border-radius: .2rem;
@@ -2883,8 +2883,8 @@ select[multiple].input-group-lg > .input-group-btn > .btn {
select.input-group-sm > .form-control, select.input-group-sm > .form-control,
select.input-group-sm > .input-group-addon, select.input-group-sm > .input-group-addon,
select.input-group-sm > .input-group-btn > .btn { select.input-group-sm > .input-group-btn > .btn {
height: 13rem; height: 3.6rem;
line-height: 13rem; line-height: 3.6rem;
} }
textarea.input-group-sm > .form-control, textarea.input-group-sm > .form-control,
textarea.input-group-sm > .input-group-addon, textarea.input-group-sm > .input-group-addon,
@@ -2911,7 +2911,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
vertical-align: middle; vertical-align: middle;
} }
.input-group-addon { .input-group-addon {
padding: 6px 12px; padding: .5rem 1rem;
font-size: 1rem; font-size: 1rem;
font-weight: normal; font-weight: normal;
line-height: 1; line-height: 1;
@@ -2922,12 +2922,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-radius: .2rem; border-radius: .2rem;
} }
.input-group-addon.input-sm { .input-group-addon.input-sm {
padding: 5px 10px; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
border-radius: .2rem; border-radius: .2rem;
} }
.input-group-addon.input-lg { .input-group-addon.input-lg {
padding: 10px 16px; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
border-radius: .3rem; border-radius: .3rem;
} }
@@ -3382,9 +3382,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
.navbar-form { .navbar-form {
padding: 10px 15px; padding: 10px 15px;
margin-top: 6px; margin-top: 11.5px;
margin-right: -15px; margin-right: -15px;
margin-bottom: 6px; margin-bottom: 11.5px;
margin-left: -15px; margin-left: -15px;
border-top: 1px solid transparent; border-top: 1px solid transparent;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
@@ -3465,12 +3465,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.navbar-btn { .navbar-btn {
margin-top: 6px; margin-top: 11.5px;
margin-bottom: 6px; margin-bottom: 11.5px;
} }
.navbar-btn.btn-sm { .navbar-btn.btn-sm {
margin-top: 18.5px; margin-top: 23.2px;
margin-bottom: 18.5px; margin-bottom: 23.2px;
} }
.navbar-btn.btn-xs { .navbar-btn.btn-xs {
margin-top: 14px; margin-top: 14px;
@@ -3728,7 +3728,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > span { .pagination > li > span {
position: relative; position: relative;
float: left; float: left;
padding: 6px 12px; padding: .5rem 1rem;
margin-left: -1px; margin-left: -1px;
line-height: 1.5; line-height: 1.5;
color: #027de7; color: #027de7;
@@ -3780,7 +3780,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
} }
.pagination-lg > li > a, .pagination-lg > li > a,
.pagination-lg > li > span { .pagination-lg > li > span {
padding: 10px 16px; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
} }
.pagination-lg > li:first-child > a, .pagination-lg > li:first-child > a,
@@ -3795,7 +3795,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
} }
.pagination-sm > li > a, .pagination-sm > li > a,
.pagination-sm > li > span { .pagination-sm > li > span {
padding: 5px 10px; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
} }
.pagination-sm > li:first-child > a, .pagination-sm > li:first-child > a,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1705,7 +1705,7 @@ input[type="checkbox"]:focus {
} }
output { output {
display: block; display: block;
padding-top: 7px; padding-top: 1.5rem;
font-size: 1rem; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
color: #555; color: #555;
@@ -1713,8 +1713,8 @@ output {
.form-control { .form-control {
display: block; display: block;
width: 100%; width: 100%;
height: 38px; height: 27px;
padding: 6px 12px; padding: .5rem 1rem;
font-size: 1rem; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
color: #555; color: #555;
@@ -1761,20 +1761,20 @@ input[type="date"],
input[type="time"], input[type="time"],
input[type="datetime-local"], input[type="datetime-local"],
input[type="month"] { input[type="month"] {
line-height: 38px; line-height: 27px;
line-height: 1.5 \0; line-height: 1.5 \0;
} }
input[type="date"].input-sm, input[type="date"].input-sm,
input[type="time"].input-sm, input[type="time"].input-sm,
input[type="datetime-local"].input-sm, input[type="datetime-local"].input-sm,
input[type="month"].input-sm { input[type="month"].input-sm {
line-height: 13rem; line-height: 3.6rem;
} }
input[type="date"].input-lg, input[type="date"].input-lg,
input[type="time"].input-lg, input[type="time"].input-lg,
input[type="datetime-local"].input-lg, input[type="datetime-local"].input-lg,
input[type="month"].input-lg { input[type="month"].input-lg {
line-height: 24rem; line-height: 5.5rem;
} }
.form-group { .form-group {
margin-bottom: 15px; margin-bottom: 15px;
@@ -1841,8 +1841,8 @@ fieldset[disabled] .checkbox label {
cursor: not-allowed; cursor: not-allowed;
} }
.form-control-static { .form-control-static {
padding-top: 7px; padding-top: 1.5rem;
padding-bottom: 7px; padding-bottom: 1.5rem;
margin-bottom: 0; margin-bottom: 0;
} }
.form-control-static.input-lg, .form-control-static.input-lg,
@@ -1852,16 +1852,16 @@ fieldset[disabled] .checkbox label {
} }
.input-sm, .input-sm,
.form-group-sm .form-control { .form-group-sm .form-control {
height: 13rem; height: 3.6rem;
padding: 5px 10px; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
line-height: 1.5; line-height: 1.5;
border-radius: .2rem; border-radius: .2rem;
} }
select.input-sm, select.input-sm,
select.form-group-sm .form-control { select.form-group-sm .form-control {
height: 13rem; height: 3.6rem;
line-height: 13rem; line-height: 3.6rem;
} }
textarea.input-sm, textarea.input-sm,
textarea.form-group-sm .form-control, textarea.form-group-sm .form-control,
@@ -1871,16 +1871,16 @@ select[multiple].form-group-sm .form-control {
} }
.input-lg, .input-lg,
.form-group-lg .form-control { .form-group-lg .form-control {
height: 24rem; height: 5.5rem;
padding: 10px 16px; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.33; line-height: 1.33;
border-radius: .3rem; border-radius: .3rem;
} }
select.input-lg, select.input-lg,
select.form-group-lg .form-control { select.form-group-lg .form-control {
height: 24rem; height: 5.5rem;
line-height: 24rem; line-height: 5.5rem;
} }
textarea.input-lg, textarea.input-lg,
textarea.form-group-lg .form-control, textarea.form-group-lg .form-control,
@@ -1892,7 +1892,7 @@ select[multiple].form-group-lg .form-control {
position: relative; position: relative;
} }
.has-feedback .form-control { .has-feedback .form-control {
padding-right: 47.5px; padding-right: 33.75px;
} }
.form-control-feedback { .form-control-feedback {
position: absolute; position: absolute;
@@ -1900,20 +1900,20 @@ select[multiple].form-group-lg .form-control {
right: 0; right: 0;
z-index: 2; z-index: 2;
display: block; display: block;
width: 38px; width: 27px;
height: 38px; height: 27px;
line-height: 38px; line-height: 27px;
text-align: center; text-align: center;
} }
.input-lg + .form-control-feedback { .input-lg + .form-control-feedback {
width: 24rem; width: 5.5rem;
height: 24rem; height: 5.5rem;
line-height: 24rem; line-height: 5.5rem;
} }
.input-sm + .form-control-feedback { .input-sm + .form-control-feedback {
width: 13rem; width: 3.6rem;
height: 13rem; height: 3.6rem;
line-height: 13rem; line-height: 3.6rem;
} }
.has-success .help-block, .has-success .help-block,
.has-success .control-label, .has-success .control-label,
@@ -2068,13 +2068,13 @@ select[multiple].form-group-lg .form-control {
.form-horizontal .checkbox, .form-horizontal .checkbox,
.form-horizontal .radio-inline, .form-horizontal .radio-inline,
.form-horizontal .checkbox-inline { .form-horizontal .checkbox-inline {
padding-top: 7px; padding-top: 1.5rem;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
} }
.form-horizontal .radio, .form-horizontal .radio,
.form-horizontal .checkbox { .form-horizontal .checkbox {
min-height: 31px; min-height: 25.5px;
} }
.form-horizontal .form-group { .form-horizontal .form-group {
margin-right: -15px; margin-right: -15px;
@@ -2082,7 +2082,7 @@ select[multiple].form-group-lg .form-control {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .control-label { .form-horizontal .control-label {
padding-top: 7px; padding-top: 1.5rem;
margin-bottom: 0; margin-bottom: 0;
text-align: right; text-align: right;
} }
@@ -2092,17 +2092,17 @@ select[multiple].form-group-lg .form-control {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-lg .control-label { .form-horizontal .form-group-lg .control-label {
padding-top: 14.3px; padding-top: 1.9975rem;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .form-group-sm .control-label { .form-horizontal .form-group-sm .control-label {
padding-top: 6px; padding-top: 1.3rem;
} }
} }
.btn { .btn {
display: inline-block; display: inline-block;
padding: 6px 12px; padding: .5rem 1rem;
margin-bottom: 0; margin-bottom: 0;
font-size: 1rem; font-size: 1rem;
font-weight: normal; font-weight: normal;
@@ -2458,22 +2458,22 @@ fieldset[disabled] .btn-link:focus {
} }
.btn-lg, .btn-lg,
.btn-group-lg > .btn { .btn-group-lg > .btn {
padding: 10px 16px; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.33; line-height: 1.33;
border-radius: .3rem; border-radius: .3rem;
} }
.btn-sm, .btn-sm,
.btn-group-sm > .btn { .btn-group-sm > .btn {
padding: 5px 10px; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
line-height: 1.5; line-height: 1.5;
border-radius: .2rem; border-radius: .2rem;
} }
.btn-xs, .btn-xs,
.btn-group-xs > .btn { .btn-group-xs > .btn {
padding: 1px 5px; padding: .2rem .5rem;
font-size: .85rem; font-size: .75rem;
line-height: 1.5; line-height: 1.5;
border-radius: .2rem; border-radius: .2rem;
} }
@@ -2851,8 +2851,8 @@ tbody.collapse.in {
.input-group-lg > .form-control, .input-group-lg > .form-control,
.input-group-lg > .input-group-addon, .input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn { .input-group-lg > .input-group-btn > .btn {
height: 24rem; height: 5.5rem;
padding: 10px 16px; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.33; line-height: 1.33;
border-radius: .3rem; border-radius: .3rem;
@@ -2860,8 +2860,8 @@ tbody.collapse.in {
select.input-group-lg > .form-control, select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon, select.input-group-lg > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn { select.input-group-lg > .input-group-btn > .btn {
height: 24rem; height: 5.5rem;
line-height: 24rem; line-height: 5.5rem;
} }
textarea.input-group-lg > .form-control, textarea.input-group-lg > .form-control,
textarea.input-group-lg > .input-group-addon, textarea.input-group-lg > .input-group-addon,
@@ -2874,8 +2874,8 @@ select[multiple].input-group-lg > .input-group-btn > .btn {
.input-group-sm > .form-control, .input-group-sm > .form-control,
.input-group-sm > .input-group-addon, .input-group-sm > .input-group-addon,
.input-group-sm > .input-group-btn > .btn { .input-group-sm > .input-group-btn > .btn {
height: 13rem; height: 3.6rem;
padding: 5px 10px; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
line-height: 1.5; line-height: 1.5;
border-radius: .2rem; border-radius: .2rem;
@@ -2883,8 +2883,8 @@ select[multiple].input-group-lg > .input-group-btn > .btn {
select.input-group-sm > .form-control, select.input-group-sm > .form-control,
select.input-group-sm > .input-group-addon, select.input-group-sm > .input-group-addon,
select.input-group-sm > .input-group-btn > .btn { select.input-group-sm > .input-group-btn > .btn {
height: 13rem; height: 3.6rem;
line-height: 13rem; line-height: 3.6rem;
} }
textarea.input-group-sm > .form-control, textarea.input-group-sm > .form-control,
textarea.input-group-sm > .input-group-addon, textarea.input-group-sm > .input-group-addon,
@@ -2911,7 +2911,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
vertical-align: middle; vertical-align: middle;
} }
.input-group-addon { .input-group-addon {
padding: 6px 12px; padding: .5rem 1rem;
font-size: 1rem; font-size: 1rem;
font-weight: normal; font-weight: normal;
line-height: 1; line-height: 1;
@@ -2922,12 +2922,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-radius: .2rem; border-radius: .2rem;
} }
.input-group-addon.input-sm { .input-group-addon.input-sm {
padding: 5px 10px; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
border-radius: .2rem; border-radius: .2rem;
} }
.input-group-addon.input-lg { .input-group-addon.input-lg {
padding: 10px 16px; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
border-radius: .3rem; border-radius: .3rem;
} }
@@ -3382,9 +3382,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
} }
.navbar-form { .navbar-form {
padding: 10px 15px; padding: 10px 15px;
margin-top: 6px; margin-top: 11.5px;
margin-right: -15px; margin-right: -15px;
margin-bottom: 6px; margin-bottom: 11.5px;
margin-left: -15px; margin-left: -15px;
border-top: 1px solid transparent; border-top: 1px solid transparent;
border-bottom: 1px solid transparent; border-bottom: 1px solid transparent;
@@ -3465,12 +3465,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
.navbar-btn { .navbar-btn {
margin-top: 6px; margin-top: 11.5px;
margin-bottom: 6px; margin-bottom: 11.5px;
} }
.navbar-btn.btn-sm { .navbar-btn.btn-sm {
margin-top: 18.5px; margin-top: 23.2px;
margin-bottom: 18.5px; margin-bottom: 23.2px;
} }
.navbar-btn.btn-xs { .navbar-btn.btn-xs {
margin-top: 14px; margin-top: 14px;
@@ -3728,7 +3728,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > span { .pagination > li > span {
position: relative; position: relative;
float: left; float: left;
padding: 6px 12px; padding: .5rem 1rem;
margin-left: -1px; margin-left: -1px;
line-height: 1.5; line-height: 1.5;
color: #027de7; color: #027de7;
@@ -3780,7 +3780,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
} }
.pagination-lg > li > a, .pagination-lg > li > a,
.pagination-lg > li > span { .pagination-lg > li > span {
padding: 10px 16px; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
} }
.pagination-lg > li:first-child > a, .pagination-lg > li:first-child > a,
@@ -3795,7 +3795,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
} }
.pagination-sm > li > a, .pagination-sm > li > a,
.pagination-sm > li > span { .pagination-sm > li > span {
padding: 5px 10px; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
} }
.pagination-sm > li:first-child > a, .pagination-sm > li:first-child > a,

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -132,7 +132,7 @@
.button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
} }
.btn-xs { .btn-xs {
.button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small); .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-xs; @line-height-small; @border-radius-small);
} }

View File

@@ -50,6 +50,7 @@
@font-size-base: 1rem; @font-size-base: 1rem;
@font-size-large: 1.25rem; @font-size-large: 1.25rem;
@font-size-small: .85rem; @font-size-small: .85rem;
@font-size-xs: .75rem;
@font-size-h1: 3rem; @font-size-h1: 3rem;
@font-size-h2: 2.5rem; @font-size-h2: 2.5rem;
@@ -59,9 +60,9 @@
@font-size-h6: 1rem; @font-size-h6: 1rem;
//** Unit-less `line-height` for use in components like buttons. //** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.5; // 20/14 @line-height-base: 1.5;
//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc. //** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
@line-height-computed: (@font-size-root * @line-height-base); // ~20px @line-height-computed: (@font-size-root * @line-height-base);
//** By default, this inherits from the `<body>`. //** By default, this inherits from the `<body>`.
@headings-font-family: inherit; @headings-font-family: inherit;
@@ -86,17 +87,17 @@
// //
//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
@padding-base-vertical: 6px; @padding-base-vertical: .5rem;
@padding-base-horizontal: 12px; @padding-base-horizontal: 1rem;
@padding-large-vertical: 10px; @padding-large-vertical: .75rem;
@padding-large-horizontal: 16px; @padding-large-horizontal: 1.5rem;
@padding-small-vertical: 5px; @padding-small-vertical: .3rem;
@padding-small-horizontal: 10px; @padding-small-horizontal: .75rem;
@padding-xs-vertical: 1px; @padding-xs-vertical: .2rem;
@padding-xs-horizontal: 5px; @padding-xs-horizontal: .5rem;
@line-height-large: 1.33; @line-height-large: 1.33;
@line-height-small: 1.5; @line-height-small: 1.5;