cleaning up margins on figures
Revert "Refactor content meta"
Merge pull request #6876 from guardian/revert-6819-refactor-content-meta

Revert "Refactor content meta"
Merge pull request #6870 from guardian/caption-margin

cleaning up margins on figures
merge conflicts