Update _block-grid.scss

fixes #4998
Update _settings.scss
fixes #4998
Merge pull request #5253 from tormjens/master

Fixes #4998