refactor: refactor the base.css
Merge branch 'development'