From b7bfdbf62fd76520e7615e9fc72cbe10463d278a Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Thu, 11 Apr 2024 16:46:31 -0400
Subject: [PATCH] (Markdown) Improve consistency of in-line code and block
 quote colors (block quotes are currently busted)

---
 src/cli/entryReader.go  |  2 +-
 src/cli/glamourStyle.go | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/cli/entryReader.go b/src/cli/entryReader.go
index d589521..52333c9 100644
--- a/src/cli/entryReader.go
+++ b/src/cli/entryReader.go
@@ -46,7 +46,7 @@ func EntryReader(decryptedEntry []string, hidePassword bool, sync bool) {
 			for field := 3; field < len(decryptedEntry); field++ {
 				markdownNotes = append(markdownNotes, decryptedEntry[field])
 			}
-			r, _ := glamour.NewTermRenderer(glamour.WithStylesFromJSONBytes(glamourStyle("gruvbox")), glamour.WithPreservedNewLines(), glamour.WithWordWrap(width))
+			r, _ := glamour.NewTermRenderer(glamour.WithStylesFromJSONBytes(glamourStyle()), glamour.WithPreservedNewLines(), glamour.WithWordWrap(width))
 			markdownNotesString, _ := r.Render(strings.Join(markdownNotes, "\n"))
 
 			// print markdown-rendered notes
diff --git a/src/cli/glamourStyle.go b/src/cli/glamourStyle.go
index afa3b39..0beac42 100644
--- a/src/cli/glamourStyle.go
+++ b/src/cli/glamourStyle.go
@@ -2,19 +2,18 @@ package cli
 
 import "strings"
 
-func glamourStyle(styleName string) []byte {
+func glamourStyle() []byte {
 	quarterHRString := strings.Repeat("─", width/4)
 	return []byte(`{
   "document": {
+	"color": "#EBDBB2",
     "block_prefix": "\n",
-    "block_suffix": "\n",
-    "color": "#EBDBB2",
-    "margin": 0
+    "block_suffix": "\n"
   },
   "block_quote": {
-    "indent": 2,
-    "indent_token": "│ ",
-    "color": "109"
+	"color": "#A89984",
+    "indent": 4,
+    "indent_token": "│ "
   },
   "paragraph": {},
   "list": {
@@ -97,13 +96,12 @@ func glamourStyle(styleName string) []byte {
   "code": {
     "prefix": "",
     "suffix": "",
-    "color": "203",
-    "background_color": "236"
+    "color": "#FB4934",
+    "background_color": "#3C3836"
   },
   "code_block": {
     "block_prefix": "` + quarterHRString + "code" + quarterHRString + "\\n" + `",
     "block_suffix": "` + strings.Repeat(quarterHRString, 2) + "────\\n" + `",
-    "color": "248",
     "chroma": {
       "text": {
         "color": "#A89984"