BISERVER-8926 - Changed fonts over to use px definitions rather than em....

..... putting stuff back to as it was before a bad automerge sourced from an out of date merge upstream.