potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'fix_override_original_colors_bulma' into 'master'

Browse source 
Use merge_map when defining colors to avoid override original Bulma colors

See merge request framasoft/mobilizon!135
This commit is contained in:
Thomas Citharel 2019-05-17 15:28:10 +02:00
parent c53f19dc04 4b80a2a203
commit 705bf26519
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
js/src/variables.scss
View file

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