From d0f25fc59b29c385a6910dc48a111df811da3bdf Mon Sep 17 00:00:00 2001 From: Kael Date: Wed, 23 Dec 2020 04:32:14 +1100 Subject: [PATCH] fix(grid): collapse vertical gutters fixes #11408 (cherry picked from commit c3ba5bd32a2765cc2022e42072721647952cb80b) --- packages/vuetify/src/components/VGrid/VGrid.sass | 6 ++---- packages/vuetify/src/components/VGrid/_mixins.sass | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/vuetify/src/components/VGrid/VGrid.sass b/packages/vuetify/src/components/VGrid/VGrid.sass index 2290e1bbfcc..a7449e1eacc 100644 --- a/packages/vuetify/src/components/VGrid/VGrid.sass +++ b/packages/vuetify/src/components/VGrid/VGrid.sass @@ -15,8 +15,7 @@ +make-row &--dense - margin-right: -$form-grid-gutter / 2 - margin-left: -$form-grid-gutter / 2 + margin: -$form-grid-gutter / 2 > .col, > [class*="col-"] @@ -25,8 +24,7 @@ // Remove the negative margin from default .row, then the horizontal padding // from all immediate children columns (to prevent runaway style inheritance). .no-gutters - margin-right: 0 - margin-left: 0 + margin: 0 > .col, > [class*="col-"] padding: 0 diff --git a/packages/vuetify/src/components/VGrid/_mixins.sass b/packages/vuetify/src/components/VGrid/_mixins.sass index cac24d66bfb..00a84e3086a 100644 --- a/packages/vuetify/src/components/VGrid/_mixins.sass +++ b/packages/vuetify/src/components/VGrid/_mixins.sass @@ -14,8 +14,7 @@ display: flex flex-wrap: wrap flex: 1 1 auto - margin-right: -$gutter / 2 - margin-left: -$gutter / 2 + margin: -$gutter / 2 =make-col-ready($gutter: $grid-gutter) // Prevent columns from becoming too narrow when at smaller grid tiers by