Fix input:focus border issues from #2088