fixing use of merged stylesheet

This commit is contained in:
Torsten 2022-12-07 21:52:32 +02:00
parent cd4b1860d6
commit b48247c103
4 changed files with 5 additions and 4 deletions

View File

@ -1,6 +1,6 @@
GIT
remote: https://github.com/HubFeenixMakers/merged
revision: badcd70aebfe9227828c5c3abf0202141aed4292
revision: c83558f8d59a30db8516b75549c0a623e804332b
specs:
merged (0.1.0)
git

View File

@ -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
*/

View File

@ -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"

View File

@ -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: {