Use border-after-* instead of border-bottom-* #1209