From 5b8b910d94b801d15daf0b0eb2a949b34bc33f7d Mon Sep 17 00:00:00 2001
From: Henry Heino <henryuheino@gmail.com>
Date: Sun, 28 Apr 2024 20:43:53 -0700
Subject: [PATCH 1/3] Fix "text color" hidden in toolbar

---
 src/scss/components/_components.editor.scss | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/scss/components/_components.editor.scss b/src/scss/components/_components.editor.scss
index 688f110..0ecd4c4 100644
--- a/src/scss/components/_components.editor.scss
+++ b/src/scss/components/_components.editor.scss
@@ -632,20 +632,25 @@
     padding: 0;
 
     &:focus-within:hover {
-      button:focus:not(:hover) {
-        @include dropdownItemDefault();
+      &, .tox-split-button {
+        &:not(:hover) {
+          @include dropdownItemDefault();
+        }
       }
     }
 
-    button {
+    button, .tox-split-button {
       @include dropdownItem();
 
       justify-content: flex-start;
       flex: 1;
       text-align: left;
-      width: calc(100% - 2rem);
+      width: 100%;
+      box-sizing: border-box;
 
       &:after {
+        padding: 0.5rem 0;
+
         color: inherit;
         content: attr(aria-label);
         text-align: left;

From f57f139f21bb72d22465e6c7286966dd86cb4c72 Mon Sep 17 00:00:00 2001
From: Henry Heino <henryuheino@gmail.com>
Date: Sun, 28 Apr 2024 20:56:11 -0700
Subject: [PATCH 2/3] Fix styling of color selector menu

---
 src/scss/components/_components.editor.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/scss/components/_components.editor.scss b/src/scss/components/_components.editor.scss
index 0ecd4c4..b483e90 100644
--- a/src/scss/components/_components.editor.scss
+++ b/src/scss/components/_components.editor.scss
@@ -663,6 +663,11 @@
   }
 }
 
+// color menu -- more selectors for extra specificity
+.tox .tox-menu.tox-swatches-menu {
+  @include dropdownBackground();
+}
+
 // table menu
 .tox-menu {
   @include dropdownBackground();

From 3b03e4b3e30f90a0f74865a0cb7be9ebd6cd3f81 Mon Sep 17 00:00:00 2001
From: Andre <mail@andrejilderda.nl>
Date: Sun, 12 May 2024 15:50:47 +0200
Subject: [PATCH 3/3] chore: add changeset

---
 .changeset/nervous-cats-design.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/nervous-cats-design.md

diff --git a/.changeset/nervous-cats-design.md b/.changeset/nervous-cats-design.md
new file mode 100644
index 0000000..f0dd1b2
--- /dev/null
+++ b/.changeset/nervous-cats-design.md
@@ -0,0 +1,5 @@
+---
+"joplin-plugin-macos-theme": patch
+---
+
+fix: show "text color" option in rich text editor toolbar (thanks to @personalizedrefrigerator)