Making inline-block spacing more reliable

Conflicts:
	apps/wiki/templates/wiki/includes/document_content_redesign.html
	templates/base.html
Merge pull request #1322 from lmorchard/redesign-inline-lists-2

Making inline-block spacing more reliable