1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-16 18:44:01 +02:00

narrower borders to get closer to 1px everywhere

This commit is contained in:
Mark Otto
2015-04-17 00:44:36 -07:00
parent 7049a07444
commit 7c1635cdb8
7 changed files with 57 additions and 57 deletions

View File

@@ -1657,7 +1657,7 @@ label {
.form-control { .form-control {
display: block; display: block;
width: 100%; width: 100%;
height: 2.65rem; height: 2.625rem;
padding: .5rem .75rem; padding: .5rem .75rem;
font-size: 1rem; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
@@ -1775,7 +1775,7 @@ input[type="radio"]:disabled, input[type="radio"].disabled, fieldset[disabled] i
} }
.input-sm, .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn { .input-sm, .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn {
height: 2.025rem; height: 2rem;
padding: .3rem .75rem; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
line-height: 1.5; line-height: 1.5;
@@ -1783,8 +1783,8 @@ input[type="radio"]:disabled, input[type="radio"].disabled, fieldset[disabled] i
} }
select.input-sm, .input-group-sm > select.form-control, .input-group-sm > select.input-group-addon, .input-group-sm > .input-group-btn > select.btn { select.input-sm, .input-group-sm > select.form-control, .input-group-sm > select.input-group-addon, .input-group-sm > .input-group-btn > select.btn {
height: 2.025rem; height: 2rem;
line-height: 2.025rem; line-height: 2rem;
} }
textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > textarea.input-group-addon, .input-group-sm > .input-group-btn > textarea.btn, select[multiple].input-sm, .input-group-sm > select[multiple].form-control, .input-group-sm > select[multiple].input-group-addon, .input-group-sm > .input-group-btn > select[multiple].btn { textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > textarea.input-group-addon, .input-group-sm > .input-group-btn > textarea.btn, select[multiple].input-sm, .input-group-sm > select[multiple].form-control, .input-group-sm > select[multiple].input-group-addon, .input-group-sm > .input-group-btn > select[multiple].btn {
@@ -1792,21 +1792,21 @@ textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > te
} }
.form-group-sm .form-control { .form-group-sm .form-control {
height: 2.025rem; height: 2rem;
padding: .3rem .75rem; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
line-height: 1.5; line-height: 1.5;
border-radius: .2rem; border-radius: .2rem;
} }
.form-group-sm select.form-control { .form-group-sm select.form-control {
height: 2.025rem; height: 2rem;
line-height: 2.025rem; line-height: 2rem;
} }
.form-group-sm textarea.form-control, .form-group-sm select[multiple].form-control { .form-group-sm textarea.form-control, .form-group-sm select[multiple].form-control {
height: auto; height: auto;
} }
.form-group-sm .form-control-static { .form-group-sm .form-control-static {
height: 2.025rem; height: 2rem;
min-height: 1.85rem; min-height: 1.85rem;
padding: .3rem .75rem; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
@@ -1814,7 +1814,7 @@ textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > te
} }
.input-lg, .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { .input-lg, .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn {
height: 3.316667rem; height: 3.291667rem;
padding: .75rem 1.5rem; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.333333; line-height: 1.333333;
@@ -1822,8 +1822,8 @@ textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > te
} }
select.input-lg, .input-group-lg > select.form-control, .input-group-lg > select.input-group-addon, .input-group-lg > .input-group-btn > select.btn { select.input-lg, .input-group-lg > select.form-control, .input-group-lg > select.input-group-addon, .input-group-lg > .input-group-btn > select.btn {
height: 3.316667rem; height: 3.291667rem;
line-height: 3.316667rem; line-height: 3.291667rem;
} }
textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > textarea.input-group-addon, .input-group-lg > .input-group-btn > textarea.btn, select[multiple].input-lg, .input-group-lg > select[multiple].form-control, .input-group-lg > select[multiple].input-group-addon, .input-group-lg > .input-group-btn > select[multiple].btn { textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > textarea.input-group-addon, .input-group-lg > .input-group-btn > textarea.btn, select[multiple].input-lg, .input-group-lg > select[multiple].form-control, .input-group-lg > select[multiple].input-group-addon, .input-group-lg > .input-group-btn > select[multiple].btn {
@@ -1831,21 +1831,21 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
} }
.form-group-lg .form-control { .form-group-lg .form-control {
height: 3.316667rem; height: 3.291667rem;
padding: .75rem 1.5rem; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.333333; line-height: 1.333333;
border-radius: .3rem; border-radius: .3rem;
} }
.form-group-lg select.form-control { .form-group-lg select.form-control {
height: 3.316667rem; height: 3.291667rem;
line-height: 3.316667rem; line-height: 3.291667rem;
} }
.form-group-lg textarea.form-control, .form-group-lg select[multiple].form-control { .form-group-lg textarea.form-control, .form-group-lg select[multiple].form-control {
height: auto; height: auto;
} }
.form-group-lg .form-control-static { .form-group-lg .form-control-static {
height: 3.316667rem; height: 3.291667rem;
min-height: 2.25rem; min-height: 2.25rem;
padding: .75rem 1.5rem; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
@@ -1856,7 +1856,7 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
position: relative; position: relative;
} }
.has-feedback .form-control { .has-feedback .form-control {
padding-right: 3.3125rem; padding-right: 3.28125rem;
} }
.form-control-feedback { .form-control-feedback {
@@ -1865,23 +1865,23 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
right: 0; right: 0;
z-index: 2; z-index: 2;
display: block; display: block;
width: 2.65rem; width: 2.625rem;
height: 2.65rem; height: 2.625rem;
line-height: 2.65rem; line-height: 2.625rem;
text-align: center; text-align: center;
pointer-events: none; pointer-events: none;
} }
.input-lg + .form-control-feedback, .input-group-lg > .form-control + .form-control-feedback, .input-group-lg > .input-group-addon + .form-control-feedback, .input-group-lg > .input-group-btn > .btn + .form-control-feedback, .input-group-lg + .form-control-feedback { .input-lg + .form-control-feedback, .input-group-lg > .form-control + .form-control-feedback, .input-group-lg > .input-group-addon + .form-control-feedback, .input-group-lg > .input-group-btn > .btn + .form-control-feedback, .input-group-lg + .form-control-feedback {
width: 3.316667rem; width: 3.291667rem;
height: 3.316667rem; height: 3.291667rem;
line-height: 3.316667rem; line-height: 3.291667rem;
} }
.input-sm + .form-control-feedback, .input-group-sm > .form-control + .form-control-feedback, .input-group-sm > .input-group-addon + .form-control-feedback, .input-group-sm > .input-group-btn > .btn + .form-control-feedback, .input-group-sm + .form-control-feedback { .input-sm + .form-control-feedback, .input-group-sm > .form-control + .form-control-feedback, .input-group-sm > .input-group-addon + .form-control-feedback, .input-group-sm > .input-group-btn > .btn + .form-control-feedback, .input-group-sm + .form-control-feedback {
width: 2.025rem; width: 2rem;
height: 2.025rem; height: 2rem;
line-height: 2.025rem; line-height: 2rem;
} }
.has-success .help-block, .has-success .control-label, .has-success .radio, .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline, .has-success.radio label, .has-success.checkbox label, .has-success.radio-inline label, .has-success.checkbox-inline label { .has-success .help-block, .has-success .control-label, .has-success .radio, .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline, .has-success.radio label, .has-success.checkbox label, .has-success.radio-inline label, .has-success.checkbox-inline label {
@@ -2054,7 +2054,7 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
border: .075rem solid transparent; border: .0625rem solid transparent;
border-radius: .25rem; border-radius: .25rem;
-webkit-transition: all .2s ease-in-out; -webkit-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out; -o-transition: all .2s ease-in-out;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1657,7 +1657,7 @@ label {
.form-control { .form-control {
display: block; display: block;
width: 100%; width: 100%;
height: 2.65rem; height: 2.625rem;
padding: .5rem .75rem; padding: .5rem .75rem;
font-size: 1rem; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
@@ -1775,7 +1775,7 @@ input[type="radio"]:disabled, input[type="radio"].disabled, fieldset[disabled] i
} }
.input-sm, .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn { .input-sm, .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn {
height: 2.025rem; height: 2rem;
padding: .3rem .75rem; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
line-height: 1.5; line-height: 1.5;
@@ -1783,8 +1783,8 @@ input[type="radio"]:disabled, input[type="radio"].disabled, fieldset[disabled] i
} }
select.input-sm, .input-group-sm > select.form-control, .input-group-sm > select.input-group-addon, .input-group-sm > .input-group-btn > select.btn { select.input-sm, .input-group-sm > select.form-control, .input-group-sm > select.input-group-addon, .input-group-sm > .input-group-btn > select.btn {
height: 2.025rem; height: 2rem;
line-height: 2.025rem; line-height: 2rem;
} }
textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > textarea.input-group-addon, .input-group-sm > .input-group-btn > textarea.btn, select[multiple].input-sm, .input-group-sm > select[multiple].form-control, .input-group-sm > select[multiple].input-group-addon, .input-group-sm > .input-group-btn > select[multiple].btn { textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > textarea.input-group-addon, .input-group-sm > .input-group-btn > textarea.btn, select[multiple].input-sm, .input-group-sm > select[multiple].form-control, .input-group-sm > select[multiple].input-group-addon, .input-group-sm > .input-group-btn > select[multiple].btn {
@@ -1792,21 +1792,21 @@ textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > te
} }
.form-group-sm .form-control { .form-group-sm .form-control {
height: 2.025rem; height: 2rem;
padding: .3rem .75rem; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
line-height: 1.5; line-height: 1.5;
border-radius: .2rem; border-radius: .2rem;
} }
.form-group-sm select.form-control { .form-group-sm select.form-control {
height: 2.025rem; height: 2rem;
line-height: 2.025rem; line-height: 2rem;
} }
.form-group-sm textarea.form-control, .form-group-sm select[multiple].form-control { .form-group-sm textarea.form-control, .form-group-sm select[multiple].form-control {
height: auto; height: auto;
} }
.form-group-sm .form-control-static { .form-group-sm .form-control-static {
height: 2.025rem; height: 2rem;
min-height: 1.85rem; min-height: 1.85rem;
padding: .3rem .75rem; padding: .3rem .75rem;
font-size: .85rem; font-size: .85rem;
@@ -1814,7 +1814,7 @@ textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > te
} }
.input-lg, .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn { .input-lg, .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn {
height: 3.316667rem; height: 3.291667rem;
padding: .75rem 1.5rem; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.333333; line-height: 1.333333;
@@ -1822,8 +1822,8 @@ textarea.input-sm, .input-group-sm > textarea.form-control, .input-group-sm > te
} }
select.input-lg, .input-group-lg > select.form-control, .input-group-lg > select.input-group-addon, .input-group-lg > .input-group-btn > select.btn { select.input-lg, .input-group-lg > select.form-control, .input-group-lg > select.input-group-addon, .input-group-lg > .input-group-btn > select.btn {
height: 3.316667rem; height: 3.291667rem;
line-height: 3.316667rem; line-height: 3.291667rem;
} }
textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > textarea.input-group-addon, .input-group-lg > .input-group-btn > textarea.btn, select[multiple].input-lg, .input-group-lg > select[multiple].form-control, .input-group-lg > select[multiple].input-group-addon, .input-group-lg > .input-group-btn > select[multiple].btn { textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > textarea.input-group-addon, .input-group-lg > .input-group-btn > textarea.btn, select[multiple].input-lg, .input-group-lg > select[multiple].form-control, .input-group-lg > select[multiple].input-group-addon, .input-group-lg > .input-group-btn > select[multiple].btn {
@@ -1831,21 +1831,21 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
} }
.form-group-lg .form-control { .form-group-lg .form-control {
height: 3.316667rem; height: 3.291667rem;
padding: .75rem 1.5rem; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1.333333; line-height: 1.333333;
border-radius: .3rem; border-radius: .3rem;
} }
.form-group-lg select.form-control { .form-group-lg select.form-control {
height: 3.316667rem; height: 3.291667rem;
line-height: 3.316667rem; line-height: 3.291667rem;
} }
.form-group-lg textarea.form-control, .form-group-lg select[multiple].form-control { .form-group-lg textarea.form-control, .form-group-lg select[multiple].form-control {
height: auto; height: auto;
} }
.form-group-lg .form-control-static { .form-group-lg .form-control-static {
height: 3.316667rem; height: 3.291667rem;
min-height: 2.25rem; min-height: 2.25rem;
padding: .75rem 1.5rem; padding: .75rem 1.5rem;
font-size: 1.25rem; font-size: 1.25rem;
@@ -1856,7 +1856,7 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
position: relative; position: relative;
} }
.has-feedback .form-control { .has-feedback .form-control {
padding-right: 3.3125rem; padding-right: 3.28125rem;
} }
.form-control-feedback { .form-control-feedback {
@@ -1865,23 +1865,23 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
right: 0; right: 0;
z-index: 2; z-index: 2;
display: block; display: block;
width: 2.65rem; width: 2.625rem;
height: 2.65rem; height: 2.625rem;
line-height: 2.65rem; line-height: 2.625rem;
text-align: center; text-align: center;
pointer-events: none; pointer-events: none;
} }
.input-lg + .form-control-feedback, .input-group-lg > .form-control + .form-control-feedback, .input-group-lg > .input-group-addon + .form-control-feedback, .input-group-lg > .input-group-btn > .btn + .form-control-feedback, .input-group-lg + .form-control-feedback { .input-lg + .form-control-feedback, .input-group-lg > .form-control + .form-control-feedback, .input-group-lg > .input-group-addon + .form-control-feedback, .input-group-lg > .input-group-btn > .btn + .form-control-feedback, .input-group-lg + .form-control-feedback {
width: 3.316667rem; width: 3.291667rem;
height: 3.316667rem; height: 3.291667rem;
line-height: 3.316667rem; line-height: 3.291667rem;
} }
.input-sm + .form-control-feedback, .input-group-sm > .form-control + .form-control-feedback, .input-group-sm > .input-group-addon + .form-control-feedback, .input-group-sm > .input-group-btn > .btn + .form-control-feedback, .input-group-sm + .form-control-feedback { .input-sm + .form-control-feedback, .input-group-sm > .form-control + .form-control-feedback, .input-group-sm > .input-group-addon + .form-control-feedback, .input-group-sm > .input-group-btn > .btn + .form-control-feedback, .input-group-sm + .form-control-feedback {
width: 2.025rem; width: 2rem;
height: 2.025rem; height: 2rem;
line-height: 2.025rem; line-height: 2rem;
} }
.has-success .help-block, .has-success .control-label, .has-success .radio, .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline, .has-success.radio label, .has-success.checkbox label, .has-success.radio-inline label, .has-success.checkbox-inline label { .has-success .help-block, .has-success .control-label, .has-success .radio, .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline, .has-success.radio label, .has-success.checkbox label, .has-success.radio-inline label, .has-success.checkbox-inline label {
@@ -2054,7 +2054,7 @@ textarea.input-lg, .input-group-lg > textarea.form-control, .input-group-lg > te
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
border: .075rem solid transparent; border: .0625rem solid transparent;
border-radius: .25rem; border-radius: .25rem;
-webkit-transition: all .2s ease-in-out; -webkit-transition: all .2s ease-in-out;
-o-transition: all .2s ease-in-out; -o-transition: all .2s ease-in-out;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -46,7 +46,7 @@ $spacer: 1rem !default;
$spacer-x: $spacer !default; $spacer-x: $spacer !default;
$spacer-y: $spacer !default; $spacer-y: $spacer !default;
$border-width: .075rem !default; $border-width: .0625rem !default;
$use-hover-media-query: false !default; $use-hover-media-query: false !default;