The diff is misleading. These lines are not being added, but rather modified. Look a few lines up. All `.note` and `.warning` classes are being removed.

I address `div.tip` (and remove the margin-bottom as you suggest) in #2331.