aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/twbs/bootstrap/scss/bootstrap-grid.scss
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-07-29 09:31:47 +0000
committerMario <mario@mariovavti.com>2021-07-29 09:31:47 +0000
commitcb57c4ea188b982119f515f043a72f037f943025 (patch)
tree11144c1107f16047ed37f543fc34859d0c649e08 /vendor/twbs/bootstrap/scss/bootstrap-grid.scss
parentc6133d2558ce29e44342fa7be8bb65e0059aea02 (diff)
parentb7ffec6fbe77eff3c550a922f50bd79321b293ed (diff)
downloadvolse-hubzilla-cb57c4ea188b982119f515f043a72f037f943025.tar.gz
volse-hubzilla-cb57c4ea188b982119f515f043a72f037f943025.tar.bz2
volse-hubzilla-cb57c4ea188b982119f515f043a72f037f943025.zip
Merge branch 'bs5' into 'dev'
Update to bootstrap 5 and implement next generation app menu (work in progress) See merge request hubzilla/core!1980
Diffstat (limited to 'vendor/twbs/bootstrap/scss/bootstrap-grid.scss')
-rw-r--r--vendor/twbs/bootstrap/scss/bootstrap-grid.scss67
1 files changed, 51 insertions, 16 deletions
diff --git a/vendor/twbs/bootstrap/scss/bootstrap-grid.scss b/vendor/twbs/bootstrap/scss/bootstrap-grid.scss
index 6a6648377..bcd8c19cf 100644
--- a/vendor/twbs/bootstrap/scss/bootstrap-grid.scss
+++ b/vendor/twbs/bootstrap/scss/bootstrap-grid.scss
@@ -1,30 +1,65 @@
/*!
- * Bootstrap Grid v4.6.0 (https://getbootstrap.com/)
+ * Bootstrap Grid v5.0.2 (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 "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";