From 2658ffa0986e77f05e0c5dc9330fcb2c9617b48a Mon Sep 17 00:00:00 2001 From: Richard Higgins Date: Tue, 16 Jun 2026 16:13:21 -0400 Subject: [PATCH 1/4] Configure separate compiled stylesheets --- app/views/layouts/application.html.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 84ade92..46268e2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,8 +18,10 @@ - <%# 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", "data-turbo-track": "reload" %> + <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> + <%= javascript_importmap_tags %> From 159fc7a469f2dbb1560a7fdeb43be74278b13f16 Mon Sep 17 00:00:00 2001 From: Richard Higgins Date: Tue, 16 Jun 2026 16:15:54 -0400 Subject: [PATCH 2/4] Create files for compiling bootstrap.css and application.css --- app/assets/stylesheets/application.scss | 4 ++++ .../{application.bootstrap.scss => bootstrap.scss} | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 app/assets/stylesheets/application.scss rename app/assets/stylesheets/{application.bootstrap.scss => bootstrap.scss} (64%) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000..113a7ce --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,4 @@ +@import "homepage"; +@import "base"; +@import "footer"; +@import "card"; \ No newline at end of file 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"; From 9542273eb88dc74dcd2417cef30754fd31635777 Mon Sep 17 00:00:00 2001 From: Richard Higgins Date: Tue, 16 Jun 2026 16:18:30 -0400 Subject: [PATCH 3/4] Delete arclight.scss as redundant and move its one rule for bread-crumb divide to base.scss --- app/assets/stylesheets/arclight.scss | 6 ------ app/assets/stylesheets/base.scss | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 app/assets/stylesheets/arclight.scss 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; } From 49d0320bd726792ac70a3c33730bb9725b0dc7e0 Mon Sep 17 00:00:00 2001 From: Richard Higgins Date: Wed, 17 Jun 2026 14:22:41 -0400 Subject: [PATCH 4/4] CSS build pipeline --- app/assets/stylesheets/application.scss | 4 ++++ app/views/layouts/application.html.erb | 5 ++--- config/initializers/assets.rb | 2 ++ package.json | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 113a7ce..bfc2311 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,3 +1,7 @@ +@import "bootstrap/scss/functions"; +@import "bootstrap/scss/variables"; +@import "bootstrap/scss/mixins"; + @import "homepage"; @import "base"; @import "footer"; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 46268e2..ac861d3 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -19,9 +19,8 @@ <%# Compiles all stylesheet files in app/assets/stylesheets into bootstrap.css and, for all other files, application.css%> - <%= stylesheet_link_tag "bootstrap", "data-turbo-track": "reload" %> - <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> - + <%= 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\"" },