diff options
| author | Mario <mario@mariovavti.com> | 2021-07-29 09:31:47 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-07-29 09:31:47 +0000 |
| commit | cb57c4ea188b982119f515f043a72f037f943025 (patch) | |
| tree | 11144c1107f16047ed37f543fc34859d0c649e08 /vendor/twbs/bootstrap/scss/bootstrap.scss | |
| parent | c6133d2558ce29e44342fa7be8bb65e0059aea02 (diff) | |
| parent | b7ffec6fbe77eff3c550a922f50bd79321b293ed (diff) | |
| download | volse-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.scss')
| -rw-r--r-- | vendor/twbs/bootstrap/scss/bootstrap.scss | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/vendor/twbs/bootstrap/scss/bootstrap.scss b/vendor/twbs/bootstrap/scss/bootstrap.scss index e86c49da5..eb047a3f2 100644 --- a/vendor/twbs/bootstrap/scss/bootstrap.scss +++ b/vendor/twbs/bootstrap/scss/bootstrap.scss @@ -1,18 +1,23 @@ /*! - * Bootstrap v4.6.0 (https://getbootstrap.com/) + * Bootstrap 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) */ +// scss-docs-start import-stack +// Configuration @import "functions"; @import "variables"; @import "mixins"; +@import "utilities"; + +// Layout & components @import "root"; @import "reboot"; @import "type"; @import "images"; -@import "code"; +@import "containers"; @import "grid"; @import "tables"; @import "forms"; @@ -20,18 +25,15 @@ @import "transitions"; @import "dropdown"; @import "button-group"; -@import "input-group"; -@import "custom-forms"; @import "nav"; @import "navbar"; @import "card"; +@import "accordion"; @import "breadcrumb"; @import "pagination"; @import "badge"; -@import "jumbotron"; @import "alert"; @import "progress"; -@import "media"; @import "list-group"; @import "close"; @import "toasts"; @@ -40,5 +42,11 @@ @import "popover"; @import "carousel"; @import "spinners"; -@import "utilities"; -@import "print"; +@import "offcanvas"; + +// Helpers +@import "helpers"; + +// Utilities +@import "utilities/api"; +// scss-docs-end import-stack |