mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-23 18:40:03 +00:00
Set border-box globally instead
This commit is contained in:
parent
6e8ee02421
commit
d219b8b964
18
docs/assets/css/bootstrap.css
vendored
18
docs/assets/css/bootstrap.css
vendored
@ -265,6 +265,12 @@ table {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
* {
|
||||||
|
-webkit-box-sizing: border-box;
|
||||||
|
-moz-box-sizing: border-box;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
html {
|
html {
|
||||||
font-size: 62.5%;
|
font-size: 62.5%;
|
||||||
-webkit-overflow-scrolling: touch;
|
-webkit-overflow-scrolling: touch;
|
||||||
@ -730,9 +736,6 @@ pre code {
|
|||||||
min-height: 1px;
|
min-height: 1px;
|
||||||
padding-right: 10px;
|
padding-right: 10px;
|
||||||
padding-left: 10px;
|
padding-left: 10px;
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
-moz-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 768px) {
|
@media screen and (min-width: 768px) {
|
||||||
@ -1065,9 +1068,6 @@ input[type="color"] {
|
|||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
||||||
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
-moz-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
|
||||||
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
|
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
|
||||||
-moz-transition: border linear 0.2s, box-shadow linear 0.2s;
|
-moz-transition: border linear 0.2s, box-shadow linear 0.2s;
|
||||||
-o-transition: border linear 0.2s, box-shadow linear 0.2s;
|
-o-transition: border linear 0.2s, box-shadow linear 0.2s;
|
||||||
@ -1663,9 +1663,6 @@ fieldset[disabled] .btn {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
-moz-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-block + .btn-block {
|
.btn-block + .btn-block {
|
||||||
@ -4419,9 +4416,6 @@ a.badge:focus {
|
|||||||
background-color: #428bca;
|
background-color: #428bca;
|
||||||
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
|
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
|
||||||
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
|
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
-moz-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
|
||||||
-webkit-transition: width 0.6s ease;
|
-webkit-transition: width 0.6s ease;
|
||||||
-moz-transition: width 0.6s ease;
|
-moz-transition: width 0.6s ease;
|
||||||
-o-transition: width 0.6s ease;
|
-o-transition: width 0.6s ease;
|
||||||
|
@ -87,7 +87,6 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
.box-sizing(border-box);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Vertically space out multiple block buttons
|
// Vertically space out multiple block buttons
|
||||||
|
@ -55,7 +55,6 @@ input[type="search"],
|
|||||||
input[type="tel"],
|
input[type="tel"],
|
||||||
input[type="color"] {
|
input[type="color"] {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
.box-sizing(border-box); // Makes inputs behave like true block-level elements
|
|
||||||
min-height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
|
min-height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
|
||||||
padding: 6px 9px;
|
padding: 6px 9px;
|
||||||
// margin-bottom: @line-height-base / 2;
|
// margin-bottom: @line-height-base / 2;
|
||||||
|
@ -18,10 +18,6 @@
|
|||||||
min-height: 1px;
|
min-height: 1px;
|
||||||
padding-left: @grid-gutter-width / 2;
|
padding-left: @grid-gutter-width / 2;
|
||||||
padding-right: @grid-gutter-width / 2;
|
padding-right: @grid-gutter-width / 2;
|
||||||
// Proper box-model (padding doesn't add to width)
|
|
||||||
-webkit-box-sizing: border-box;
|
|
||||||
-moz-box-sizing: border-box;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Responsive: Tablets and up
|
// Responsive: Tablets and up
|
||||||
|
@ -62,7 +62,6 @@
|
|||||||
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
|
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
|
||||||
background-color: @progress-bar-bg;
|
background-color: @progress-bar-bg;
|
||||||
.box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
|
.box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
|
||||||
.box-sizing(border-box);
|
|
||||||
.transition(width .6s ease);
|
.transition(width .6s ease);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,6 +3,16 @@
|
|||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
// Reset the box-sizing
|
||||||
|
// -------------------------
|
||||||
|
|
||||||
|
* {
|
||||||
|
-webkit-box-sizing: border-box;
|
||||||
|
-moz-box-sizing: border-box;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Body reset
|
// Body reset
|
||||||
// -------------------------
|
// -------------------------
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user