Merge branch 'develop' into 17315

Hardcode blue
2023-09-21 10:34:10 +03:00 · 2023-09-20 19:56:44 +03:00 · 2023-09-20 19:54:22 +03:00 · 2023-09-20 16:26:15 +03:00 · 2023-09-19 17:29:53 +03:00 · 2023-09-19 16:03:33 +03:00
1 changed files with 12 additions and 9 deletions
@@ -3,12 +3,15 @@

 (defn container
  [{:keys [container-size customization-color theme]}]
-  {:width            container-size
-   :height           container-size
-   :align-items      :center
-   :justify-content  :center
-   :border-radius    (/ container-size 2)
-   :overflow         :hidden
-   :background-color (colors/theme-colors (colors/custom-color customization-color 50)
-                                          (colors/custom-color customization-color 60)
-                                          theme)})
+  (let [color (if (keyword? customization-color)
+                customization-color
+                :blue)]
+    {:width            container-size
+     :height           container-size
+     :align-items      :center
+     :justify-content  :center
+     :border-radius    (/ container-size 2)
+     :overflow         :hidden
+     :background-color (colors/theme-colors (colors/custom-color color 50)
+                                            (colors/custom-color color 60)
+                                            theme)}))
Author	SHA1	Message	Date
Ibrahem Khalil	2931eb46aa	Merge branch 'develop' into 17315	2023-09-21 10:34:10 +03:00
ibrkhalil	3fd26a0c07	Hardcode blue	2023-09-20 19:56:44 +03:00
Ibrahem Khalil	9f5feca2eb	Merge branch 'develop' into 17315	2023-09-20 19:54:22 +03:00
Ibrahem Khalil	d6d1313f86	Merge branch 'develop' into 17315	2023-09-20 16:26:15 +03:00
Ibrahem Khalil	c1350f45f5	Merge branch 'develop' into 17315	2023-09-19 17:29:53 +03:00
Ibrkhalil	bcd756f2cc	Better approach	2023-09-19 16:03:33 +03:00
Ibrahem Khalil	ec08fb2b1c	Merge branch 'develop' into 17315	2023-09-19 11:13:05 +03:00
Ibrkhalil	32b91ed31e	Group chat icon not showing	2023-09-19 11:10:11 +03:00