diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index cf5333d..41e09ec 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -5,3 +5,4 @@ //= link controllers/application.js //= link controllers/index.js //= link_tree ../../javascript .js +//= link calendar.tailwind.css diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index 73ab48c..7105816 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -1,13 +1,4 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; -@import "tailwindcss"; -/* - -@layer components { - .btn-primary { - @apply py-2 px-4 bg-blue-200; - } -} - -*/ \ No newline at end of file +@import "tailwindcss/base"; +@import "tailwindcss/components"; +@import "tailwindcss/utilities"; +@import "tailwindcss"; \ No newline at end of file diff --git a/app/assets/tailwind/application.css b/app/assets/tailwind/application.css index f1d8c73..b66bd67 100644 --- a/app/assets/tailwind/application.css +++ b/app/assets/tailwind/application.css @@ -1 +1,4 @@ @import "tailwindcss"; +@import "tailwindcss/base"; +@import "tailwindcss/components"; +@import "tailwindcss/utilities"; \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ae039d7..511fb02 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -9,7 +9,6 @@ <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %> - <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> <%= javascript_importmap_tags %> diff --git a/config/environments/development.rb b/config/environments/development.rb index 00a094f..5070eec 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -63,6 +63,8 @@ Rails.application.configure do # Suppress logger output for asset requests. config.assets.quiet = true + config.assets.compile = true + # Raises error for missing translations. # config.i18n.raise_on_missing_translations = true diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 2eeef96..8637866 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -10,3 +10,5 @@ Rails.application.config.assets.version = "1.0" # application.js, application.css, and all non-JS/CSS in the app/assets # folder are already added. # Rails.application.config.assets.precompile += %w( admin.js admin.css ) + +Rails.application.config.assets.precompile += %w( application.tailwind.css )