use sass syntax
Merge branch 'work'