use padding instead of margins for highlighting

padding is a better choice as that's inside the box, which means
that when we highlight a span we get the box you expect, not just
the indented portion.

Change-Id: I20d2967aa7ade6807295463be451b2ca771dc1a3