update base styles
Merge branch 'dev'