Skip to content

Commit

Permalink
Align asset filenames across all asset sources
Browse files Browse the repository at this point in the history
While taking care of #3466 by moving custom stylesheets under vendor/
  • Loading branch information
mshibuya committed Feb 27, 2022
1 parent ee0645f commit 74206b2
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 4 deletions.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions app/views/layouts/rails_admin/_head.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<%= javascript_pack_tag "rails_admin", async: true %>
<% when :webpack, :sprockets %>
<% handle_asset_dependency_error do %>
<%= stylesheet_link_tag "rails_admin/application.css", media: :all %>
<%= javascript_include_tag "rails_admin/application.js", async: true %>
<%= stylesheet_link_tag "rails_admin.css", media: :all %>
<%= javascript_include_tag "rails_admin.js", async: true %>
<% end %>
<% else
raise "Unknown asset_source: #{RailsAdmin::config.asset_source}"
Expand Down
4 changes: 2 additions & 2 deletions lib/rails_admin/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ class Engine < Rails::Engine
initializer 'RailsAdmin precompile hook', group: :all do |app|
if app.config.respond_to?(:assets)
app.config.assets.precompile += %w[
rails_admin/application.js
rails_admin/application.css
rails_admin.js
rails_admin.css
]
app.config.assets.paths << RailsAdmin::Engine.root.join('src')
require 'rails_admin/support/esmodule_preprocessor'
Expand Down

0 comments on commit 74206b2

Please sign in to comment.