diff --git a/Gemfile.lock b/Gemfile.lock index 4c7f6e5..38e47ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/HubFeenixMakers/merged - revision: 75915b3fe20b1d0dbb8269875c1d19f89f36cf78 + revision: 924eb6317c815c88675e65d72b4da8253bee2aae specs: merged (0.1.0) active_hash diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index 720ae9f..8189210 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -1,19 +1,2 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; - - -@layer components { - .button { - @apply inline-block rounded-lg px-3 py-2 text-base font-medium border border-gray-500 hover:border-black; - } - .change { - @apply bg-cyan-200; - } - .remove { - @apply bg-red-200; - } - .action { - @apply bg-green-200; - } -} +@import "tailwind_base"; +@import "merged_tailwind_styles"; diff --git a/app/assets/stylesheets/merged_tailwind_styles.css b/app/assets/stylesheets/merged_tailwind_styles.css new file mode 100644 index 0000000..d52983c --- /dev/null +++ b/app/assets/stylesheets/merged_tailwind_styles.css @@ -0,0 +1,21 @@ +.prose { + max-width: 100%; + color: inherit; + --tw-prose-bullets: #6b7280; + --tw-prose-headings: inherit; +} + +@layer components { + .button { + @apply inline-block rounded-lg px-3 py-2 text-base font-medium border border-gray-500 hover:border-black; + } + .change { + @apply bg-cyan-200; + } + .remove { + @apply bg-red-200; + } + .action { + @apply bg-green-200; + } +} diff --git a/app/assets/stylesheets/tailwind_base.css b/app/assets/stylesheets/tailwind_base.css new file mode 100644 index 0000000..b5c61c9 --- /dev/null +++ b/app/assets/stylesheets/tailwind_base.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities;