From fb09e3e8f5593ab2bbae30d1e48ed1c566795806 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Wed, 4 Jan 2023 23:51:53 +0200
Subject: [PATCH 1/2] prose styles

---
 app/assets/stylesheets/application.css |  4 +++
 config/tailwind.config.js              | 39 ++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 976687f..2382d22 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -15,3 +15,7 @@
 #thredded--container{
   max-width: 60rem;
 }
+
+.prose{
+  color: inherit;
+}
diff --git a/config/tailwind.config.js b/config/tailwind.config.js
index 0cc866a..4944cb3 100644
--- a/config/tailwind.config.js
+++ b/config/tailwind.config.js
@@ -20,6 +20,45 @@ module.exports = {
       fontFamily: {
         sans: ['Inter var', ...defaultTheme.fontFamily.sans],
       },
+      typography: ({ theme }) => ({
+        inherit: {
+          css: {
+            '--tw-prose-body': 'inherit' ,
+            '--tw-prose-headings': 'inherit',
+            '--tw-prose-lead': 'inherit' ,
+            '--tw-prose-links': 'inherit' ,
+            '--tw-prose-bold': 'inherit' ,
+            '--tw-prose-counters': 'inherit' ,
+            '--tw-prose-bullets': 'inherit' ,
+            '--tw-prose-hr': 'inherit' ,
+            '--tw-prose-quotes': 'inherit' ,
+            '--tw-prose-quote-borders': 'inherit' ,
+            '--tw-prose-captions': 'inherit' ,
+            '--tw-prose-code': 'inherit' ,
+            '--tw-prose-pre-code': 'inherit' ,
+            '--tw-prose-pre-bg': 'inherit' ,
+            '--tw-prose-th-borders': 'inherit' ,
+            '--tw-prose-td-borders': 'inherit' ,
+            '--tw-prose-invert-body': 'inherit' ,
+            '--tw-prose-invert-headings': 'inherit',
+            '--tw-prose-invert-lead': 'inherit' ,
+            '--tw-prose-invert-links': 'inherit',
+            '--tw-prose-invert-bold': 'inherit',
+            '--tw-prose-invert-counters': 'inherit' ,
+            '--tw-prose-invert-bullets': 'inherit' ,
+            '--tw-prose-invert-hr': 'inherit' ,
+            '--tw-prose-invert-quotes': 'inherit' ,
+            '--tw-prose-invert-quote-borders': 'inherit' ,
+            '--tw-prose-invert-captions': 'inherit' ,
+            '--tw-prose-invert-code': 'inherit',
+            '--tw-prose-invert-pre-code': 'inherit' ,
+            '--tw-prose-invert-pre-bg': 'inherit',
+            '--tw-prose-invert-th-borders': 'inherit' ,
+            '--tw-prose-invert-td-borders': 'inherit' ,
+
+          },
+        },
+      }),
     },
   },
   plugins: [

From 31a312b3814edf2f318163e8e74b72f8d59622e5 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Thu, 5 Jan 2023 13:58:25 +0200
Subject: [PATCH 2/2] update merged

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4d5e043..ce2edde 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/HubFeenixMakers/merged
-  revision: 7a31f53835fcee4adefa42ddc44a1fad0e1a1772
+  revision: e68188b1a8660468259eaaa36e0237160671d9bc
   specs:
     merged (0.1.0)
       active_hash
@@ -261,7 +261,7 @@ GEM
       sanitize
     open4 (1.3.4)
     orm_adapter (0.5.0)
-    parser (3.1.3.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
     passenger (6.0.15)
       rack