Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Force sass to compile imported files by making .scss extension explicit #3272

Merged
merged 1 commit into from
Jan 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application-dark.css.scss.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@

$theme: "dark";

@import "base.css";
@import "base.css.scss";
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.css.scss.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@

$theme: "light";

@import "base.css";
@import "base.css.scss";
28 changes: 14 additions & 14 deletions app/assets/stylesheets/base.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
@import "../../../node_modules/bootstrap/scss/functions";

// 2. Include any default variable overrides here
@import "theme/colors.css";
@import "bootstrap_variable_overrides.css";
@import "mixins.css";
@import "theme/colors.css.scss";
@import "bootstrap_variable_overrides.css.scss";
@import "mixins.css.scss";
@import "vendor";

// also loads dark mode stuff
@import "theme/theme-light.css";
@import "theme/theme-light.css.scss";

@import "theme/rouge-light.css";
@import "theme/rouge-dark.css";
@import "theme/rouge-light.css.scss";
@import "theme/rouge-dark.css.scss";
@if $theme == "dark" {
@include rouge-dark;
} @else {
Expand Down Expand Up @@ -62,14 +62,14 @@
}

// 5. Add additional custom code here
@import "bootstrap_style_overrides.css";
@import "libraries.css";
@import "material_icons.css";
@import "layout.css";
@import "components.css";
@import "pages.css";
@import "models.css";
@import "print.css";
@import "bootstrap_style_overrides.css.scss";
@import "libraries.css.scss";
@import "material_icons.css.scss";
@import "layout.css.scss";
@import "components.css.scss";
@import "pages.css.scss";
@import "models.css.scss";
@import "print.css.scss";

.field_with_errors input {
border-color: $danger-fg;
Expand Down
44 changes: 22 additions & 22 deletions app/assets/stylesheets/components.css.scss
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
@import "components/btn.css";
@import "components/callout.css";
@import "components/card.css";
@import "components/code_listing.css";
@import "components/dropdown.css";
@import "components/evaluations.css";
@import "components/favorite.css";
@import "components/heatmap.css";
@import "components/img.css";
@import "components/link.css";
@import "components/modal.css";
@import "components/notification.css";
@import "components/progress-chart.css";
@import "components/punchcard.css";
@import "components/scoresheet.css";
@import "components/stepper.css";
@import "components/table.css";
@import "components/table-toolbar.css";
@import "components/toast.css";
@import "components/tokenfield.css";
@import "components/tutor.css";
@import "components/visualisations.css";
@import "components/btn.css.scss";
@import "components/callout.css.scss";
@import "components/card.css.scss";
@import "components/code_listing.css.scss";
@import "components/dropdown.css.scss";
@import "components/evaluations.css.scss";
@import "components/favorite.css.scss";
@import "components/heatmap.css.scss";
@import "components/img.css.scss";
@import "components/link.css.scss";
@import "components/modal.css.scss";
@import "components/notification.css.scss";
@import "components/progress-chart.css.scss";
@import "components/punchcard.css.scss";
@import "components/scoresheet.css.scss";
@import "components/stepper.css.scss";
@import "components/table.css.scss";
@import "components/table-toolbar.css.scss";
@import "components/toast.css.scss";
@import "components/tokenfield.css.scss";
@import "components/tutor.css.scss";
@import "components/visualisations.css.scss";

.flex-spacer {
flex-grow: 1;
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/layout.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "layout/drawer.css";
@import "layout/footer.css";
@import "layout/navbar.css";
@import "layout/drawer.css.scss";
@import "layout/footer.css.scss";
@import "layout/navbar.css.scss";

html,
body {
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/libraries.css.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "libraries/dragula.css";
@import "libraries/flatpickr.css";
@import "libraries/glightbox.css";
@import "libraries/dragula.css.scss";
@import "libraries/flatpickr.css.scss";
@import "libraries/glightbox.css.scss";
6 changes: 3 additions & 3 deletions app/assets/stylesheets/mails.css.scss.erb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import "theme/colors.css";
@import "theme/colors.css.scss";

$development: false;
$theme: "light";

@import "theme/theme-light.css";
@import "theme/rouge-light.css";
@import "theme/theme-light.css.scss";
@import "theme/rouge-light.css.scss";

body {
font-size: 14px;
Expand Down
22 changes: 11 additions & 11 deletions app/assets/stylesheets/models.css.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@import "models/course.css";
@import "models/course_membership.css";
@import "models/activities.css";
@import "models/repository.css";
@import "models/series.css";
@import "models/submissions.css";
@import "models/users.css";
@import "models/questions.css";
@import "models/programming_languages.css";
@import "models/score_items.css";
@import "models/institutions.css";
@import "models/course.css.scss";
@import "models/course_membership.css.scss";
@import "models/activities.css.scss";
@import "models/repository.css.scss";
@import "models/series.css.scss";
@import "models/submissions.css.scss";
@import "models/users.css.scss";
@import "models/questions.css.scss";
@import "models/programming_languages.css.scss";
@import "models/score_items.css.scss";
@import "models/institutions.css.scss";
6 changes: 3 additions & 3 deletions app/assets/stylesheets/pages.css.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@import "pages/export.css";
@import "pages/home.css";
@import "pages/sign-in.css";
@import "pages/export.css.scss";
@import "pages/home.css.scss";
@import "pages/sign-in.css.scss";
4 changes: 2 additions & 2 deletions app/assets/stylesheets/theme/theme-light.css.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "theme/development.css";
@import "theme/theme-dark.css";
@import "theme/development.css.scss";
@import "theme/theme-dark.css.scss";

// General defines
$color-red: $red-500;
Expand Down