Skip to content

ARC-134 refactor SCSS #20

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.

Sign up for GitHub

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

Merged
rshiggin merged 4 commits into from
Jun 18, 2026
Merged

ARC-134 refactor SCSS #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2658ffa
Configure separate compiled stylesheets
rshiggin Jun 16, 2026
159fc7a
Create files for compiling bootstrap.css and application.css
rshiggin Jun 16, 2026
9542273
Delete arclight.scss as redundant and move its one rule for bread-cru…
rshiggin Jun 16, 2026
49d0320
CSS build pipeline
rshiggin Jun 17, 2026
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
8 changes: 8 additions & 0 deletions app/assets/stylesheets/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@import "bootstrap/scss/functions";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/mixins";

@import "homepage";
@import "base";
@import "footer";
@import "card";
6 changes: 0 additions & 6 deletions app/assets/stylesheets/arclight.scss
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions app/assets/stylesheets/base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
/* ====================== */
/* GLOBAL */
/* ====================== */
:root {
--bs-breadcrumb-divider: "»";
}

html {
scroll-padding-top: 2rem;
}
Expand Down
5 changes: 0 additions & 5 deletions ...ts/stylesheets/application.bootstrap.scss → app/assets/stylesheets/bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
5 changes: 3 additions & 2 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
<link rel="icon" href="/icon.svg" type="image/svg+xml">
<link rel="apple-touch-icon" href="/icon.png">

<%# 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 %>
</head>

Expand Down
2 changes: 2 additions & 0 deletions config/initializers/assets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\""
},
Expand Down
Loading