resolve bug in base scss
Merge branch 'develop'