From dcd553ff3c74eafc60037dff0995810ec701c8f1 Mon Sep 17 00:00:00 2001 From: danieldeng2 <danieldeng223@gmail.com> Date: Fri, 7 Aug 2020 01:12:28 +0100 Subject: [PATCH] Optimise scss imports --- .gitignore | 1 + .../scss/{bootstrapV5 => bootstrap5}/_alert.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_badge.scss | 0 .../{bootstrapV5 => bootstrap5}/_breadcrumb.scss | 0 .../{bootstrapV5 => bootstrap5}/_button-group.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_buttons.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_card.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_carousel.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_close.scss | 0 .../{bootstrapV5 => bootstrap5}/_containers.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_dropdown.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_forms.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_functions.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_grid.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_helpers.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_images.scss | 0 .../{bootstrapV5 => bootstrap5}/_list-group.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_mixins.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_modal.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_nav.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_navbar.scss | 0 .../{bootstrapV5 => bootstrap5}/_pagination.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_popover.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_progress.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_reboot.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_root.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_spinners.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_tables.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_toasts.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_tooltip.scss | 0 .../{bootstrapV5 => bootstrap5}/_transitions.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_type.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_utilities.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/_variables.scss | 0 .../{bootstrapV5 => bootstrap5}/bootstrap-grid.scss | 0 .../bootstrap-reboot.scss | 0 .../bootstrap-utilities.scss | 0 .../scss/{bootstrapV5 => bootstrap5}/bootstrap.scss | 0 .../forms/_form-check.scss | 0 .../forms/_form-control.scss | 0 .../forms/_form-file.scss | 0 .../forms/_form-range.scss | 0 .../forms/_form-select.scss | 0 .../forms/_form-text.scss | 0 .../forms/_input-group.scss | 0 .../{bootstrapV5 => bootstrap5}/forms/_labels.scss | 0 .../forms/_validation.scss | 0 .../helpers/_clearfix.scss | 0 .../helpers/_colored-links.scss | 0 .../{bootstrapV5 => bootstrap5}/helpers/_embed.scss | 0 .../helpers/_position.scss | 0 .../helpers/_stretched-link.scss | 0 .../helpers/_text-truncation.scss | 0 .../helpers/_visually-hidden.scss | 0 .../{bootstrapV5 => bootstrap5}/mixins/_alert.scss | 0 .../mixins/_border-radius.scss | 0 .../mixins/_box-shadow.scss | 0 .../mixins/_breakpoints.scss | 0 .../{bootstrapV5 => bootstrap5}/mixins/_buttons.scss | 0 .../{bootstrapV5 => bootstrap5}/mixins/_caret.scss | 0 .../mixins/_clearfix.scss | 0 .../mixins/_container.scss | 0 .../mixins/_deprecate.scss | 0 .../{bootstrapV5 => bootstrap5}/mixins/_forms.scss | 0 .../mixins/_gradients.scss | 0 .../{bootstrapV5 => bootstrap5}/mixins/_grid.scss | 0 .../{bootstrapV5 => bootstrap5}/mixins/_image.scss | 0 .../mixins/_list-group.scss | 0 .../{bootstrapV5 => bootstrap5}/mixins/_lists.scss | 0 .../mixins/_pagination.scss | 0 .../mixins/_reset-text.scss | 0 .../{bootstrapV5 => bootstrap5}/mixins/_resize.scss | 0 .../mixins/_screen-reader.scss | 0 .../mixins/_table-variants.scss | 0 .../mixins/_text-truncate.scss | 0 .../mixins/_transition.scss | 0 .../mixins/_utilities.scss | 0 .../{bootstrapV5 => bootstrap5}/utilities/_api.scss | 0 .../{bootstrapV5 => bootstrap5}/vendor/_rfs.scss | 0 frontend/src/assets/scss/custom.scss | 10 +++------- frontend/src/components/App.scss | 1 + frontend/src/components/App.tsx | 1 - node_modules/.yarn-integrity | 12 ------------ package.json | 3 --- 84 files changed, 5 insertions(+), 23 deletions(-) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_alert.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_badge.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_breadcrumb.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_button-group.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_buttons.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_card.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_carousel.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_close.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_containers.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_dropdown.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_forms.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_functions.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_grid.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_helpers.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_images.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_list-group.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_mixins.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_modal.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_nav.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_navbar.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_pagination.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_popover.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_progress.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_reboot.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_root.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_spinners.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_tables.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_toasts.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_tooltip.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_transitions.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_type.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_utilities.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/_variables.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/bootstrap-grid.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/bootstrap-reboot.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/bootstrap-utilities.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/bootstrap.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/forms/_form-check.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/forms/_form-control.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/forms/_form-file.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/forms/_form-range.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/forms/_form-select.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/forms/_form-text.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/forms/_input-group.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/forms/_labels.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/forms/_validation.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/helpers/_clearfix.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/helpers/_colored-links.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/helpers/_embed.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/helpers/_position.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/helpers/_stretched-link.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/helpers/_text-truncation.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/helpers/_visually-hidden.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_alert.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_border-radius.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_box-shadow.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_breakpoints.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_buttons.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_caret.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_clearfix.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_container.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_deprecate.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_forms.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_gradients.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_grid.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_image.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_list-group.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_lists.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_pagination.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_reset-text.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_resize.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_screen-reader.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_table-variants.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_text-truncate.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_transition.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/mixins/_utilities.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/utilities/_api.scss (100%) rename frontend/src/assets/scss/{bootstrapV5 => bootstrap5}/vendor/_rfs.scss (100%) delete mode 100644 node_modules/.yarn-integrity delete mode 100644 package.json diff --git a/.gitignore b/.gitignore index 591390c2a..07fbb8571 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # dependencies +./node_modules frontend/node_modules frontend/.pnp frontend/.pnp.js diff --git a/frontend/src/assets/scss/bootstrapV5/_alert.scss b/frontend/src/assets/scss/bootstrap5/_alert.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_alert.scss rename to frontend/src/assets/scss/bootstrap5/_alert.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_badge.scss b/frontend/src/assets/scss/bootstrap5/_badge.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_badge.scss rename to frontend/src/assets/scss/bootstrap5/_badge.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_breadcrumb.scss b/frontend/src/assets/scss/bootstrap5/_breadcrumb.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_breadcrumb.scss rename to frontend/src/assets/scss/bootstrap5/_breadcrumb.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_button-group.scss b/frontend/src/assets/scss/bootstrap5/_button-group.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_button-group.scss rename to frontend/src/assets/scss/bootstrap5/_button-group.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_buttons.scss b/frontend/src/assets/scss/bootstrap5/_buttons.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_buttons.scss rename to frontend/src/assets/scss/bootstrap5/_buttons.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_card.scss b/frontend/src/assets/scss/bootstrap5/_card.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_card.scss rename to frontend/src/assets/scss/bootstrap5/_card.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_carousel.scss b/frontend/src/assets/scss/bootstrap5/_carousel.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_carousel.scss rename to frontend/src/assets/scss/bootstrap5/_carousel.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_close.scss b/frontend/src/assets/scss/bootstrap5/_close.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_close.scss rename to frontend/src/assets/scss/bootstrap5/_close.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_containers.scss b/frontend/src/assets/scss/bootstrap5/_containers.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_containers.scss rename to frontend/src/assets/scss/bootstrap5/_containers.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_dropdown.scss b/frontend/src/assets/scss/bootstrap5/_dropdown.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_dropdown.scss rename to frontend/src/assets/scss/bootstrap5/_dropdown.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_forms.scss b/frontend/src/assets/scss/bootstrap5/_forms.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_forms.scss rename to frontend/src/assets/scss/bootstrap5/_forms.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_functions.scss b/frontend/src/assets/scss/bootstrap5/_functions.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_functions.scss rename to frontend/src/assets/scss/bootstrap5/_functions.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_grid.scss b/frontend/src/assets/scss/bootstrap5/_grid.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_grid.scss rename to frontend/src/assets/scss/bootstrap5/_grid.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_helpers.scss b/frontend/src/assets/scss/bootstrap5/_helpers.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_helpers.scss rename to frontend/src/assets/scss/bootstrap5/_helpers.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_images.scss b/frontend/src/assets/scss/bootstrap5/_images.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_images.scss rename to frontend/src/assets/scss/bootstrap5/_images.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_list-group.scss b/frontend/src/assets/scss/bootstrap5/_list-group.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_list-group.scss rename to frontend/src/assets/scss/bootstrap5/_list-group.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_mixins.scss b/frontend/src/assets/scss/bootstrap5/_mixins.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_mixins.scss rename to frontend/src/assets/scss/bootstrap5/_mixins.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_modal.scss b/frontend/src/assets/scss/bootstrap5/_modal.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_modal.scss rename to frontend/src/assets/scss/bootstrap5/_modal.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_nav.scss b/frontend/src/assets/scss/bootstrap5/_nav.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_nav.scss rename to frontend/src/assets/scss/bootstrap5/_nav.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_navbar.scss b/frontend/src/assets/scss/bootstrap5/_navbar.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_navbar.scss rename to frontend/src/assets/scss/bootstrap5/_navbar.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_pagination.scss b/frontend/src/assets/scss/bootstrap5/_pagination.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_pagination.scss rename to frontend/src/assets/scss/bootstrap5/_pagination.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_popover.scss b/frontend/src/assets/scss/bootstrap5/_popover.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_popover.scss rename to frontend/src/assets/scss/bootstrap5/_popover.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_progress.scss b/frontend/src/assets/scss/bootstrap5/_progress.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_progress.scss rename to frontend/src/assets/scss/bootstrap5/_progress.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_reboot.scss b/frontend/src/assets/scss/bootstrap5/_reboot.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_reboot.scss rename to frontend/src/assets/scss/bootstrap5/_reboot.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_root.scss b/frontend/src/assets/scss/bootstrap5/_root.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_root.scss rename to frontend/src/assets/scss/bootstrap5/_root.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_spinners.scss b/frontend/src/assets/scss/bootstrap5/_spinners.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_spinners.scss rename to frontend/src/assets/scss/bootstrap5/_spinners.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_tables.scss b/frontend/src/assets/scss/bootstrap5/_tables.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_tables.scss rename to frontend/src/assets/scss/bootstrap5/_tables.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_toasts.scss b/frontend/src/assets/scss/bootstrap5/_toasts.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_toasts.scss rename to frontend/src/assets/scss/bootstrap5/_toasts.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_tooltip.scss b/frontend/src/assets/scss/bootstrap5/_tooltip.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_tooltip.scss rename to frontend/src/assets/scss/bootstrap5/_tooltip.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_transitions.scss b/frontend/src/assets/scss/bootstrap5/_transitions.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_transitions.scss rename to frontend/src/assets/scss/bootstrap5/_transitions.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_type.scss b/frontend/src/assets/scss/bootstrap5/_type.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_type.scss rename to frontend/src/assets/scss/bootstrap5/_type.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_utilities.scss b/frontend/src/assets/scss/bootstrap5/_utilities.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_utilities.scss rename to frontend/src/assets/scss/bootstrap5/_utilities.scss diff --git a/frontend/src/assets/scss/bootstrapV5/_variables.scss b/frontend/src/assets/scss/bootstrap5/_variables.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/_variables.scss rename to frontend/src/assets/scss/bootstrap5/_variables.scss diff --git a/frontend/src/assets/scss/bootstrapV5/bootstrap-grid.scss b/frontend/src/assets/scss/bootstrap5/bootstrap-grid.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/bootstrap-grid.scss rename to frontend/src/assets/scss/bootstrap5/bootstrap-grid.scss diff --git a/frontend/src/assets/scss/bootstrapV5/bootstrap-reboot.scss b/frontend/src/assets/scss/bootstrap5/bootstrap-reboot.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/bootstrap-reboot.scss rename to frontend/src/assets/scss/bootstrap5/bootstrap-reboot.scss diff --git a/frontend/src/assets/scss/bootstrapV5/bootstrap-utilities.scss b/frontend/src/assets/scss/bootstrap5/bootstrap-utilities.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/bootstrap-utilities.scss rename to frontend/src/assets/scss/bootstrap5/bootstrap-utilities.scss diff --git a/frontend/src/assets/scss/bootstrapV5/bootstrap.scss b/frontend/src/assets/scss/bootstrap5/bootstrap.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/bootstrap.scss rename to frontend/src/assets/scss/bootstrap5/bootstrap.scss diff --git a/frontend/src/assets/scss/bootstrapV5/forms/_form-check.scss b/frontend/src/assets/scss/bootstrap5/forms/_form-check.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/forms/_form-check.scss rename to frontend/src/assets/scss/bootstrap5/forms/_form-check.scss diff --git a/frontend/src/assets/scss/bootstrapV5/forms/_form-control.scss b/frontend/src/assets/scss/bootstrap5/forms/_form-control.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/forms/_form-control.scss rename to frontend/src/assets/scss/bootstrap5/forms/_form-control.scss diff --git a/frontend/src/assets/scss/bootstrapV5/forms/_form-file.scss b/frontend/src/assets/scss/bootstrap5/forms/_form-file.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/forms/_form-file.scss rename to frontend/src/assets/scss/bootstrap5/forms/_form-file.scss diff --git a/frontend/src/assets/scss/bootstrapV5/forms/_form-range.scss b/frontend/src/assets/scss/bootstrap5/forms/_form-range.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/forms/_form-range.scss rename to frontend/src/assets/scss/bootstrap5/forms/_form-range.scss diff --git a/frontend/src/assets/scss/bootstrapV5/forms/_form-select.scss b/frontend/src/assets/scss/bootstrap5/forms/_form-select.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/forms/_form-select.scss rename to frontend/src/assets/scss/bootstrap5/forms/_form-select.scss diff --git a/frontend/src/assets/scss/bootstrapV5/forms/_form-text.scss b/frontend/src/assets/scss/bootstrap5/forms/_form-text.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/forms/_form-text.scss rename to frontend/src/assets/scss/bootstrap5/forms/_form-text.scss diff --git a/frontend/src/assets/scss/bootstrapV5/forms/_input-group.scss b/frontend/src/assets/scss/bootstrap5/forms/_input-group.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/forms/_input-group.scss rename to frontend/src/assets/scss/bootstrap5/forms/_input-group.scss diff --git a/frontend/src/assets/scss/bootstrapV5/forms/_labels.scss b/frontend/src/assets/scss/bootstrap5/forms/_labels.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/forms/_labels.scss rename to frontend/src/assets/scss/bootstrap5/forms/_labels.scss diff --git a/frontend/src/assets/scss/bootstrapV5/forms/_validation.scss b/frontend/src/assets/scss/bootstrap5/forms/_validation.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/forms/_validation.scss rename to frontend/src/assets/scss/bootstrap5/forms/_validation.scss diff --git a/frontend/src/assets/scss/bootstrapV5/helpers/_clearfix.scss b/frontend/src/assets/scss/bootstrap5/helpers/_clearfix.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/helpers/_clearfix.scss rename to frontend/src/assets/scss/bootstrap5/helpers/_clearfix.scss diff --git a/frontend/src/assets/scss/bootstrapV5/helpers/_colored-links.scss b/frontend/src/assets/scss/bootstrap5/helpers/_colored-links.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/helpers/_colored-links.scss rename to frontend/src/assets/scss/bootstrap5/helpers/_colored-links.scss diff --git a/frontend/src/assets/scss/bootstrapV5/helpers/_embed.scss b/frontend/src/assets/scss/bootstrap5/helpers/_embed.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/helpers/_embed.scss rename to frontend/src/assets/scss/bootstrap5/helpers/_embed.scss diff --git a/frontend/src/assets/scss/bootstrapV5/helpers/_position.scss b/frontend/src/assets/scss/bootstrap5/helpers/_position.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/helpers/_position.scss rename to frontend/src/assets/scss/bootstrap5/helpers/_position.scss diff --git a/frontend/src/assets/scss/bootstrapV5/helpers/_stretched-link.scss b/frontend/src/assets/scss/bootstrap5/helpers/_stretched-link.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/helpers/_stretched-link.scss rename to frontend/src/assets/scss/bootstrap5/helpers/_stretched-link.scss diff --git a/frontend/src/assets/scss/bootstrapV5/helpers/_text-truncation.scss b/frontend/src/assets/scss/bootstrap5/helpers/_text-truncation.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/helpers/_text-truncation.scss rename to frontend/src/assets/scss/bootstrap5/helpers/_text-truncation.scss diff --git a/frontend/src/assets/scss/bootstrapV5/helpers/_visually-hidden.scss b/frontend/src/assets/scss/bootstrap5/helpers/_visually-hidden.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/helpers/_visually-hidden.scss rename to frontend/src/assets/scss/bootstrap5/helpers/_visually-hidden.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_alert.scss b/frontend/src/assets/scss/bootstrap5/mixins/_alert.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_alert.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_alert.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_border-radius.scss b/frontend/src/assets/scss/bootstrap5/mixins/_border-radius.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_border-radius.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_border-radius.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_box-shadow.scss b/frontend/src/assets/scss/bootstrap5/mixins/_box-shadow.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_box-shadow.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_box-shadow.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_breakpoints.scss b/frontend/src/assets/scss/bootstrap5/mixins/_breakpoints.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_breakpoints.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_breakpoints.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_buttons.scss b/frontend/src/assets/scss/bootstrap5/mixins/_buttons.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_buttons.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_buttons.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_caret.scss b/frontend/src/assets/scss/bootstrap5/mixins/_caret.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_caret.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_caret.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_clearfix.scss b/frontend/src/assets/scss/bootstrap5/mixins/_clearfix.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_clearfix.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_clearfix.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_container.scss b/frontend/src/assets/scss/bootstrap5/mixins/_container.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_container.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_container.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_deprecate.scss b/frontend/src/assets/scss/bootstrap5/mixins/_deprecate.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_deprecate.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_deprecate.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_forms.scss b/frontend/src/assets/scss/bootstrap5/mixins/_forms.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_forms.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_forms.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_gradients.scss b/frontend/src/assets/scss/bootstrap5/mixins/_gradients.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_gradients.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_gradients.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_grid.scss b/frontend/src/assets/scss/bootstrap5/mixins/_grid.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_grid.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_grid.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_image.scss b/frontend/src/assets/scss/bootstrap5/mixins/_image.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_image.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_image.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_list-group.scss b/frontend/src/assets/scss/bootstrap5/mixins/_list-group.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_list-group.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_list-group.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_lists.scss b/frontend/src/assets/scss/bootstrap5/mixins/_lists.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_lists.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_lists.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_pagination.scss b/frontend/src/assets/scss/bootstrap5/mixins/_pagination.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_pagination.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_pagination.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_reset-text.scss b/frontend/src/assets/scss/bootstrap5/mixins/_reset-text.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_reset-text.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_reset-text.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_resize.scss b/frontend/src/assets/scss/bootstrap5/mixins/_resize.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_resize.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_resize.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_screen-reader.scss b/frontend/src/assets/scss/bootstrap5/mixins/_screen-reader.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_screen-reader.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_screen-reader.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_table-variants.scss b/frontend/src/assets/scss/bootstrap5/mixins/_table-variants.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_table-variants.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_table-variants.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_text-truncate.scss b/frontend/src/assets/scss/bootstrap5/mixins/_text-truncate.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_text-truncate.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_text-truncate.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_transition.scss b/frontend/src/assets/scss/bootstrap5/mixins/_transition.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_transition.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_transition.scss diff --git a/frontend/src/assets/scss/bootstrapV5/mixins/_utilities.scss b/frontend/src/assets/scss/bootstrap5/mixins/_utilities.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/mixins/_utilities.scss rename to frontend/src/assets/scss/bootstrap5/mixins/_utilities.scss diff --git a/frontend/src/assets/scss/bootstrapV5/utilities/_api.scss b/frontend/src/assets/scss/bootstrap5/utilities/_api.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/utilities/_api.scss rename to frontend/src/assets/scss/bootstrap5/utilities/_api.scss diff --git a/frontend/src/assets/scss/bootstrapV5/vendor/_rfs.scss b/frontend/src/assets/scss/bootstrap5/vendor/_rfs.scss similarity index 100% rename from frontend/src/assets/scss/bootstrapV5/vendor/_rfs.scss rename to frontend/src/assets/scss/bootstrap5/vendor/_rfs.scss diff --git a/frontend/src/assets/scss/custom.scss b/frontend/src/assets/scss/custom.scss index 5df0ed4f7..a9a3b6d43 100644 --- a/frontend/src/assets/scss/custom.scss +++ b/frontend/src/assets/scss/custom.scss @@ -2,10 +2,6 @@ $nav-pills-link-active-color: black; //Bootstrap 5 scss from: https://github.com/twbs/bootstrap/tree/main/scss -@import "./bootstrapV5/bootstrap.scss"; -@import "~bootstrap/dist/css/bootstrap.min.css"; - -//Delete bootstrapV5/bootstrap.scss and bootstrap.min.css import -//and uncomment below to fall back to default scss option - -//@import '~bootstrap/scss/bootstrap.scss'; +@import "bootstrap5/functions"; +@import "bootstrap5/variables"; +@import "bootstrap5/mixins"; \ No newline at end of file diff --git a/frontend/src/components/App.scss b/frontend/src/components/App.scss index 0ee5dec18..bf07612b5 100644 --- a/frontend/src/components/App.scss +++ b/frontend/src/components/App.scss @@ -1,4 +1,5 @@ @import "assets/scss/custom"; +@import "~bootstrap/dist/css/bootstrap.min.css"; body { margin: 0; diff --git a/frontend/src/components/App.tsx b/frontend/src/components/App.tsx index 688b525a9..96a3bc259 100644 --- a/frontend/src/components/App.tsx +++ b/frontend/src/components/App.tsx @@ -1,6 +1,5 @@ import React from "react"; import "./App.scss"; - import TopBar from "./organisms/TopBar"; import BottomBar from "./organisms/BottomBar"; import { diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity deleted file mode 100644 index e00d42a58..000000000 --- a/node_modules/.yarn-integrity +++ /dev/null @@ -1,12 +0,0 @@ -{ - "systemParams": "linux-x64-72", - "modulesFolders": [ - "node_modules" - ], - "flags": [], - "linkedModules": [], - "topLevelPatterns": [], - "lockfileEntries": {}, - "files": [], - "artifacts": {} -} \ No newline at end of file diff --git a/package.json b/package.json deleted file mode 100644 index 18a1e415e..000000000 --- a/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "dependencies": {} -} -- GitLab