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-reboot.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-reboot.scss')
| -rw-r--r-- | vendor/twbs/bootstrap/scss/bootstrap-reboot.scss | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vendor/twbs/bootstrap/scss/bootstrap-reboot.scss b/vendor/twbs/bootstrap/scss/bootstrap-reboot.scss index 2b6cfc2f8..72444f6c1 100644 --- a/vendor/twbs/bootstrap/scss/bootstrap-reboot.scss +++ b/vendor/twbs/bootstrap/scss/bootstrap-reboot.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Reboot v4.6.0 (https://getbootstrap.com/) + * Bootstrap Reboot 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) @@ -8,5 +8,8 @@ @import "functions"; @import "variables"; +// Prevent the usage of custom properties since we don't add them to `:root` in reboot +$font-family-base: $font-family-sans-serif; // stylelint-disable-line scss/dollar-variable-default +$font-family-code: $font-family-monospace; // stylelint-disable-line scss/dollar-variable-default @import "mixins"; @import "reboot"; |