Backport settings.scss bug fix from EE branch
A bug fix was made in gitlab-ee!2029 after the corresponding CE branch had already been merged (gitlab-ce!11698), so in order to prevent conflicts this single commit needs to be backported from EE to CE.