Merge changes from Steve's updates to main.min.css into app.less.