diff --git a/README.md b/README.md index 9a6746d..cf8928b 100644 --- a/README.md +++ b/README.md @@ -106,10 +106,24 @@ If Merged served the root: root "merged/view#view" , id: 'index' ``` -Add to your stylesheet to the asset pipeline, last. Merged switches tailwind preflight off and assumes you use tailwind in your app or otherwise reset. -```application.css - *= require merged/merged.css +Include merged stylesheet to your asset +pipeline. Merged switches tailwind preflight off and assumes you +use tailwind in your app or otherwise reset. + ``` +*= 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" +``` + +If you use tailwind with the basic install, you must change the +order of stylesheet loaded in your application layout ## Contributing Ask first. diff --git a/app/assets/stylesheets/merged/merged.css b/app/assets/stylesheets/merged/merged.css index 7e89b0a..a6dbc11 100644 --- a/app/assets/stylesheets/merged/merged.css +++ b/app/assets/stylesheets/merged/merged.css @@ -313,6 +313,10 @@ select { margin: 0.5rem; } +.m-16 { + margin: 4rem; +} + .m-10 { margin: 2.5rem; } @@ -406,12 +410,8 @@ select { height: 4rem; } -.h-8 { - height: 2rem; -} - -.h-20 { - height: 5rem; +.h-10 { + height: 2.5rem; } .h-5 { @@ -550,6 +550,10 @@ select { gap: 2rem; } +.gap-16 { + gap: 4rem; +} + .gap-1 { gap: 0.25rem; }