Updating base.less
Added height to base.css
Fixed merge conflict base.css