Scss cleanup
There are merge conflicts
The comparison view may be inaccurate due to merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally.
Created by: koenpunt
As an followup on https://github.com/gitlabhq/gitlabhq/pull/2110, here the PR which only changes the SCSS mixins and naming of variables, but not the actual classnames.
The comparison view may be inaccurate due to merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally.