カラー修正
Merge branch 'super-zenigame' into feature/fix-color

Conflicts:
	src/settings/_variables.scss
Merge branch 'feature/fix-color' into super-zenigame