Apply css coding conventions to discussion
Move states into the base directory
Move gu-image from states to from-content-api
Apply coding conventions to search scss
Remove unused circular progress
Apply coding conventions to tabs
Simplify fetching line-height in vjs small title
Fix line-height in small overlay title
Merge branch 'master' of github.com:guardian/frontend into coding-conventions-sass
Merge branch 'master' of github.com:guardian/frontend into coding-conventions-sass

Conflicts:
	common/app/assets/stylesheets/module/_discussion.scss
Normalise use of mq()
Merge pull request #5276 from guardian/coding-conventions-sass

Sass Clean up & Coding conventions