Merge pull request #1582 from DissNik/3.x

classes for color text
moonshine-software · Mar 3, 2025 · efd58b4 · efd58b4
2 parents ed1ac3f + d4c4d7b
commit efd58b4
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 6 deletions.
diff --git a/src/UI/resources/css/components/colors.css b/src/UI/resources/css/components/colors.css
@@ -1,3 +1,38 @@
+/* text colors */
+.text-success {
+  @apply text-success-text;
+}
+.text-error {
+  @apply text-success-text;
+}
+.text-warning {
+  @apply text-warning-text;
+}
+.text-info {
+  @apply text-info-text;
+}
+.text-purple {
+  @apply text-purple-500;
+}
+.text-pink {
+  @apply text-pink-500;
+}
+.text-blue {
+  @apply text-blue-500;
+}
+.text-green {
+  @apply text-green-500;
+}
+.text-yellow {
+  @apply text-yellow-500;
+}
+.text-red {
+  @apply text-red-500;
+}
+.text-gray {
+  @apply text-gray-500;
+}
+
 /* Background colors */
 .bgc-primary {
   @apply !bg-primary text-white;

diff --git a/src/UI/resources/views/components/icon.blade.php b/src/UI/resources/views/components/icon.blade.php
@@ -5,9 +5,9 @@
     'color' => '',
 ])
 <div {{ $attributes->class([
-    'text-current',
     'w-' . ($size ?? 5),
     'h-' . ($size ?? 5),
+    'text-current' => empty($color),
     "text-$color" => !empty($color),
 ]) }}>
     @if($slot?->isNotEmpty())

diff --git a/src/UI/tailwind.config.js b/src/UI/tailwind.config.js
@@ -6,11 +6,6 @@ const vendorSafeList = [
     pattern: /col-span-\d/,
     variants: isDevelopment() ? ['xl'] : ['xs', 'sm', 'md', 'lg', 'xl', '2xl'],
   },
-  {
-    // usage: icons
-    pattern: /text-(pink|purple)/,
-    variants: isDevelopment() ? [] : ['xs', 'sm', 'md', 'lg', 'xl', '2xl'],
-  },
   {
     // usage: flex align items
     pattern: /items-(start|end|center|baseline|stretch)/,