Making inline-block spacing more reliable

Conflicts:
	apps/wiki/templates/wiki/includes/document_content_redesign.html
	templates/base.html