diff options
| author | mjfriaza <mjfriaza@disroot.org> | 2022-05-17 13:44:06 +0200 |
|---|---|---|
| committer | mjfriaza <mjfriaza@disroot.org> | 2022-05-17 13:44:06 +0200 |
| commit | a75c61d71efebf43713026200aa0f513bd7eef09 (patch) | |
| tree | 909048adeaa329813e2530d43626ed3bd711bc25 /vendor/twbs/bootstrap/scss/bootstrap-grid.scss | |
| parent | 481ecee9e87342ca7a1217395085e95d1a3b61ea (diff) | |
| parent | 0d0f73fb67bbfcc53058cefded85ac36f951c7a7 (diff) | |
| download | volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.tar.gz volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.tar.bz2 volse-hubzilla-a75c61d71efebf43713026200aa0f513bd7eef09.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 | 69 |
1 files changed, 53 insertions, 16 deletions
diff --git a/vendor/twbs/bootstrap/scss/bootstrap-grid.scss b/vendor/twbs/bootstrap/scss/bootstrap-grid.scss index 6a6648377..d4a37a063 100644 --- a/vendor/twbs/bootstrap/scss/bootstrap-grid.scss +++ b/vendor/twbs/bootstrap/scss/bootstrap-grid.scss @@ -1,30 +1,67 @@ /*! - * Bootstrap Grid v4.6.0 (https://getbootstrap.com/) + * Bootstrap Grid v5.1.3 (https://getbootstrap.com/) * Copyright 2011-2021 The Bootstrap Authors * Copyright 2011-2021 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ -html { - box-sizing: border-box; - -ms-overflow-style: scrollbar; -} - -*, -*::before, -*::after { - box-sizing: inherit; -} +$include-column-box-sizing: true !default; @import "functions"; @import "variables"; -@import "mixins/deprecate"; +@import "mixins/lists"; @import "mixins/breakpoints"; -@import "mixins/grid-framework"; +@import "mixins/container"; @import "mixins/grid"; +@import "mixins/utilities"; + +@import "vendor/rfs"; + +@import "root"; +@import "containers"; @import "grid"; -@import "utilities/display"; -@import "utilities/flex"; -@import "utilities/spacing"; + +@import "utilities"; +// Only use the utilities we need +// stylelint-disable-next-line scss/dollar-variable-default +$utilities: map-get-multiple( + $utilities, + ( + "display", + "order", + "flex", + "flex-direction", + "flex-grow", + "flex-shrink", + "flex-wrap", + "justify-content", + "align-items", + "align-content", + "align-self", + "margin", + "margin-x", + "margin-y", + "margin-top", + "margin-end", + "margin-bottom", + "margin-start", + "negative-margin", + "negative-margin-x", + "negative-margin-y", + "negative-margin-top", + "negative-margin-end", + "negative-margin-bottom", + "negative-margin-start", + "padding", + "padding-x", + "padding-y", + "padding-top", + "padding-end", + "padding-bottom", + "padding-start", + ) +); + +@import "utilities/api"; |