Merge branch 'main' into latest-activity

* main: Add a new, more cheerful default color Apparently Safari supports hyphens inside textareas
2025-01-27 17:19:42 -06:00
parent a847a71a57 dd08991104
commit 5e9c65c4ff
2 changed files with 9 additions and 5 deletions
@@ -328,9 +328,13 @@
    color: var(--splat-color);
  }

-  textarea::selection {
-    background-color: var(--bubble-color);
-    color: var(--color-ink-reversed);
+  textarea {
+    hyphens: none;
+  
+    &::selection {
+      background-color: var(--bubble-color);
+      color: var(--color-ink-reversed);
+    }
  }

  @media (hover: hover) {
@@ -1,9 +1,9 @@
 module Bubble::Colored
  extend ActiveSupport::Concern

-  COLORS = %w[ #BF1B1B #ED3F1C #ED8008 #7C956B #698F9C #3B4B59 #5D618F #3B3633 #67695E ]
+  COLORS = %w[ #BF1B1B #ED3F1C #ED8008 #7C956B #698F9C #266ec3 #3B4B59 #5D618F #3B3633 #67695E ]

  included do
-    attribute :color, default: "#698F9C"
+    attribute :color, default: "#266ec3"
  end
 end