Skip to content

Commit 52dc7a4

Browse files
authored
Assets: Fix asset bundling & paths (#3137)
1 parent 5f49fd1 commit 52dc7a4

File tree

793 files changed

+282
-8223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

793 files changed

+282
-8223
lines changed

app/assets/stylesheets/application.bootstrap.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ $color-mode-type: media-query;
77

88
@use 'bootstrap/scss/bootstrap';
99
@use 'bootstrap-icons/font/bootstrap-icons';
10-
@use "flag-icons/css/flag-icons.min.css";
10+
11+
$fi-path: "/flags" !default;
12+
@use "flag-icons/sass/flag-icons";
1113

1214
/* Import the selected theme - to be setup before build */
1315
@use "themes/selected";

config/initializers/assets.rb

-9
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,9 @@
66
Rails.application.config.assets.version = "1.0"
77

88
# Add additional assets to the asset load path.
9-
Rails.application.config.assets.paths << Rails.root.join("vendor/stylesheets")
10-
Rails.application.config.assets.paths << Rails.root.join("vendor/stylesheets/@fontsource/roboto/files")
11-
Rails.application.config.assets.paths << Rails.root.join("vendor/stylesheets/@fontsource/roboto-slab/files")
12-
Rails.application.config.assets.paths << Rails.root.join("vendor/stylesheets/@fontsource/roboto-mono/files")
13-
149
Rails.application.config.assets.paths << Rails.root.join("node_modules/bootstrap-icons")
1510
Rails.application.config.assets.paths << Rails.root.join("node_modules/bootstrap-icons/font")
1611

17-
Rails.application.config.assets.paths << Rails.root.join("node_modules/flag-icons")
18-
Rails.application.config.assets.paths << Rails.root.join("node_modules/flag-icons/css")
19-
Rails.application.config.assets.paths << Rails.root.join("node_modules/flag-icons/flags")
20-
2112
# Precompile additional assets.
2213
# application.js, application.css, and all non-JS/CSS in the app/assets
2314
# folder are already added.

package.json

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
"name": "PasswordPusher",
33
"private": true,
44
"dependencies": {
5+
"@fontsource/roboto": "^5.1.1",
6+
"@fontsource/roboto-mono": "^5.1.1",
7+
"@fontsource/roboto-slab": "^5.1.1",
58
"@hotwired/stimulus": "^3.2.1",
69
"@hotwired/turbo-rails": "^8.0.3",
710
"@popperjs/core": "^2.11.8",

0 commit comments

Comments
 (0)