diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-05-19 13:25:00 +0200 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-05-19 13:25:00 +0200 |
| commit | 429140df97a2c273fba6974147ac2e48e7688263 (patch) | |
| tree | 2e337542da1b0f4c9c383dfeb8a7d9eb63990a72 /vendor/twbs/bootstrap/scss/bootstrap-grid.scss | |
| parent | f92d2e3f7c6573bd7bab04223c7e28662605c6d8 (diff) | |
| parent | af2b263bc74b16601ec7c123a58f0549613aed27 (diff) | |
| download | volse-hubzilla-429140df97a2c273fba6974147ac2e48e7688263.tar.gz volse-hubzilla-429140df97a2c273fba6974147ac2e48e7688263.tar.bz2 volse-hubzilla-429140df97a2c273fba6974147ac2e48e7688263.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'vendor/twbs/bootstrap/scss/bootstrap-grid.scss')
| -rw-r--r-- | vendor/twbs/bootstrap/scss/bootstrap-grid.scss | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/vendor/twbs/bootstrap/scss/bootstrap-grid.scss b/vendor/twbs/bootstrap/scss/bootstrap-grid.scss index 509171d4d..d5f92a16a 100644 --- a/vendor/twbs/bootstrap/scss/bootstrap-grid.scss +++ b/vendor/twbs/bootstrap/scss/bootstrap-grid.scss @@ -1,14 +1,10 @@ /*! - * Bootstrap Grid v4.1.3 (https://getbootstrap.com/) - * Copyright 2011-2018 The Bootstrap Authors - * Copyright 2011-2018 Twitter, Inc. + * Bootstrap Grid v4.3.1 (https://getbootstrap.com/) + * Copyright 2011-2019 The Bootstrap Authors + * Copyright 2011-2019 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -@at-root { - @-ms-viewport { width: device-width; } // stylelint-disable-line at-rule-no-vendor-prefix -} - html { box-sizing: border-box; -ms-overflow-style: scrollbar; @@ -30,3 +26,4 @@ html { @import "grid"; @import "utilities/display"; @import "utilities/flex"; +@import "utilities/spacing"; |