Fixed conditional for block-grid margin and padding.
Fixed my own typo. Fixed conditionals for block-grid margin and padding.
Merge pull request #1345 from Sigler/master

Fixes conditional for block grids.