fix: color conversion (#1501)

Author: lukasvinclav

docs/configuration/settings.md

@@ -67,30 +67,30 @@ UNFOLD = {
     "BORDER_RADIUS": "6px",
     "COLORS": {
         "base": {
-            "50": "249, 250, 251",
-            "100": "243, 244, 246",
-            "200": "229, 231, 235",
-            "300": "209, 213, 219",
-            "400": "156, 163, 175",
-            "500": "107, 114, 128",
-            "600": "75, 85, 99",
-            "700": "55, 65, 81",
-            "800": "31, 41, 55",
-            "900": "17, 24, 39",
-            "950": "3, 7, 18",
+            "50": "oklch(98.5% .002 247.839)",
+            "100": "oklch(96.7% .003 264.542)",
+            "200": "oklch(92.8% .006 264.531)",
+            "300": "oklch(87.2% .01 258.338)",
+            "400": "oklch(70.7% .022 261.325)",
+            "500": "oklch(55.1% .027 264.364)",
+            "600": "oklch(44.6% .03 256.802)",
+            "700": "oklch(37.3% .034 259.733)",
+            "800": "oklch(27.8% .033 256.848)",
+            "900": "oklch(21% .034 264.665)",
+            "950": "oklch(13% .028 261.692)",
         },
         "primary": {
-            "50": "250, 245, 255",
-            "100": "243, 232, 255",
-            "200": "233, 213, 255",
-            "300": "216, 180, 254",
-            "400": "192, 132, 252",
-            "500": "168, 85, 247",
-            "600": "147, 51, 234",
-            "700": "126, 34, 206",
-            "800": "107, 33, 168",
-            "900": "88, 28, 135",
-            "950": "59, 7, 100",
+            "50": "oklch(97.7% .014 308.299)",
+            "100": "oklch(94.6% .033 307.174)",
+            "200": "oklch(90.2% .063 306.703)",
+            "300": "oklch(82.7% .119 306.383)",
+            "400": "oklch(71.4% .203 305.504)",
+            "500": "oklch(62.7% .265 303.9)",
+            "600": "oklch(55.8% .288 302.321)",
+            "700": "oklch(49.6% .265 301.924)",
+            "800": "oklch(43.8% .218 303.724)",
+            "900": "oklch(38.1% .176 304.987)",
+            "950": "oklch(29.1% .149 302.717)",
         },
         "font": {
             "subtle-light": "var(--color-base-500)",  # text-base-500

src/unfold/utils.py

@@ -202,5 +202,9 @@ def convert_color(value: str) -> str:
         return value
     elif isinstance(value, str) and all(part.isdigit() for part in value.split()):
         return f"rgb({', '.join(value.split(' '))})"
+    elif isinstance(value, str) and all(
+        part.strip().isdigit() for part in value.split(",")
+    ):
+        return f"rgb({', '.join(part.strip() for part in value.split(','))})"
 
     return value

tests/test_colors.py

@@ -93,6 +93,49 @@ def test_colors_rgb():
     assert context["colors"]["primary"][950] == "rgb(8, 47, 73)"
 
 
+@override_settings(
+    UNFOLD={
+        **CONFIG_DEFAULTS,
+        **{
+            "COLORS": {
+                "primary": {
+                    50: "240, 249, 255",
+                    100: "224, 242, 254",
+                    200: "186, 230, 253",
+                    300: "125, 211, 252",
+                    400: "56, 189, 248",
+                    500: "14, 165, 233",
+                    600: "2, 132, 199",
+                    700: "3, 105, 161",
+                    800: "7, 89, 133",
+                    900: "12, 74, 110",
+                    950: "8, 47, 73",
+                }
+            },
+        },
+    }
+)
+def test_colors_rgb_with_commas():
+    admin_site = UnfoldAdminSite()
+    request = RequestFactory().get("/rand")
+    request.user = AnonymousUser()
+    context = admin_site.each_context(request)
+    assert "colors" in context
+    assert "primary" in context["colors"]
+
+    assert context["colors"]["primary"][50] == "rgb(240, 249, 255)"
+    assert context["colors"]["primary"][100] == "rgb(224, 242, 254)"
+    assert context["colors"]["primary"][200] == "rgb(186, 230, 253)"
+    assert context["colors"]["primary"][300] == "rgb(125, 211, 252)"
+    assert context["colors"]["primary"][400] == "rgb(56, 189, 248)"
+    assert context["colors"]["primary"][500] == "rgb(14, 165, 233)"
+    assert context["colors"]["primary"][600] == "rgb(2, 132, 199)"
+    assert context["colors"]["primary"][700] == "rgb(3, 105, 161)"
+    assert context["colors"]["primary"][800] == "rgb(7, 89, 133)"
+    assert context["colors"]["primary"][900] == "rgb(12, 74, 110)"
+    assert context["colors"]["primary"][950] == "rgb(8, 47, 73)"
+
+
 @override_settings(
     UNFOLD={
         **CONFIG_DEFAULTS,