merge base and typography partials, add minor transition to hover