diff --git a/Gemfile.lock b/Gemfile.lock index 951eafb..62d19d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: badcd70aebfe9227828c5c3abf0202141aed4292 + revision: c83558f8d59a30db8516b75549c0a623e804332b specs: merged (0.1.0) git diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index b7e7fc4..4c17e6d 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -10,7 +10,5 @@ * files in this directory. Styles in this file should be added after the last require_* statement. * It is generally better to create a new file per style scope. * - *= require_tree . *= require_self - *= require merged/merged.css */ diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml index 2f5b4f8..d6fba6b 100644 --- a/app/views/layouts/application.haml +++ b/app/views/layouts/application.haml @@ -6,8 +6,10 @@ %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/ = csrf_meta_tags = csp_meta_tag - = stylesheet_link_tag "tailwind" , "inter-font", "data-turbo-track": "reload" = stylesheet_link_tag "application" + = stylesheet_link_tag "tailwind" , "inter-font", "data-turbo-track": "reload" + = stylesheet_link_tag "merged/merged" + = javascript_importmap_tags %body =render "layouts/header" diff --git a/config/tailwind.config.js b/config/tailwind.config.js index 46ce501..c51706a 100644 --- a/config/tailwind.config.js +++ b/config/tailwind.config.js @@ -6,6 +6,7 @@ module.exports = { './app/helpers/**/*.rb', './app/javascript/**/*.js', './app/views/**/*.{erb,haml,html,slim}' , + '../app/views/**/*.{erb,haml,html,slim}' , ], theme: { extend: {