Merge branch 'fix_override_original_colors_bulma' into 'master'

Use merge_map when defining colors to avoid override original Bulma colors

See merge request framasoft/mobilizon!135

js/src/variables.scss

@@ -5,9 +5,12 @@ $primary-invert: findColorInvert($primary);
 $secondary: #FAB12D;
 $secondary-invert: findColorInvert($secondary);
 
-$colors: (
+$colors: map-merge(
+    $colors,
+    (
         "primary": ($primary, $primary-invert),
-        "secondary": ($secondary, $secondary-invert),
+        "secondary": ($secondary, $secondary-invert)
+    )
 );
 
 // Navbar