Skip to content

structure styles a bit #1405

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
mockdeep merged 1 commit into from
Feb 18, 2026
+9 −20
Merged

structure styles a bit #1405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions app/assets/stylesheets/application.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import url("./custom.css");

html, body {
height: 100%;
color: #484948;
Expand Down
5 changes: 5 additions & 0 deletions app/assets/stylesheets/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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");
5 changes: 0 additions & 5 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,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' %>
</head>
Expand Down
4 changes: 0 additions & 4 deletions app/views/tutorials/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<% content_for :head do %>
<%= stylesheet_link_tag 'reenie-beanie-font', media: 'all', 'data-turbolinks-track': 'reload' %>
<% end %>

<div class="tutorial-overlay">
<p class="instruction" id="mark-all-instruction"><%= t('tutorial.mark_all') %> <br/><%= t('tutorial.as_read') %></p>
</div>
Expand Down
9 changes: 0 additions & 9 deletions config/initializers/assets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
]
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 @@ -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",
Expand Down