diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
new file mode 100644
index 0000000..bfc2311
--- /dev/null
+++ b/app/assets/stylesheets/application.scss
@@ -0,0 +1,8 @@
+@import "bootstrap/scss/functions";
+@import "bootstrap/scss/variables";
+@import "bootstrap/scss/mixins";
+
+@import "homepage";
+@import "base";
+@import "footer";
+@import "card";
\ No newline at end of file
diff --git a/app/assets/stylesheets/arclight.scss b/app/assets/stylesheets/arclight.scss
deleted file mode 100644
index 770982e..0000000
--- a/app/assets/stylesheets/arclight.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-:root {
- --bs-breadcrumb-divider: "»";
-}
-
-// Arclight, imported from arclight frontend package
-@import 'arclight/app/assets/stylesheets/arclight/application';
diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss
index 3bd3b4c..8845713 100644
--- a/app/assets/stylesheets/base.scss
+++ b/app/assets/stylesheets/base.scss
@@ -1,6 +1,10 @@
/* ====================== */
/* GLOBAL */
/* ====================== */
+:root {
+ --bs-breadcrumb-divider: "»";
+}
+
html {
scroll-padding-top: 2rem;
}
diff --git a/app/assets/stylesheets/application.bootstrap.scss b/app/assets/stylesheets/bootstrap.scss
similarity index 64%
rename from app/assets/stylesheets/application.bootstrap.scss
rename to app/assets/stylesheets/bootstrap.scss
index 39e3c03..b67e847 100644
--- a/app/assets/stylesheets/application.bootstrap.scss
+++ b/app/assets/stylesheets/bootstrap.scss
@@ -1,8 +1,3 @@
@import 'bootstrap/scss/bootstrap';
@import 'bootstrap-icons/font/bootstrap-icons';
@import "blacklight-frontend/app/assets/stylesheets/blacklight/blacklight";
-@import "arclight";
-@import "homepage";
-@import "base";
-@import "footer";
-@import "card";
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 84ade92..ac861d3 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -18,8 +18,9 @@
- <%# Includes all stylesheet files in app/assets/stylesheets %>
- <%= stylesheet_link_tag :app, "data-turbo-track": "reload" %>
+ <%# Compiles all stylesheet files in app/assets/stylesheets into bootstrap.css and, for all other files, application.css%>
+ <%= stylesheet_link_tag "bootstrap.css", "data-turbo-track": "reload" %>
+ <%= stylesheet_link_tag "application.css", "data-turbo-track": "reload" %>
<%= javascript_importmap_tags %>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 5ff4276..d3c2f77 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -8,3 +8,5 @@
Rails.application.config.assets.paths << Rails.root.join("node_modules/bootstrap-icons/font")
Rails.application.config.assets.paths << Rails.root.join("node_modules/bootstrap/dist/js")
Rails.application.config.assets.precompile << "bootstrap.bundle.min.js"
+Rails.application.config.assets.paths << Rails.root.join("app/assets/builds")
+Rails.application.config.assets.precompile += %w[ bootstrap.css application.css ]
\ No newline at end of file
diff --git a/package.json b/package.json
index 31a2baa..9ea9480 100644
--- a/package.json
+++ b/package.json
@@ -14,8 +14,8 @@
"sass": "^1.100.0"
},
"scripts": {
- "build:css:compile": "sass ./app/assets/stylesheets/application.bootstrap.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules",
- "build:css:prefix": "postcss ./app/assets/builds/application.css --use=autoprefixer --output=./app/assets/builds/application.css",
+ "build:css:compile": "sass ./app/assets/stylesheets/bootstrap.scss:./app/assets/builds/bootstrap.css ./app/assets/stylesheets/application.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules",
+ "build:css:prefix": "postcss ./app/assets/builds/bootstrap.css --use=autoprefixer --output=./app/assets/builds/bootstrap.css && postcss ./app/assets/builds/application.css --use=autoprefixer --output=./app/assets/builds/application.css",
"build:css": "yarn build:css:compile && yarn build:css:prefix",
"watch:css": "nodemon --watch ./app/assets/stylesheets/ --ext scss --exec \"yarn build:css\""
},