move main style
Merge branch 'feature/sass' into develop