diff --git a/assets/javascripts/bootstrap-sprockets.js b/assets/javascripts/bootstrap-sprockets.js deleted file mode 100644 index 23e156c6..00000000 --- a/assets/javascripts/bootstrap-sprockets.js +++ /dev/null @@ -1,28 +0,0 @@ -//= require ./bootstrap-global-this-define -//= require ./bootstrap/dom/data -//= require ./bootstrap/util/index -//= require ./bootstrap/dom/event-handler -//= require ./bootstrap/dom/manipulator -//= require ./bootstrap/util/config -//= require ./bootstrap/base-component -//= require ./bootstrap/dom/selector-engine -//= require ./bootstrap/util/backdrop -//= require ./bootstrap/util/component-functions -//= require ./bootstrap/util/focustrap -//= require ./bootstrap/util/scrollbar -//= require ./bootstrap/offcanvas -//= require ./bootstrap/dropdown -//= require ./bootstrap/util/sanitizer -//= require ./bootstrap/util/template-factory -//= require ./bootstrap/tooltip -//= require ./bootstrap/toast -//= require ./bootstrap/popover -//= require ./bootstrap/util/swipe -//= require ./bootstrap/alert -//= require ./bootstrap/button -//= require ./bootstrap/carousel -//= require ./bootstrap/modal -//= require ./bootstrap/collapse -//= require ./bootstrap/scrollspy -//= require ./bootstrap/tab -//= require ./bootstrap-global-this-undefine diff --git a/assets/javascripts/bootstrap-global-this-define.js b/assets/javascripts/bootstrap5-global-this-define.js similarity index 100% rename from assets/javascripts/bootstrap-global-this-define.js rename to assets/javascripts/bootstrap5-global-this-define.js diff --git a/assets/javascripts/bootstrap-global-this-undefine.js b/assets/javascripts/bootstrap5-global-this-undefine.js similarity index 100% rename from assets/javascripts/bootstrap-global-this-undefine.js rename to assets/javascripts/bootstrap5-global-this-undefine.js diff --git a/assets/javascripts/bootstrap5-sprockets.js b/assets/javascripts/bootstrap5-sprockets.js new file mode 100644 index 00000000..027f79e9 --- /dev/null +++ b/assets/javascripts/bootstrap5-sprockets.js @@ -0,0 +1,28 @@ +//= require ./bootstrap5-global-this-define +//= require ./bootstrap5/dom/data +//= require ./bootstrap5/util/index +//= require ./bootstrap5/dom/event-handler +//= require ./bootstrap5/dom/manipulator +//= require ./bootstrap5/util/config +//= require ./bootstrap5/base-component +//= require ./bootstrap5/dom/selector-engine +//= require ./bootstrap5/util/backdrop +//= require ./bootstrap5/util/component-functions +//= require ./bootstrap5/util/focustrap +//= require ./bootstrap5/util/scrollbar +//= require ./bootstrap5/offcanvas +//= require ./bootstrap5/dropdown +//= require ./bootstrap5/util/sanitizer +//= require ./bootstrap5/util/template-factory +//= require ./bootstrap5/tooltip +//= require ./bootstrap5/toast +//= require ./bootstrap5/popover +//= require ./bootstrap5/util/swipe +//= require ./bootstrap5/alert +//= require ./bootstrap5/button +//= require ./bootstrap5/carousel +//= require ./bootstrap5/modal +//= require ./bootstrap5/collapse +//= require ./bootstrap5/scrollspy +//= require ./bootstrap5/tab +//= require ./bootstrap5-global-this-undefine diff --git a/assets/javascripts/bootstrap.js b/assets/javascripts/bootstrap5.js similarity index 100% rename from assets/javascripts/bootstrap.js rename to assets/javascripts/bootstrap5.js diff --git a/assets/javascripts/bootstrap.min.js b/assets/javascripts/bootstrap5.min.js similarity index 100% rename from assets/javascripts/bootstrap.min.js rename to assets/javascripts/bootstrap5.min.js diff --git a/assets/javascripts/bootstrap/alert.js b/assets/javascripts/bootstrap5/alert.js similarity index 100% rename from assets/javascripts/bootstrap/alert.js rename to assets/javascripts/bootstrap5/alert.js diff --git a/assets/javascripts/bootstrap/base-component.js b/assets/javascripts/bootstrap5/base-component.js similarity index 100% rename from assets/javascripts/bootstrap/base-component.js rename to assets/javascripts/bootstrap5/base-component.js diff --git a/assets/javascripts/bootstrap/button.js b/assets/javascripts/bootstrap5/button.js similarity index 100% rename from assets/javascripts/bootstrap/button.js rename to assets/javascripts/bootstrap5/button.js diff --git a/assets/javascripts/bootstrap/carousel.js b/assets/javascripts/bootstrap5/carousel.js similarity index 100% rename from assets/javascripts/bootstrap/carousel.js rename to assets/javascripts/bootstrap5/carousel.js diff --git a/assets/javascripts/bootstrap/collapse.js b/assets/javascripts/bootstrap5/collapse.js similarity index 100% rename from assets/javascripts/bootstrap/collapse.js rename to assets/javascripts/bootstrap5/collapse.js diff --git a/assets/javascripts/bootstrap/dom/data.js b/assets/javascripts/bootstrap5/dom/data.js similarity index 100% rename from assets/javascripts/bootstrap/dom/data.js rename to assets/javascripts/bootstrap5/dom/data.js diff --git a/assets/javascripts/bootstrap/dom/event-handler.js b/assets/javascripts/bootstrap5/dom/event-handler.js similarity index 100% rename from assets/javascripts/bootstrap/dom/event-handler.js rename to assets/javascripts/bootstrap5/dom/event-handler.js diff --git a/assets/javascripts/bootstrap/dom/manipulator.js b/assets/javascripts/bootstrap5/dom/manipulator.js similarity index 100% rename from assets/javascripts/bootstrap/dom/manipulator.js rename to assets/javascripts/bootstrap5/dom/manipulator.js diff --git a/assets/javascripts/bootstrap/dom/selector-engine.js b/assets/javascripts/bootstrap5/dom/selector-engine.js similarity index 100% rename from assets/javascripts/bootstrap/dom/selector-engine.js rename to assets/javascripts/bootstrap5/dom/selector-engine.js diff --git a/assets/javascripts/bootstrap/dropdown.js b/assets/javascripts/bootstrap5/dropdown.js similarity index 100% rename from assets/javascripts/bootstrap/dropdown.js rename to assets/javascripts/bootstrap5/dropdown.js diff --git a/assets/javascripts/bootstrap/modal.js b/assets/javascripts/bootstrap5/modal.js similarity index 100% rename from assets/javascripts/bootstrap/modal.js rename to assets/javascripts/bootstrap5/modal.js diff --git a/assets/javascripts/bootstrap/offcanvas.js b/assets/javascripts/bootstrap5/offcanvas.js similarity index 100% rename from assets/javascripts/bootstrap/offcanvas.js rename to assets/javascripts/bootstrap5/offcanvas.js diff --git a/assets/javascripts/bootstrap/popover.js b/assets/javascripts/bootstrap5/popover.js similarity index 100% rename from assets/javascripts/bootstrap/popover.js rename to assets/javascripts/bootstrap5/popover.js diff --git a/assets/javascripts/bootstrap/scrollspy.js b/assets/javascripts/bootstrap5/scrollspy.js similarity index 100% rename from assets/javascripts/bootstrap/scrollspy.js rename to assets/javascripts/bootstrap5/scrollspy.js diff --git a/assets/javascripts/bootstrap/tab.js b/assets/javascripts/bootstrap5/tab.js similarity index 100% rename from assets/javascripts/bootstrap/tab.js rename to assets/javascripts/bootstrap5/tab.js diff --git a/assets/javascripts/bootstrap/toast.js b/assets/javascripts/bootstrap5/toast.js similarity index 100% rename from assets/javascripts/bootstrap/toast.js rename to assets/javascripts/bootstrap5/toast.js diff --git a/assets/javascripts/bootstrap/tooltip.js b/assets/javascripts/bootstrap5/tooltip.js similarity index 100% rename from assets/javascripts/bootstrap/tooltip.js rename to assets/javascripts/bootstrap5/tooltip.js diff --git a/assets/javascripts/bootstrap/util/backdrop.js b/assets/javascripts/bootstrap5/util/backdrop.js similarity index 100% rename from assets/javascripts/bootstrap/util/backdrop.js rename to assets/javascripts/bootstrap5/util/backdrop.js diff --git a/assets/javascripts/bootstrap/util/component-functions.js b/assets/javascripts/bootstrap5/util/component-functions.js similarity index 100% rename from assets/javascripts/bootstrap/util/component-functions.js rename to assets/javascripts/bootstrap5/util/component-functions.js diff --git a/assets/javascripts/bootstrap/util/config.js b/assets/javascripts/bootstrap5/util/config.js similarity index 100% rename from assets/javascripts/bootstrap/util/config.js rename to assets/javascripts/bootstrap5/util/config.js diff --git a/assets/javascripts/bootstrap/util/focustrap.js b/assets/javascripts/bootstrap5/util/focustrap.js similarity index 100% rename from assets/javascripts/bootstrap/util/focustrap.js rename to assets/javascripts/bootstrap5/util/focustrap.js diff --git a/assets/javascripts/bootstrap/util/index.js b/assets/javascripts/bootstrap5/util/index.js similarity index 100% rename from assets/javascripts/bootstrap/util/index.js rename to assets/javascripts/bootstrap5/util/index.js diff --git a/assets/javascripts/bootstrap/util/sanitizer.js b/assets/javascripts/bootstrap5/util/sanitizer.js similarity index 100% rename from assets/javascripts/bootstrap/util/sanitizer.js rename to assets/javascripts/bootstrap5/util/sanitizer.js diff --git a/assets/javascripts/bootstrap/util/scrollbar.js b/assets/javascripts/bootstrap5/util/scrollbar.js similarity index 100% rename from assets/javascripts/bootstrap/util/scrollbar.js rename to assets/javascripts/bootstrap5/util/scrollbar.js diff --git a/assets/javascripts/bootstrap/util/swipe.js b/assets/javascripts/bootstrap5/util/swipe.js similarity index 100% rename from assets/javascripts/bootstrap/util/swipe.js rename to assets/javascripts/bootstrap5/util/swipe.js diff --git a/assets/javascripts/bootstrap/util/template-factory.js b/assets/javascripts/bootstrap5/util/template-factory.js similarity index 100% rename from assets/javascripts/bootstrap/util/template-factory.js rename to assets/javascripts/bootstrap5/util/template-factory.js diff --git a/assets/stylesheets/_bootstrap.scss b/assets/stylesheets/_bootstrap.scss deleted file mode 100644 index c2dfdf3a..00000000 --- a/assets/stylesheets/_bootstrap.scss +++ /dev/null @@ -1,52 +0,0 @@ -@import "bootstrap/mixins/banner"; -@include bsBanner(""); - - -// scss-docs-start import-stack -// Configuration -@import "bootstrap/functions"; -@import "bootstrap/variables"; -@import "bootstrap/variables-dark"; -@import "bootstrap/maps"; -@import "bootstrap/mixins"; -@import "bootstrap/utilities"; - -// Layout & components -@import "bootstrap/root"; -@import "bootstrap/reboot"; -@import "bootstrap/type"; -@import "bootstrap/images"; -@import "bootstrap/containers"; -@import "bootstrap/grid"; -@import "bootstrap/tables"; -@import "bootstrap/forms"; -@import "bootstrap/buttons"; -@import "bootstrap/transitions"; -@import "bootstrap/dropdown"; -@import "bootstrap/button-group"; -@import "bootstrap/nav"; -@import "bootstrap/navbar"; -@import "bootstrap/card"; -@import "bootstrap/accordion"; -@import "bootstrap/breadcrumb"; -@import "bootstrap/pagination"; -@import "bootstrap/badge"; -@import "bootstrap/alert"; -@import "bootstrap/progress"; -@import "bootstrap/list-group"; -@import "bootstrap/close"; -@import "bootstrap/toasts"; -@import "bootstrap/modal"; -@import "bootstrap/tooltip"; -@import "bootstrap/popover"; -@import "bootstrap/carousel"; -@import "bootstrap/spinners"; -@import "bootstrap/offcanvas"; -@import "bootstrap/placeholders"; - -// Helpers -@import "bootstrap/helpers"; - -// Utilities -@import "bootstrap/utilities/api"; -// scss-docs-end import-stack diff --git a/assets/stylesheets/_bootstrap-grid.scss b/assets/stylesheets/_bootstrap5-grid.scss similarity index 100% rename from assets/stylesheets/_bootstrap-grid.scss rename to assets/stylesheets/_bootstrap5-grid.scss diff --git a/assets/stylesheets/_bootstrap-reboot.scss b/assets/stylesheets/_bootstrap5-reboot.scss similarity index 100% rename from assets/stylesheets/_bootstrap-reboot.scss rename to assets/stylesheets/_bootstrap5-reboot.scss diff --git a/assets/stylesheets/_bootstrap-utilities.scss b/assets/stylesheets/_bootstrap5-utilities.scss similarity index 100% rename from assets/stylesheets/_bootstrap-utilities.scss rename to assets/stylesheets/_bootstrap5-utilities.scss diff --git a/assets/stylesheets/_bootstrap5.scss b/assets/stylesheets/_bootstrap5.scss new file mode 100644 index 00000000..460457fb --- /dev/null +++ b/assets/stylesheets/_bootstrap5.scss @@ -0,0 +1,52 @@ +@import "bootstrap5/mixins/banner"; +@include bsBanner(""); + + +// scss-docs-start import-stack +// Configuration +@import "bootstrap5/functions"; +@import "bootstrap5/variables"; +@import "bootstrap5/variables-dark"; +@import "bootstrap5/maps"; +@import "bootstrap5/mixins"; +@import "bootstrap5/utilities"; + +// Layout & components +@import "bootstrap5/root"; +@import "bootstrap5/reboot"; +@import "bootstrap5/type"; +@import "bootstrap5/images"; +@import "bootstrap5/containers"; +@import "bootstrap5/grid"; +@import "bootstrap5/tables"; +@import "bootstrap5/forms"; +@import "bootstrap5/buttons"; +@import "bootstrap5/transitions"; +@import "bootstrap5/dropdown"; +@import "bootstrap5/button-group"; +@import "bootstrap5/nav"; +@import "bootstrap5/navbar"; +@import "bootstrap5/card"; +@import "bootstrap5/accordion"; +@import "bootstrap5/breadcrumb"; +@import "bootstrap5/pagination"; +@import "bootstrap5/badge"; +@import "bootstrap5/alert"; +@import "bootstrap5/progress"; +@import "bootstrap5/list-group"; +@import "bootstrap5/close"; +@import "bootstrap5/toasts"; +@import "bootstrap5/modal"; +@import "bootstrap5/tooltip"; +@import "bootstrap5/popover"; +@import "bootstrap5/carousel"; +@import "bootstrap5/spinners"; +@import "bootstrap5/offcanvas"; +@import "bootstrap5/placeholders"; + +// Helpers +@import "bootstrap5/helpers"; + +// Utilities +@import "bootstrap5/utilities/api"; +// scss-docs-end import-stack diff --git a/assets/stylesheets/bootstrap/_accordion.scss b/assets/stylesheets/bootstrap5/_accordion.scss similarity index 100% rename from assets/stylesheets/bootstrap/_accordion.scss rename to assets/stylesheets/bootstrap5/_accordion.scss diff --git a/assets/stylesheets/bootstrap/_alert.scss b/assets/stylesheets/bootstrap5/_alert.scss similarity index 100% rename from assets/stylesheets/bootstrap/_alert.scss rename to assets/stylesheets/bootstrap5/_alert.scss diff --git a/assets/stylesheets/bootstrap/_badge.scss b/assets/stylesheets/bootstrap5/_badge.scss similarity index 100% rename from assets/stylesheets/bootstrap/_badge.scss rename to assets/stylesheets/bootstrap5/_badge.scss diff --git a/assets/stylesheets/bootstrap/_breadcrumb.scss b/assets/stylesheets/bootstrap5/_breadcrumb.scss similarity index 100% rename from assets/stylesheets/bootstrap/_breadcrumb.scss rename to assets/stylesheets/bootstrap5/_breadcrumb.scss diff --git a/assets/stylesheets/bootstrap/_button-group.scss b/assets/stylesheets/bootstrap5/_button-group.scss similarity index 100% rename from assets/stylesheets/bootstrap/_button-group.scss rename to assets/stylesheets/bootstrap5/_button-group.scss diff --git a/assets/stylesheets/bootstrap/_buttons.scss b/assets/stylesheets/bootstrap5/_buttons.scss similarity index 100% rename from assets/stylesheets/bootstrap/_buttons.scss rename to assets/stylesheets/bootstrap5/_buttons.scss diff --git a/assets/stylesheets/bootstrap/_card.scss b/assets/stylesheets/bootstrap5/_card.scss similarity index 100% rename from assets/stylesheets/bootstrap/_card.scss rename to assets/stylesheets/bootstrap5/_card.scss diff --git a/assets/stylesheets/bootstrap/_carousel.scss b/assets/stylesheets/bootstrap5/_carousel.scss similarity index 100% rename from assets/stylesheets/bootstrap/_carousel.scss rename to assets/stylesheets/bootstrap5/_carousel.scss diff --git a/assets/stylesheets/bootstrap/_close.scss b/assets/stylesheets/bootstrap5/_close.scss similarity index 100% rename from assets/stylesheets/bootstrap/_close.scss rename to assets/stylesheets/bootstrap5/_close.scss diff --git a/assets/stylesheets/bootstrap/_containers.scss b/assets/stylesheets/bootstrap5/_containers.scss similarity index 100% rename from assets/stylesheets/bootstrap/_containers.scss rename to assets/stylesheets/bootstrap5/_containers.scss diff --git a/assets/stylesheets/bootstrap/_dropdown.scss b/assets/stylesheets/bootstrap5/_dropdown.scss similarity index 100% rename from assets/stylesheets/bootstrap/_dropdown.scss rename to assets/stylesheets/bootstrap5/_dropdown.scss diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap5/_forms.scss similarity index 100% rename from assets/stylesheets/bootstrap/_forms.scss rename to assets/stylesheets/bootstrap5/_forms.scss diff --git a/assets/stylesheets/bootstrap/_functions.scss b/assets/stylesheets/bootstrap5/_functions.scss similarity index 100% rename from assets/stylesheets/bootstrap/_functions.scss rename to assets/stylesheets/bootstrap5/_functions.scss diff --git a/assets/stylesheets/bootstrap/_grid.scss b/assets/stylesheets/bootstrap5/_grid.scss similarity index 100% rename from assets/stylesheets/bootstrap/_grid.scss rename to assets/stylesheets/bootstrap5/_grid.scss diff --git a/assets/stylesheets/bootstrap/_helpers.scss b/assets/stylesheets/bootstrap5/_helpers.scss similarity index 100% rename from assets/stylesheets/bootstrap/_helpers.scss rename to assets/stylesheets/bootstrap5/_helpers.scss diff --git a/assets/stylesheets/bootstrap/_images.scss b/assets/stylesheets/bootstrap5/_images.scss similarity index 100% rename from assets/stylesheets/bootstrap/_images.scss rename to assets/stylesheets/bootstrap5/_images.scss diff --git a/assets/stylesheets/bootstrap/_list-group.scss b/assets/stylesheets/bootstrap5/_list-group.scss similarity index 100% rename from assets/stylesheets/bootstrap/_list-group.scss rename to assets/stylesheets/bootstrap5/_list-group.scss diff --git a/assets/stylesheets/bootstrap/_maps.scss b/assets/stylesheets/bootstrap5/_maps.scss similarity index 100% rename from assets/stylesheets/bootstrap/_maps.scss rename to assets/stylesheets/bootstrap5/_maps.scss diff --git a/assets/stylesheets/bootstrap/_mixins.scss b/assets/stylesheets/bootstrap5/_mixins.scss similarity index 100% rename from assets/stylesheets/bootstrap/_mixins.scss rename to assets/stylesheets/bootstrap5/_mixins.scss diff --git a/assets/stylesheets/bootstrap/_modal.scss b/assets/stylesheets/bootstrap5/_modal.scss similarity index 100% rename from assets/stylesheets/bootstrap/_modal.scss rename to assets/stylesheets/bootstrap5/_modal.scss diff --git a/assets/stylesheets/bootstrap/_nav.scss b/assets/stylesheets/bootstrap5/_nav.scss similarity index 100% rename from assets/stylesheets/bootstrap/_nav.scss rename to assets/stylesheets/bootstrap5/_nav.scss diff --git a/assets/stylesheets/bootstrap/_navbar.scss b/assets/stylesheets/bootstrap5/_navbar.scss similarity index 100% rename from assets/stylesheets/bootstrap/_navbar.scss rename to assets/stylesheets/bootstrap5/_navbar.scss diff --git a/assets/stylesheets/bootstrap/_offcanvas.scss b/assets/stylesheets/bootstrap5/_offcanvas.scss similarity index 100% rename from assets/stylesheets/bootstrap/_offcanvas.scss rename to assets/stylesheets/bootstrap5/_offcanvas.scss diff --git a/assets/stylesheets/bootstrap/_pagination.scss b/assets/stylesheets/bootstrap5/_pagination.scss similarity index 100% rename from assets/stylesheets/bootstrap/_pagination.scss rename to assets/stylesheets/bootstrap5/_pagination.scss diff --git a/assets/stylesheets/bootstrap/_placeholders.scss b/assets/stylesheets/bootstrap5/_placeholders.scss similarity index 100% rename from assets/stylesheets/bootstrap/_placeholders.scss rename to assets/stylesheets/bootstrap5/_placeholders.scss diff --git a/assets/stylesheets/bootstrap/_popover.scss b/assets/stylesheets/bootstrap5/_popover.scss similarity index 100% rename from assets/stylesheets/bootstrap/_popover.scss rename to assets/stylesheets/bootstrap5/_popover.scss diff --git a/assets/stylesheets/bootstrap/_progress.scss b/assets/stylesheets/bootstrap5/_progress.scss similarity index 100% rename from assets/stylesheets/bootstrap/_progress.scss rename to assets/stylesheets/bootstrap5/_progress.scss diff --git a/assets/stylesheets/bootstrap/_reboot.scss b/assets/stylesheets/bootstrap5/_reboot.scss similarity index 100% rename from assets/stylesheets/bootstrap/_reboot.scss rename to assets/stylesheets/bootstrap5/_reboot.scss diff --git a/assets/stylesheets/bootstrap/_root.scss b/assets/stylesheets/bootstrap5/_root.scss similarity index 100% rename from assets/stylesheets/bootstrap/_root.scss rename to assets/stylesheets/bootstrap5/_root.scss diff --git a/assets/stylesheets/bootstrap/_spinners.scss b/assets/stylesheets/bootstrap5/_spinners.scss similarity index 100% rename from assets/stylesheets/bootstrap/_spinners.scss rename to assets/stylesheets/bootstrap5/_spinners.scss diff --git a/assets/stylesheets/bootstrap/_tables.scss b/assets/stylesheets/bootstrap5/_tables.scss similarity index 100% rename from assets/stylesheets/bootstrap/_tables.scss rename to assets/stylesheets/bootstrap5/_tables.scss diff --git a/assets/stylesheets/bootstrap/_toasts.scss b/assets/stylesheets/bootstrap5/_toasts.scss similarity index 100% rename from assets/stylesheets/bootstrap/_toasts.scss rename to assets/stylesheets/bootstrap5/_toasts.scss diff --git a/assets/stylesheets/bootstrap/_tooltip.scss b/assets/stylesheets/bootstrap5/_tooltip.scss similarity index 100% rename from assets/stylesheets/bootstrap/_tooltip.scss rename to assets/stylesheets/bootstrap5/_tooltip.scss diff --git a/assets/stylesheets/bootstrap/_transitions.scss b/assets/stylesheets/bootstrap5/_transitions.scss similarity index 100% rename from assets/stylesheets/bootstrap/_transitions.scss rename to assets/stylesheets/bootstrap5/_transitions.scss diff --git a/assets/stylesheets/bootstrap/_type.scss b/assets/stylesheets/bootstrap5/_type.scss similarity index 100% rename from assets/stylesheets/bootstrap/_type.scss rename to assets/stylesheets/bootstrap5/_type.scss diff --git a/assets/stylesheets/bootstrap/_utilities.scss b/assets/stylesheets/bootstrap5/_utilities.scss similarity index 100% rename from assets/stylesheets/bootstrap/_utilities.scss rename to assets/stylesheets/bootstrap5/_utilities.scss diff --git a/assets/stylesheets/bootstrap/_variables-dark.scss b/assets/stylesheets/bootstrap5/_variables-dark.scss similarity index 100% rename from assets/stylesheets/bootstrap/_variables-dark.scss rename to assets/stylesheets/bootstrap5/_variables-dark.scss diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap5/_variables.scss similarity index 100% rename from assets/stylesheets/bootstrap/_variables.scss rename to assets/stylesheets/bootstrap5/_variables.scss diff --git a/assets/stylesheets/bootstrap/forms/_floating-labels.scss b/assets/stylesheets/bootstrap5/forms/_floating-labels.scss similarity index 100% rename from assets/stylesheets/bootstrap/forms/_floating-labels.scss rename to assets/stylesheets/bootstrap5/forms/_floating-labels.scss diff --git a/assets/stylesheets/bootstrap/forms/_form-check.scss b/assets/stylesheets/bootstrap5/forms/_form-check.scss similarity index 100% rename from assets/stylesheets/bootstrap/forms/_form-check.scss rename to assets/stylesheets/bootstrap5/forms/_form-check.scss diff --git a/assets/stylesheets/bootstrap/forms/_form-control.scss b/assets/stylesheets/bootstrap5/forms/_form-control.scss similarity index 100% rename from assets/stylesheets/bootstrap/forms/_form-control.scss rename to assets/stylesheets/bootstrap5/forms/_form-control.scss diff --git a/assets/stylesheets/bootstrap/forms/_form-range.scss b/assets/stylesheets/bootstrap5/forms/_form-range.scss similarity index 100% rename from assets/stylesheets/bootstrap/forms/_form-range.scss rename to assets/stylesheets/bootstrap5/forms/_form-range.scss diff --git a/assets/stylesheets/bootstrap/forms/_form-select.scss b/assets/stylesheets/bootstrap5/forms/_form-select.scss similarity index 100% rename from assets/stylesheets/bootstrap/forms/_form-select.scss rename to assets/stylesheets/bootstrap5/forms/_form-select.scss diff --git a/assets/stylesheets/bootstrap/forms/_form-text.scss b/assets/stylesheets/bootstrap5/forms/_form-text.scss similarity index 100% rename from assets/stylesheets/bootstrap/forms/_form-text.scss rename to assets/stylesheets/bootstrap5/forms/_form-text.scss diff --git a/assets/stylesheets/bootstrap/forms/_input-group.scss b/assets/stylesheets/bootstrap5/forms/_input-group.scss similarity index 100% rename from assets/stylesheets/bootstrap/forms/_input-group.scss rename to assets/stylesheets/bootstrap5/forms/_input-group.scss diff --git a/assets/stylesheets/bootstrap/forms/_labels.scss b/assets/stylesheets/bootstrap5/forms/_labels.scss similarity index 100% rename from assets/stylesheets/bootstrap/forms/_labels.scss rename to assets/stylesheets/bootstrap5/forms/_labels.scss diff --git a/assets/stylesheets/bootstrap/forms/_validation.scss b/assets/stylesheets/bootstrap5/forms/_validation.scss similarity index 100% rename from assets/stylesheets/bootstrap/forms/_validation.scss rename to assets/stylesheets/bootstrap5/forms/_validation.scss diff --git a/assets/stylesheets/bootstrap/helpers/_clearfix.scss b/assets/stylesheets/bootstrap5/helpers/_clearfix.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_clearfix.scss rename to assets/stylesheets/bootstrap5/helpers/_clearfix.scss diff --git a/assets/stylesheets/bootstrap/helpers/_color-bg.scss b/assets/stylesheets/bootstrap5/helpers/_color-bg.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_color-bg.scss rename to assets/stylesheets/bootstrap5/helpers/_color-bg.scss diff --git a/assets/stylesheets/bootstrap/helpers/_colored-links.scss b/assets/stylesheets/bootstrap5/helpers/_colored-links.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_colored-links.scss rename to assets/stylesheets/bootstrap5/helpers/_colored-links.scss diff --git a/assets/stylesheets/bootstrap/helpers/_focus-ring.scss b/assets/stylesheets/bootstrap5/helpers/_focus-ring.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_focus-ring.scss rename to assets/stylesheets/bootstrap5/helpers/_focus-ring.scss diff --git a/assets/stylesheets/bootstrap/helpers/_icon-link.scss b/assets/stylesheets/bootstrap5/helpers/_icon-link.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_icon-link.scss rename to assets/stylesheets/bootstrap5/helpers/_icon-link.scss diff --git a/assets/stylesheets/bootstrap/helpers/_position.scss b/assets/stylesheets/bootstrap5/helpers/_position.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_position.scss rename to assets/stylesheets/bootstrap5/helpers/_position.scss diff --git a/assets/stylesheets/bootstrap/helpers/_ratio.scss b/assets/stylesheets/bootstrap5/helpers/_ratio.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_ratio.scss rename to assets/stylesheets/bootstrap5/helpers/_ratio.scss diff --git a/assets/stylesheets/bootstrap/helpers/_stacks.scss b/assets/stylesheets/bootstrap5/helpers/_stacks.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_stacks.scss rename to assets/stylesheets/bootstrap5/helpers/_stacks.scss diff --git a/assets/stylesheets/bootstrap/helpers/_stretched-link.scss b/assets/stylesheets/bootstrap5/helpers/_stretched-link.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_stretched-link.scss rename to assets/stylesheets/bootstrap5/helpers/_stretched-link.scss diff --git a/assets/stylesheets/bootstrap/helpers/_text-truncation.scss b/assets/stylesheets/bootstrap5/helpers/_text-truncation.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_text-truncation.scss rename to assets/stylesheets/bootstrap5/helpers/_text-truncation.scss diff --git a/assets/stylesheets/bootstrap/helpers/_visually-hidden.scss b/assets/stylesheets/bootstrap5/helpers/_visually-hidden.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_visually-hidden.scss rename to assets/stylesheets/bootstrap5/helpers/_visually-hidden.scss diff --git a/assets/stylesheets/bootstrap/helpers/_vr.scss b/assets/stylesheets/bootstrap5/helpers/_vr.scss similarity index 100% rename from assets/stylesheets/bootstrap/helpers/_vr.scss rename to assets/stylesheets/bootstrap5/helpers/_vr.scss diff --git a/assets/stylesheets/bootstrap/mixins/_alert.scss b/assets/stylesheets/bootstrap5/mixins/_alert.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_alert.scss rename to assets/stylesheets/bootstrap5/mixins/_alert.scss diff --git a/assets/stylesheets/bootstrap/mixins/_backdrop.scss b/assets/stylesheets/bootstrap5/mixins/_backdrop.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_backdrop.scss rename to assets/stylesheets/bootstrap5/mixins/_backdrop.scss diff --git a/assets/stylesheets/bootstrap/mixins/_banner.scss b/assets/stylesheets/bootstrap5/mixins/_banner.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_banner.scss rename to assets/stylesheets/bootstrap5/mixins/_banner.scss diff --git a/assets/stylesheets/bootstrap/mixins/_border-radius.scss b/assets/stylesheets/bootstrap5/mixins/_border-radius.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_border-radius.scss rename to assets/stylesheets/bootstrap5/mixins/_border-radius.scss diff --git a/assets/stylesheets/bootstrap/mixins/_box-shadow.scss b/assets/stylesheets/bootstrap5/mixins/_box-shadow.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_box-shadow.scss rename to assets/stylesheets/bootstrap5/mixins/_box-shadow.scss diff --git a/assets/stylesheets/bootstrap/mixins/_breakpoints.scss b/assets/stylesheets/bootstrap5/mixins/_breakpoints.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_breakpoints.scss rename to assets/stylesheets/bootstrap5/mixins/_breakpoints.scss diff --git a/assets/stylesheets/bootstrap/mixins/_buttons.scss b/assets/stylesheets/bootstrap5/mixins/_buttons.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_buttons.scss rename to assets/stylesheets/bootstrap5/mixins/_buttons.scss diff --git a/assets/stylesheets/bootstrap/mixins/_caret.scss b/assets/stylesheets/bootstrap5/mixins/_caret.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_caret.scss rename to assets/stylesheets/bootstrap5/mixins/_caret.scss diff --git a/assets/stylesheets/bootstrap/mixins/_clearfix.scss b/assets/stylesheets/bootstrap5/mixins/_clearfix.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_clearfix.scss rename to assets/stylesheets/bootstrap5/mixins/_clearfix.scss diff --git a/assets/stylesheets/bootstrap/mixins/_color-mode.scss b/assets/stylesheets/bootstrap5/mixins/_color-mode.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_color-mode.scss rename to assets/stylesheets/bootstrap5/mixins/_color-mode.scss diff --git a/assets/stylesheets/bootstrap/mixins/_color-scheme.scss b/assets/stylesheets/bootstrap5/mixins/_color-scheme.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_color-scheme.scss rename to assets/stylesheets/bootstrap5/mixins/_color-scheme.scss diff --git a/assets/stylesheets/bootstrap/mixins/_container.scss b/assets/stylesheets/bootstrap5/mixins/_container.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_container.scss rename to assets/stylesheets/bootstrap5/mixins/_container.scss diff --git a/assets/stylesheets/bootstrap/mixins/_deprecate.scss b/assets/stylesheets/bootstrap5/mixins/_deprecate.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_deprecate.scss rename to assets/stylesheets/bootstrap5/mixins/_deprecate.scss diff --git a/assets/stylesheets/bootstrap/mixins/_forms.scss b/assets/stylesheets/bootstrap5/mixins/_forms.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_forms.scss rename to assets/stylesheets/bootstrap5/mixins/_forms.scss diff --git a/assets/stylesheets/bootstrap/mixins/_gradients.scss b/assets/stylesheets/bootstrap5/mixins/_gradients.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_gradients.scss rename to assets/stylesheets/bootstrap5/mixins/_gradients.scss diff --git a/assets/stylesheets/bootstrap/mixins/_grid.scss b/assets/stylesheets/bootstrap5/mixins/_grid.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_grid.scss rename to assets/stylesheets/bootstrap5/mixins/_grid.scss diff --git a/assets/stylesheets/bootstrap/mixins/_image.scss b/assets/stylesheets/bootstrap5/mixins/_image.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_image.scss rename to assets/stylesheets/bootstrap5/mixins/_image.scss diff --git a/assets/stylesheets/bootstrap/mixins/_list-group.scss b/assets/stylesheets/bootstrap5/mixins/_list-group.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_list-group.scss rename to assets/stylesheets/bootstrap5/mixins/_list-group.scss diff --git a/assets/stylesheets/bootstrap/mixins/_lists.scss b/assets/stylesheets/bootstrap5/mixins/_lists.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_lists.scss rename to assets/stylesheets/bootstrap5/mixins/_lists.scss diff --git a/assets/stylesheets/bootstrap/mixins/_pagination.scss b/assets/stylesheets/bootstrap5/mixins/_pagination.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_pagination.scss rename to assets/stylesheets/bootstrap5/mixins/_pagination.scss diff --git a/assets/stylesheets/bootstrap/mixins/_reset-text.scss b/assets/stylesheets/bootstrap5/mixins/_reset-text.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_reset-text.scss rename to assets/stylesheets/bootstrap5/mixins/_reset-text.scss diff --git a/assets/stylesheets/bootstrap/mixins/_resize.scss b/assets/stylesheets/bootstrap5/mixins/_resize.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_resize.scss rename to assets/stylesheets/bootstrap5/mixins/_resize.scss diff --git a/assets/stylesheets/bootstrap/mixins/_table-variants.scss b/assets/stylesheets/bootstrap5/mixins/_table-variants.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_table-variants.scss rename to assets/stylesheets/bootstrap5/mixins/_table-variants.scss diff --git a/assets/stylesheets/bootstrap/mixins/_text-truncate.scss b/assets/stylesheets/bootstrap5/mixins/_text-truncate.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_text-truncate.scss rename to assets/stylesheets/bootstrap5/mixins/_text-truncate.scss diff --git a/assets/stylesheets/bootstrap/mixins/_transition.scss b/assets/stylesheets/bootstrap5/mixins/_transition.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_transition.scss rename to assets/stylesheets/bootstrap5/mixins/_transition.scss diff --git a/assets/stylesheets/bootstrap/mixins/_utilities.scss b/assets/stylesheets/bootstrap5/mixins/_utilities.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_utilities.scss rename to assets/stylesheets/bootstrap5/mixins/_utilities.scss diff --git a/assets/stylesheets/bootstrap/mixins/_visually-hidden.scss b/assets/stylesheets/bootstrap5/mixins/_visually-hidden.scss similarity index 100% rename from assets/stylesheets/bootstrap/mixins/_visually-hidden.scss rename to assets/stylesheets/bootstrap5/mixins/_visually-hidden.scss diff --git a/assets/stylesheets/bootstrap/utilities/_api.scss b/assets/stylesheets/bootstrap5/utilities/_api.scss similarity index 100% rename from assets/stylesheets/bootstrap/utilities/_api.scss rename to assets/stylesheets/bootstrap5/utilities/_api.scss diff --git a/assets/stylesheets/bootstrap/vendor/_rfs.scss b/assets/stylesheets/bootstrap5/vendor/_rfs.scss similarity index 100% rename from assets/stylesheets/bootstrap/vendor/_rfs.scss rename to assets/stylesheets/bootstrap5/vendor/_rfs.scss diff --git a/bootstrap.gemspec b/bootstrap5.gemspec similarity index 93% rename from bootstrap.gemspec rename to bootstrap5.gemspec index a0bd50c4..cfed9f46 100644 --- a/bootstrap.gemspec +++ b/bootstrap5.gemspec @@ -1,10 +1,10 @@ lib = File.expand_path('../lib', __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) -require 'bootstrap/version' +require 'bootstrap5/version' Gem::Specification.new do |s| - s.name = 'bootstrap' - s.version = Bootstrap::VERSION + s.name = 'bootstrap5' + s.version = Bootstrap5::VERSION s.authors = ['Twitter, Inc.'] s.email = 'glex.spb@gmail.com' s.summary = 'The most popular HTML, CSS, and JavaScript framework for developing responsive, mobile first projects on the web. http://getbootstrap.com' diff --git a/lib/bootstrap.rb b/lib/bootstrap5.rb similarity index 93% rename from lib/bootstrap.rb rename to lib/bootstrap5.rb index d44f7e54..60838d46 100644 --- a/lib/bootstrap.rb +++ b/lib/bootstrap5.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true -require 'bootstrap/version' +require 'bootstrap5/version' require 'popper_js' -module Bootstrap +module Bootstrap5 class << self # Inspired by Kaminari def load! @@ -58,7 +58,7 @@ def hanami? private def register_rails_engine - require 'bootstrap/engine' + require 'bootstrap5/engine' end def register_sprockets @@ -72,4 +72,4 @@ def register_hanami end end -Bootstrap.load! +Bootstrap5.load! diff --git a/lib/bootstrap/engine.rb b/lib/bootstrap5/engine.rb similarity index 91% rename from lib/bootstrap/engine.rb rename to lib/bootstrap5/engine.rb index a907894e..3df4f7bc 100644 --- a/lib/bootstrap/engine.rb +++ b/lib/bootstrap5/engine.rb @@ -18,10 +18,10 @@ end end -module Bootstrap +module Bootstrap5 module Rails class Engine < ::Rails::Engine - initializer 'bootstrap.assets' do |app| + initializer 'bootstrap5.assets' do |app| %w(stylesheets javascripts).each do |sub| app.config.assets.paths << root.join('assets', sub).to_s end diff --git a/lib/bootstrap/version.rb b/lib/bootstrap5/version.rb similarity index 87% rename from lib/bootstrap/version.rb rename to lib/bootstrap5/version.rb index d54231f2..9293c928 100644 --- a/lib/bootstrap/version.rb +++ b/lib/bootstrap5/version.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -module Bootstrap +module Bootstrap5 VERSION = '5.3.3' BOOTSTRAP_SHA = '6e1f75f420f68e1d52733b8e407fc7c3766c9dba' end diff --git a/test/dummy_rails/app/assets/javascripts/application.js b/test/dummy_rails/app/assets/javascripts/application.js index 8a6aac2a..c58a1134 100644 --- a/test/dummy_rails/app/assets/javascripts/application.js +++ b/test/dummy_rails/app/assets/javascripts/application.js @@ -1,5 +1,5 @@ //= require popper.js -//= require bootstrap-sprockets +//= require bootstrap5-sprockets document.addEventListener('DOMContentLoaded', () => { for (const tooltipTriggerEl of document.querySelectorAll('[data-bs-toggle="tooltip"]')) { diff --git a/test/dummy_rails/app/assets/stylesheets/application.sass b/test/dummy_rails/app/assets/stylesheets/application.sass index b0d09cef..c5977df7 100644 --- a/test/dummy_rails/app/assets/stylesheets/application.sass +++ b/test/dummy_rails/app/assets/stylesheets/application.sass @@ -1,4 +1,4 @@ -@import 'bootstrap' +@import 'bootstrap5' .test-mixin +make-container diff --git a/test/dummy_rails/config/application.rb b/test/dummy_rails/config/application.rb index 8ed1d8e2..5b589633 100644 --- a/test/dummy_rails/config/application.rb +++ b/test/dummy_rails/config/application.rb @@ -11,7 +11,7 @@ end require 'uglifier' -require 'bootstrap' +require 'bootstrap5' module Dummy class Application < Rails::Application