From 038a0cc78dd39b38c730ae5475bc33e13d0fd111 Mon Sep 17 00:00:00 2001
From: Dorako <dirako@gmail.com>
Date: Sun, 6 Nov 2022 09:10:03 +0100
Subject: [PATCH] 1.8.1

---
 CHANGELOG.md         |  6 ++++++
 module.json          |  4 ++--
 scripts/dorako-ui.js |  4 ++--
 styles/chat.css      | 18 +++++++++++++++++-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77469f1..098ab69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.8.1
+
+Fixed display of combined messages with Avatars disabled.
+
+Fixed flavor-text duplication for Request Roll messages in Monk's TokenBar module.
+
 # 1.8.0
 
 Fixed visual styling of Narrator Tools and Alpha Suit modules in the Controls.
diff --git a/module.json b/module.json
index ae45f97..db07506 100644
--- a/module.json
+++ b/module.json
@@ -12,7 +12,7 @@
       "flags": {}
     }
   ],
-  "version": "1.8.0",
+  "version": "1.8.1",
   "compatibility": {
     "minimum": "10",
     "verified": "10"
@@ -59,6 +59,6 @@
   ],
   "styles": ["styles/fonts.css"],
   "scripts": ["scripts/dorako-ui.js"],
-  "download": "https://github.com/Dorako/pf2e-dorako-ui/archive/refs/tags/v1.8.0.zip",
+  "download": "https://github.com/Dorako/pf2e-dorako-ui/archive/refs/tags/v1.8.1.zip",
   "manifest": "https://github.com/Dorako/pf2e-dorako-ui/releases/latest/download/module.json"
 }
diff --git a/scripts/dorako-ui.js b/scripts/dorako-ui.js
index 5cb87cd..db9c84d 100644
--- a/scripts/dorako-ui.js
+++ b/scripts/dorako-ui.js
@@ -402,8 +402,8 @@ function themeHeader(html, message) {
 
 function moveFlavorTextToContents(html) {
   let flavor = html.find(".flavor-text")[0];
-  let contents = html.find(".message-content");
-  contents.prepend(flavor);
+  let contents = html.find(".message-content")[0];
+  if (flavor) contents.prepend(flavor);
 }
 
 function injectSenderWrapper(html, messageData) {
diff --git a/styles/chat.css b/styles/chat.css
index 31d5263..82c1af6 100644
--- a/styles/chat.css
+++ b/styles/chat.css
@@ -355,7 +355,8 @@ button {
 
 
 
-
+.dfce-cm-middle>.message-header .sender-wrapper,
+.dfce-cm-bottom>.message-header .sender-wrapper,
 .dfce-cm-middle>.message-header>.message-metadata,
 .dfce-cm-bottom>.message-header>.message-metadata {
     display: none;
@@ -414,6 +415,15 @@ button {
     margin-left: 0px; */
 }
 
+.message.dfce-cm-bottom .message-header,
+.message.dfce-cm-middle .message-header {
+    background: transparent;
+    box-shadow: none;
+    text-shadow: 0px 0px 1px white;
+    margin: 0px;
+    padding: 0px;
+    padding-right: 5px;
+}
 
 .message.dfce-cm-top {
     border-bottom-style: none !important;
@@ -1475,6 +1485,12 @@ div#scrollToBottom:hover {
     background-blend-mode: multiply;
 }
 
+.message.dfce-cm-middle .message-header.light-header-text,
+.message.dfce-cm-bottom .message-header.light-header-text {
+    color: var(--pf2e-body-primary);
+    text-shadow: var(--pf2e-shadow-is-light);
+}
+
 .message .message-header {
     text-shadow: var(--pf2e-shadow-is-light);
     color: black;