Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110

Conflicts:
	app/assets/stylesheets/framework.scss
	app/assets/stylesheets/framework/buttons.scss