diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index be1a166b4..2fe1bf2d6 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1,3 +1,5 @@ +@import url("./custom.css"); + html, body { height: 100%; color: #484948; diff --git a/app/assets/stylesheets/custom.css b/app/assets/stylesheets/custom.css new file mode 100644 index 000000000..fee1a3364 --- /dev/null +++ b/app/assets/stylesheets/custom.css @@ -0,0 +1,5 @@ +@import url("bootstrap/dist/css/bootstrap.min.css"); +@import url("font-awesome/css/font-awesome.min.css"); +@import url("@fontsource/lato/latin.css"); +@import url("@fontsource/lato/latin-400-italic.css"); +@import url("@fontsource/reenie-beanie/latin.css"); diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 73809a4dd..5df14d1bd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -18,11 +18,6 @@ <%= content_for(:head) %> - <%= stylesheet_link_tag 'bootstrap.min' %> - <%= stylesheet_link_tag 'font-awesome.min' %> - <%= stylesheet_link_tag 'font-awesome-fonts' %> - <%= stylesheet_link_tag 'lato-fonts' %> - <%= stylesheet_link_tag 'reenie-beanie-font' %> <%= stylesheet_link_tag 'application' %> <%= javascript_include_tag 'application' %> diff --git a/app/views/tutorials/index.html.erb b/app/views/tutorials/index.html.erb index d06a29046..d7e0aa516 100644 --- a/app/views/tutorials/index.html.erb +++ b/app/views/tutorials/index.html.erb @@ -1,7 +1,3 @@ -<% content_for :head do %> - <%= stylesheet_link_tag 'reenie-beanie-font', media: 'all', 'data-turbolinks-track': 'reload' %> -<% end %> -
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index a03989a36..f906711c2 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -1,12 +1,3 @@ # frozen_string_literal: true # Be sure to restart your server when you modify this file. - -# Add additional assets to the asset load path. -Rails.application.config.assets.paths += [ - Rails.root.join("node_modules/bootstrap/dist/css"), - Rails.root.join("node_modules/@fontsource/lato/files"), - Rails.root.join("node_modules/@fontsource/reenie-beanie/files"), - Rails.root.join("node_modules/font-awesome/css"), - Rails.root.join("node_modules/font-awesome/fonts") -] diff --git a/package.json b/package.json index 2965f61a5..38c531b60 100644 --- a/package.json +++ b/package.json @@ -50,8 +50,8 @@ "vitest": "^4.0.18" }, "scripts": { - "build": "esbuild app/javascript/*.* --bundle --sourcemap --format=iife --outdir=app/assets/builds --public-path=/assets --alias:jquery=./node_modules/jquery/jquery.js --alias:bootstrap=./node_modules/bootstrap/dist/js/bootstrap.js --alias:jquery-visible=./node_modules/jquery-visible/jquery.visible.min.js", - "build:css": "esbuild app/assets/stylesheets/application.css --bundle --outdir=app/assets/builds --public-path=/assets --external:/img/*", + "build": "esbuild app/javascript/application.ts --bundle --sourcemap --format=iife --outdir=app/assets/builds --public-path=/assets --alias:jquery=./node_modules/jquery/jquery.js --alias:bootstrap=./node_modules/bootstrap/dist/js/bootstrap.js --alias:jquery-visible=./node_modules/jquery-visible/jquery.visible.min.js", + "build:css": "esbuild app/assets/stylesheets/application.css --bundle --outdir=app/assets/builds --public-path=/assets --external:/img/* --loader:.woff=file --loader:.woff2=file --loader:.eot=file --loader:.ttf=file --loader:.svg=file", "eslint": "eslint ./ --cache --max-warnings=0", "eslint_find_unused_rules": "eslint-find-rules --unused --flatConfig --no-core eslint.config.ts", "pretest": "pnpm tscheck && pnpm eslint",