Skip to content

Commit 84d03c8

Browse files
committed
Fix dialog content overflow on smaller screens
Signed-off-by: ajiho <lujiahao@88.com>
1 parent 35b7b08 commit 84d03c8

2 files changed

Lines changed: 29 additions & 9 deletions

File tree

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,8 @@
66
"editor.renderWhitespace": "all",
77
"scss.validate": false,
88
"stylelint.enable": true,
9-
"stylelint.validate": ["scss"]
9+
"stylelint.validate": ["scss"],
10+
"[scss]": {
11+
"editor.defaultFormatter": "stylelint.vscode-stylelint"
12+
}
1013
}

scss/_dialog.scss

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ $dialog-sizes: defaults(
7676
flex-direction: column;
7777
width: var(--dialog-width);
7878
max-width: calc(100% - var(--dialog-margin) * 2);
79+
min-height: max-content;
7980
max-height: calc(100% - var(--dialog-margin) * 2);
8081
padding: 0;
8182
margin: auto;
@@ -97,8 +98,10 @@ $dialog-sizes: defaults(
9798
// Exit transition: opacity and transform animate out, then visibility
9899
// flips hidden after the animation completes (via the delay).
99100
@include transition(
100-
opacity var(--dialog-transition-duration) var(--dialog-transition-timing),
101-
transform var(--dialog-transition-duration) var(--dialog-transition-timing),
101+
opacity var(--dialog-transition-duration)
102+
var(--dialog-transition-timing),
103+
transform var(--dialog-transition-duration)
104+
var(--dialog-transition-timing),
102105
visibility 0s var(--dialog-transition-duration)
103106
);
104107

@@ -128,8 +131,10 @@ $dialog-sizes: defaults(
128131
visibility: visible;
129132
opacity: 1;
130133
@include transition(
131-
opacity var(--dialog-transition-duration) var(--dialog-transition-timing),
132-
transform var(--dialog-transition-duration) var(--dialog-transition-timing),
134+
opacity var(--dialog-transition-duration)
135+
var(--dialog-transition-timing),
136+
transform var(--dialog-transition-duration)
137+
var(--dialog-transition-timing),
133138
visibility 0s
134139
);
135140
transform: none;
@@ -148,7 +153,10 @@ $dialog-sizes: defaults(
148153
&::backdrop {
149154
background-color: var(--dialog-backdrop-bg);
150155
backdrop-filter: blur(var(--dialog-backdrop-blur));
151-
@include backdrop-transitions(var(--dialog-transition-duration), var(--dialog-transition-timing));
156+
@include backdrop-transitions(
157+
var(--dialog-transition-duration),
158+
var(--dialog-transition-timing)
159+
);
152160
}
153161

154162
// Exit: fade the native backdrop out alongside the dialog. The dialog
@@ -225,7 +233,9 @@ $dialog-sizes: defaults(
225233

226234
// Dialog sizes
227235
@each $size, $value in $dialog-sizes {
228-
.dialog-#{$size} { --dialog-width: #{$value}; }
236+
.dialog-#{$size} {
237+
--dialog-width: #{$value};
238+
}
229239
}
230240

231241
// Fullscreen dialog
@@ -263,7 +273,9 @@ $dialog-sizes: defaults(
263273
// Dialog header
264274
.dialog-header {
265275
@include dialog-header(var(--dialog-header-padding));
266-
border-block-end: var(--dialog-header-border-width) solid var(--dialog-header-border-color);
276+
border-block-end:
277+
var(--dialog-header-border-width) solid
278+
var(--dialog-header-border-color);
267279

268280
.btn-close {
269281
margin-inline-start: auto;
@@ -284,6 +296,11 @@ $dialog-sizes: defaults(
284296

285297
// Dialog footer
286298
.dialog-footer {
287-
@include dialog-footer(var(--dialog-footer-padding), var(--dialog-footer-gap), var(--dialog-footer-border-width), var(--dialog-footer-border-color));
299+
@include dialog-footer(
300+
var(--dialog-footer-padding),
301+
var(--dialog-footer-gap),
302+
var(--dialog-footer-border-width),
303+
var(--dialog-footer-border-color)
304+
);
288305
}
289306
}

0 commit comments

Comments
 (0)