diff --git a/README.md b/README.md index cf8928b..85c0c56 100644 --- a/README.md +++ b/README.md @@ -106,24 +106,16 @@ If Merged served the root: root "merged/view#view" , id: 'index' ``` -Include merged stylesheet to your asset -pipeline. Merged switches tailwind preflight off and assumes you -use tailwind in your app or otherwise reset. +Include merged stylesheet to your layout (NOT asset +pipeline). ``` -*= require merged/merged -``` - -This also means means you should have the tailwind include -tag before the application in your layout. - -``` -= 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" ``` -If you use tailwind with the basic install, you must change the -order of stylesheet loaded in your application layout +If you use tailwind with the basic install, add it after tailwind ## Contributing Ask first. diff --git a/config/tailwind.config.js b/config/tailwind.config.js index 180102f..6aeaec4 100644 --- a/config/tailwind.config.js +++ b/config/tailwind.config.js @@ -7,9 +7,6 @@ module.exports = { './app/javascript/**/*.js', './app/views/**/*.{erb,haml,html,slim}' ], - corePlugins: { - preflight: false, - }, plugins: [ require('@tailwindcss/forms'), require('@tailwindcss/aspect-ratio'),