feature: conflicts resolved

src/views/partials/header.pug

@@ -2,7 +2,7 @@
 div
 
   solid-link(next='dashboard')
-    img.logo(src=`${clientLogo || '/images/logo.png'}`)
+    img.logo(src=`${clientLogo || '/images/logo.webp'}`)
 
 
   span.tag.reversed.text-semibold(data-trans='header.beta')
@@ -13,6 +13,15 @@ div
       bind-user
     )
 
+    if themeChecker
+      div.selector
+        each val, index in ['primary', 'secondary', 'complementary', 'complementary-darken']
+          label= 'Couleur ' + (index+1)
+            input.input-color(
+              id='color-'+val
+              type="text"
+            )
+
     details.segment.notLoggedIn
       summary.text-right
         solid-display.labelled-avatar(