diff --git a/app/javascript/packs/application.ts b/app/javascript/packs/application.ts index 5623d52b..a36c6552 100644 --- a/app/javascript/packs/application.ts +++ b/app/javascript/packs/application.ts @@ -1,4 +1,4 @@ -require('sweetalert/dist/sweetalert.css'); +require('../styles/application.scss'); import start from 'retrospring/common'; import initAnnouncements from 'retrospring/features/announcement'; diff --git a/app/assets/stylesheets/_utilities.scss b/app/javascript/styles/_utilities.scss similarity index 100% rename from app/assets/stylesheets/_utilities.scss rename to app/javascript/styles/_utilities.scss diff --git a/app/assets/stylesheets/_variables.scss b/app/javascript/styles/_variables.scss similarity index 96% rename from app/assets/stylesheets/_variables.scss rename to app/javascript/styles/_variables.scss index 1e237dcf..be24d352 100644 --- a/app/assets/stylesheets/_variables.scss +++ b/app/javascript/styles/_variables.scss @@ -1,5 +1,7 @@ // Font settings -@import url(https://fonts.googleapis.com/css?family=Lato:400,700); +$lato-font-path: "~lato-font/fonts"; + +$fa-font-path: "~font-awesome/fonts"; $font-family-sans-serif: "Lato","Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; $font-family-serif: Georgia, "DejaVu Serif", "Times New Roman", Times, serif; diff --git a/app/assets/stylesheets/application.scss b/app/javascript/styles/application.scss similarity index 92% rename from app/assets/stylesheets/application.scss rename to app/javascript/styles/application.scss index 29ab1c10..ae502f24 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/javascript/styles/application.scss @@ -21,8 +21,11 @@ */ @import -"bootstrap", -"font-awesome"; +"~bootstrap/scss/bootstrap", +"~font-awesome/scss/font-awesome", +"~lato-font/scss/lato-font", +"~sweetalert/dist/sweetalert", +"~toastify-js/src/toastify"; /** OVERRIDES diff --git a/app/assets/stylesheets/components/_announcements.scss b/app/javascript/styles/components/_announcements.scss similarity index 100% rename from app/assets/stylesheets/components/_announcements.scss rename to app/javascript/styles/components/_announcements.scss diff --git a/app/assets/stylesheets/components/_answerbox.scss b/app/javascript/styles/components/_answerbox.scss similarity index 100% rename from app/assets/stylesheets/components/_answerbox.scss rename to app/javascript/styles/components/_answerbox.scss diff --git a/app/assets/stylesheets/components/_avatars.scss b/app/javascript/styles/components/_avatars.scss similarity index 100% rename from app/assets/stylesheets/components/_avatars.scss rename to app/javascript/styles/components/_avatars.scss diff --git a/app/assets/stylesheets/components/_buttons.scss b/app/javascript/styles/components/_buttons.scss similarity index 100% rename from app/assets/stylesheets/components/_buttons.scss rename to app/javascript/styles/components/_buttons.scss diff --git a/app/assets/stylesheets/components/_comments.scss b/app/javascript/styles/components/_comments.scss similarity index 100% rename from app/assets/stylesheets/components/_comments.scss rename to app/javascript/styles/components/_comments.scss diff --git a/app/assets/stylesheets/components/_container.scss b/app/javascript/styles/components/_container.scss similarity index 100% rename from app/assets/stylesheets/components/_container.scss rename to app/javascript/styles/components/_container.scss diff --git a/app/assets/stylesheets/components/_entry.scss b/app/javascript/styles/components/_entry.scss similarity index 100% rename from app/assets/stylesheets/components/_entry.scss rename to app/javascript/styles/components/_entry.scss diff --git a/app/assets/stylesheets/components/_icons.scss b/app/javascript/styles/components/_icons.scss similarity index 100% rename from app/assets/stylesheets/components/_icons.scss rename to app/javascript/styles/components/_icons.scss diff --git a/app/assets/stylesheets/components/_inbox-entry.scss b/app/javascript/styles/components/_inbox-entry.scss similarity index 100% rename from app/assets/stylesheets/components/_inbox-entry.scss rename to app/javascript/styles/components/_inbox-entry.scss diff --git a/app/assets/stylesheets/components/_jumbotron.scss b/app/javascript/styles/components/_jumbotron.scss similarity index 100% rename from app/assets/stylesheets/components/_jumbotron.scss rename to app/javascript/styles/components/_jumbotron.scss diff --git a/app/assets/stylesheets/components/_locales.scss b/app/javascript/styles/components/_locales.scss similarity index 100% rename from app/assets/stylesheets/components/_locales.scss rename to app/javascript/styles/components/_locales.scss diff --git a/app/assets/stylesheets/components/_mobile-nav.scss b/app/javascript/styles/components/_mobile-nav.scss similarity index 100% rename from app/assets/stylesheets/components/_mobile-nav.scss rename to app/javascript/styles/components/_mobile-nav.scss diff --git a/app/assets/stylesheets/components/_notifications.scss b/app/javascript/styles/components/_notifications.scss similarity index 100% rename from app/assets/stylesheets/components/_notifications.scss rename to app/javascript/styles/components/_notifications.scss diff --git a/app/assets/stylesheets/components/_profile.scss b/app/javascript/styles/components/_profile.scss similarity index 100% rename from app/assets/stylesheets/components/_profile.scss rename to app/javascript/styles/components/_profile.scss diff --git a/app/assets/stylesheets/components/_question.scss b/app/javascript/styles/components/_question.scss similarity index 100% rename from app/assets/stylesheets/components/_question.scss rename to app/javascript/styles/components/_question.scss diff --git a/app/assets/stylesheets/components/_smiles.scss b/app/javascript/styles/components/_smiles.scss similarity index 100% rename from app/assets/stylesheets/components/_smiles.scss rename to app/javascript/styles/components/_smiles.scss diff --git a/app/assets/stylesheets/components/_totp-setup.scss b/app/javascript/styles/components/_totp-setup.scss similarity index 100% rename from app/assets/stylesheets/components/_totp-setup.scss rename to app/javascript/styles/components/_totp-setup.scss diff --git a/app/assets/stylesheets/components/_userbox.scss b/app/javascript/styles/components/_userbox.scss similarity index 100% rename from app/assets/stylesheets/components/_userbox.scss rename to app/javascript/styles/components/_userbox.scss diff --git a/app/assets/stylesheets/elements/_body.scss b/app/javascript/styles/elements/_body.scss similarity index 100% rename from app/assets/stylesheets/elements/_body.scss rename to app/javascript/styles/elements/_body.scss diff --git a/app/assets/stylesheets/overrides/_alerts.scss b/app/javascript/styles/overrides/_alerts.scss similarity index 100% rename from app/assets/stylesheets/overrides/_alerts.scss rename to app/javascript/styles/overrides/_alerts.scss diff --git a/app/assets/stylesheets/overrides/_badges.scss b/app/javascript/styles/overrides/_badges.scss similarity index 100% rename from app/assets/stylesheets/overrides/_badges.scss rename to app/javascript/styles/overrides/_badges.scss diff --git a/app/assets/stylesheets/overrides/_bootstrap-datetimepicker.scss b/app/javascript/styles/overrides/_bootstrap-datetimepicker.scss similarity index 100% rename from app/assets/stylesheets/overrides/_bootstrap-datetimepicker.scss rename to app/javascript/styles/overrides/_bootstrap-datetimepicker.scss diff --git a/app/assets/stylesheets/overrides/_buttons.scss b/app/javascript/styles/overrides/_buttons.scss similarity index 100% rename from app/assets/stylesheets/overrides/_buttons.scss rename to app/javascript/styles/overrides/_buttons.scss diff --git a/app/assets/stylesheets/overrides/_card.scss b/app/javascript/styles/overrides/_card.scss similarity index 100% rename from app/assets/stylesheets/overrides/_card.scss rename to app/javascript/styles/overrides/_card.scss diff --git a/app/assets/stylesheets/overrides/_colors.scss b/app/javascript/styles/overrides/_colors.scss similarity index 100% rename from app/assets/stylesheets/overrides/_colors.scss rename to app/javascript/styles/overrides/_colors.scss diff --git a/app/assets/stylesheets/overrides/_dropdown.scss b/app/javascript/styles/overrides/_dropdown.scss similarity index 100% rename from app/assets/stylesheets/overrides/_dropdown.scss rename to app/javascript/styles/overrides/_dropdown.scss diff --git a/app/assets/stylesheets/overrides/_inputs.scss b/app/javascript/styles/overrides/_inputs.scss similarity index 100% rename from app/assets/stylesheets/overrides/_inputs.scss rename to app/javascript/styles/overrides/_inputs.scss diff --git a/app/assets/stylesheets/overrides/_links.scss b/app/javascript/styles/overrides/_links.scss similarity index 100% rename from app/assets/stylesheets/overrides/_links.scss rename to app/javascript/styles/overrides/_links.scss diff --git a/app/assets/stylesheets/overrides/_list-group.scss b/app/javascript/styles/overrides/_list-group.scss similarity index 100% rename from app/assets/stylesheets/overrides/_list-group.scss rename to app/javascript/styles/overrides/_list-group.scss diff --git a/app/assets/stylesheets/overrides/_minicolors.scss b/app/javascript/styles/overrides/_minicolors.scss similarity index 100% rename from app/assets/stylesheets/overrides/_minicolors.scss rename to app/javascript/styles/overrides/_minicolors.scss diff --git a/app/assets/stylesheets/overrides/_modal.scss b/app/javascript/styles/overrides/_modal.scss similarity index 100% rename from app/assets/stylesheets/overrides/_modal.scss rename to app/javascript/styles/overrides/_modal.scss diff --git a/app/assets/stylesheets/overrides/_navbar.scss b/app/javascript/styles/overrides/_navbar.scss similarity index 100% rename from app/assets/stylesheets/overrides/_navbar.scss rename to app/javascript/styles/overrides/_navbar.scss diff --git a/app/assets/stylesheets/overrides/_sweet-alert.scss b/app/javascript/styles/overrides/_sweet-alert.scss similarity index 100% rename from app/assets/stylesheets/overrides/_sweet-alert.scss rename to app/javascript/styles/overrides/_sweet-alert.scss diff --git a/app/assets/stylesheets/overrides/_toasts.scss b/app/javascript/styles/overrides/_toasts.scss similarity index 100% rename from app/assets/stylesheets/overrides/_toasts.scss rename to app/javascript/styles/overrides/_toasts.scss diff --git a/app/assets/stylesheets/overrides/_turbolinks.scss b/app/javascript/styles/overrides/_turbolinks.scss similarity index 100% rename from app/assets/stylesheets/overrides/_turbolinks.scss rename to app/javascript/styles/overrides/_turbolinks.scss