aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap-grid.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-05-31 21:29:23 -0700
committerMark Otto <[email protected]>2017-05-31 21:29:23 -0700
commitf13eb5194019b460eb01cdb251c81c76b2e7d5d0 (patch)
tree178410fd574e52b9a0850273dacea566efa2aef0 /dist/css/bootstrap-grid.css
parent8a6642bbff3b86a24fc47cad42f5a23af80f057a (diff)
parent620257456ed0685cae6b6ff51d2ab1e37f02a4fa (diff)
downloadbootstrap-f13eb5194019b460eb01cdb251c81c76b2e7d5d0.tar.xz
bootstrap-f13eb5194019b460eb01cdb251c81c76b2e7d5d0.zip
Merge branch 'v4-dev' into form-tweaks
Diffstat (limited to 'dist/css/bootstrap-grid.css')
-rw-r--r--dist/css/bootstrap-grid.css20
1 files changed, 5 insertions, 15 deletions
diff --git a/dist/css/bootstrap-grid.css b/dist/css/bootstrap-grid.css
index 62cf59d7e..248d4ecb9 100644
--- a/dist/css/bootstrap-grid.css
+++ b/dist/css/bootstrap-grid.css
@@ -243,6 +243,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
+ max-width: none;
}
.col-1 {
@@ -506,6 +507,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
+ max-width: none;
}
.col-sm-1 {
-webkit-box-flex: 0;
@@ -724,6 +726,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
+ max-width: none;
}
.col-md-1 {
-webkit-box-flex: 0;
@@ -942,6 +945,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
+ max-width: none;
}
.col-lg-1 {
-webkit-box-flex: 0;
@@ -1160,6 +1164,7 @@ html {
-ms-flex: 0 0 auto;
flex: 0 0 auto;
width: auto;
+ max-width: none;
}
.col-xl-1 {
-webkit-box-flex: 0;
@@ -1540,7 +1545,6 @@ html {
.align-self-auto {
-webkit-align-self: auto !important;
-ms-flex-item-align: auto !important;
- -ms-grid-row-align: auto !important;
align-self: auto !important;
}
@@ -1559,7 +1563,6 @@ html {
.align-self-center {
-webkit-align-self: center !important;
-ms-flex-item-align: center !important;
- -ms-grid-row-align: center !important;
align-self: center !important;
}
@@ -1572,7 +1575,6 @@ html {
.align-self-stretch {
-webkit-align-self: stretch !important;
-ms-flex-item-align: stretch !important;
- -ms-grid-row-align: stretch !important;
align-self: stretch !important;
}
@@ -1730,7 +1732,6 @@ html {
.align-self-sm-auto {
-webkit-align-self: auto !important;
-ms-flex-item-align: auto !important;
- -ms-grid-row-align: auto !important;
align-self: auto !important;
}
.align-self-sm-start {
@@ -1746,7 +1747,6 @@ html {
.align-self-sm-center {
-webkit-align-self: center !important;
-ms-flex-item-align: center !important;
- -ms-grid-row-align: center !important;
align-self: center !important;
}
.align-self-sm-baseline {
@@ -1757,7 +1757,6 @@ html {
.align-self-sm-stretch {
-webkit-align-self: stretch !important;
-ms-flex-item-align: stretch !important;
- -ms-grid-row-align: stretch !important;
align-self: stretch !important;
}
}
@@ -1916,7 +1915,6 @@ html {
.align-self-md-auto {
-webkit-align-self: auto !important;
-ms-flex-item-align: auto !important;
- -ms-grid-row-align: auto !important;
align-self: auto !important;
}
.align-self-md-start {
@@ -1932,7 +1930,6 @@ html {
.align-self-md-center {
-webkit-align-self: center !important;
-ms-flex-item-align: center !important;
- -ms-grid-row-align: center !important;
align-self: center !important;
}
.align-self-md-baseline {
@@ -1943,7 +1940,6 @@ html {
.align-self-md-stretch {
-webkit-align-self: stretch !important;
-ms-flex-item-align: stretch !important;
- -ms-grid-row-align: stretch !important;
align-self: stretch !important;
}
}
@@ -2102,7 +2098,6 @@ html {
.align-self-lg-auto {
-webkit-align-self: auto !important;
-ms-flex-item-align: auto !important;
- -ms-grid-row-align: auto !important;
align-self: auto !important;
}
.align-self-lg-start {
@@ -2118,7 +2113,6 @@ html {
.align-self-lg-center {
-webkit-align-self: center !important;
-ms-flex-item-align: center !important;
- -ms-grid-row-align: center !important;
align-self: center !important;
}
.align-self-lg-baseline {
@@ -2129,7 +2123,6 @@ html {
.align-self-lg-stretch {
-webkit-align-self: stretch !important;
-ms-flex-item-align: stretch !important;
- -ms-grid-row-align: stretch !important;
align-self: stretch !important;
}
}
@@ -2288,7 +2281,6 @@ html {
.align-self-xl-auto {
-webkit-align-self: auto !important;
-ms-flex-item-align: auto !important;
- -ms-grid-row-align: auto !important;
align-self: auto !important;
}
.align-self-xl-start {
@@ -2304,7 +2296,6 @@ html {
.align-self-xl-center {
-webkit-align-self: center !important;
-ms-flex-item-align: center !important;
- -ms-grid-row-align: center !important;
align-self: center !important;
}
.align-self-xl-baseline {
@@ -2315,7 +2306,6 @@ html {
.align-self-xl-stretch {
-webkit-align-self: stretch !important;
-ms-flex-item-align: stretch !important;
- -ms-grid-row-align: stretch !important;
align-self: stretch !important;
}
}