Merge pull request #127 from personalizedrefrigerator/main

Fix #124: Show "text color" option in rich text editor toolbar
andrejilderda · May 12, 2024 · 55488b1 · 55488b1
2 parents 81fd383 + 31f1d15
commit 55488b1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/.changeset/nervous-cats-design.md 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)
diff --git 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;
@@ -658,6 +663,11 @@
   }
 }
 
+// color menu -- more selectors for extra specificity
+.tox .tox-menu.tox-swatches-menu {
+  @include dropdownBackground();
+}
+
 // table menu
 .tox-menu {
   @include dropdownBackground();