From 493c4b49041d32fc0f2ab4f9fa2cc1601727183a Mon Sep 17 00:00:00 2001 From: Jesse205 <2055675594@qq.com> Date: Fri, 4 Oct 2024 04:50:06 +0800 Subject: [PATCH 1/4] fix(VDialog): make form always fill parent --- packages/vuetify/src/components/VDialog/VDialog.sass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/vuetify/src/components/VDialog/VDialog.sass b/packages/vuetify/src/components/VDialog/VDialog.sass index 9241f6e3bc6..1f5fe7424c9 100644 --- a/packages/vuetify/src/components/VDialog/VDialog.sass +++ b/packages/vuetify/src/components/VDialog/VDialog.sass @@ -13,6 +13,10 @@ max-width: calc(100% - #{$dialog-margin * 2}) margin: $dialog-margin + > form + height: 100% + width: 100% + &, > form display: flex From 8b154361987b72b5824b599fcefb28d1473a5e78 Mon Sep 17 00:00:00 2001 From: Jesse205 <2055675594@qq.com> Date: Fri, 4 Oct 2024 04:51:12 +0800 Subject: [PATCH 2/4] Revert "fix(VDialog): add height to form in fullscreen dialog (#20417)" This reverts commit eb0c99e4f13272367a983abac9473b943f065ee1. --- packages/vuetify/src/components/VDialog/VDialog.sass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/vuetify/src/components/VDialog/VDialog.sass b/packages/vuetify/src/components/VDialog/VDialog.sass index 1f5fe7424c9..baf3625dd7c 100644 --- a/packages/vuetify/src/components/VDialog/VDialog.sass +++ b/packages/vuetify/src/components/VDialog/VDialog.sass @@ -58,6 +58,7 @@ margin: 0 padding: 0 width: 100% + height: 100% max-width: 100% max-height: 100% overflow-y: auto @@ -66,8 +67,6 @@ &, > form - height: 100% - > .v-card, > .v-sheet min-height: 100% From 444514b4da906e2c3a42782ef61ed2ab52b6718a Mon Sep 17 00:00:00 2001 From: Kael Date: Wed, 6 Nov 2024 18:06:55 +1100 Subject: [PATCH 3/4] expand existing flex rules --- .../vuetify/src/components/VDialog/VDialog.sass | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/vuetify/src/components/VDialog/VDialog.sass b/packages/vuetify/src/components/VDialog/VDialog.sass index baf3625dd7c..344946be45a 100644 --- a/packages/vuetify/src/components/VDialog/VDialog.sass +++ b/packages/vuetify/src/components/VDialog/VDialog.sass @@ -13,10 +13,6 @@ max-width: calc(100% - #{$dialog-margin * 2}) margin: $dialog-margin - > form - height: 100% - width: 100% - &, > form display: flex @@ -76,8 +72,7 @@ .v-dialog--scrollable > .v-overlay__content &, > form - display: flex - + &, > .v-card display: flex flex: 1 1 100% @@ -85,6 +80,6 @@ max-height: 100% max-width: 100% - > .v-card-text - backface-visibility: hidden - overflow-y: auto + > .v-card > .v-card-text + backface-visibility: hidden + overflow-y: auto From 5164146f87f0dcea8b1b7b4feb8ea9414ca26a34 Mon Sep 17 00:00:00 2001 From: Kael Date: Wed, 6 Nov 2024 18:10:46 +1100 Subject: [PATCH 4/4] flex cards --- packages/vuetify/src/components/VDialog/VDialog.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/vuetify/src/components/VDialog/VDialog.sass b/packages/vuetify/src/components/VDialog/VDialog.sass index 344946be45a..e45e92a08df 100644 --- a/packages/vuetify/src/components/VDialog/VDialog.sass +++ b/packages/vuetify/src/components/VDialog/VDialog.sass @@ -24,6 +24,7 @@ --v-scrollbar-offset: 0px border-radius: $dialog-border-radius overflow-y: auto + flex: 1 1 100% @include tools.elevation($dialog-elevation)