Skip to content

Commit fa8c6da

Browse files
authored
Merge branch 'main' into ghworkflow/package_lock_auto_update
2 parents d129643 + 96da667 commit fa8c6da

File tree

63 files changed

+20
-9
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+20
-9
lines changed

components/dialog/dialog-styles.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export const dialogStyles = css`
152152
.d2l-dialog-footer {
153153
box-sizing: border-box;
154154
flex: none;
155-
padding: 30px 30px 12px 30px; /* 18px margin below footer children */
155+
padding: 18px 30px 0 30px; /* 18px margin below footer children */
156156
position: relative; /* stack footer overflow shadow on top of content */
157157
}
158158
@@ -183,6 +183,7 @@ export const dialogStyles = css`
183183
}
184184
185185
@media (max-width: 615px), (max-height: 420px) and (max-width: 900px) {
186+
186187
.d2l-dialog-header {
187188
padding: 14px 20px 16px 20px;
188189
}
@@ -198,18 +199,19 @@ export const dialogStyles = css`
198199
padding: 0 20px;
199200
}
200201
.d2l-dialog-footer {
201-
padding: 20px 20px 2px 20px;
202+
padding: 18px 20px 0 20px;
202203
}
203204
.d2l-dialog-outer.d2l-dialog-fullscreen-mobile {
204205
margin: 0 !important;
205206
min-width: calc(var(--d2l-vw, 1vw) * 100);
206-
top: 42px;
207+
top: 5%;
207208
}
208209
:host(:not([in-iframe])) dialog.d2l-dialog-outer.d2l-dialog-fullscreen-mobile,
209210
:host(:not([in-iframe])) div.d2l-dialog-outer.d2l-dialog-fullscreen-mobile {
210-
height: calc(var(--d2l-vh, 1vh) * 100 - 42px);
211-
min-height: calc(var(--d2l-vh, 1vh) * 100 - 42px);
211+
height: calc(var(--d2l-vh, 1vh) * 95);
212+
min-height: calc(var(--d2l-vh, 1vh) * 95);
212213
}
214+
213215
}
214216
215217
@media (prefers-reduced-motion: reduce) {

components/dialog/dialog.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,15 @@ class Dialog extends LocalizeCoreElement(AsyncContainerMixin(DialogMixin(LitElem
8383
padding: 0 0 5px 0;
8484
}
8585
86+
@media (max-width: 615px), (max-height: 420px) and (max-width: 900px) {
87+
88+
.d2l-dialog-header,
89+
:host([critical]) .d2l-dialog-header {
90+
padding-bottom: 9px;
91+
}
92+
93+
}
94+
8695
`];
8796
}
8897

components/dialog/test/dialog.vdiff.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('dialog', () => {
2929
[
3030
{ screen: 'tall-wide', viewport: { width: 800, height: 500 } },
3131
{ screen: 'tall-narrow', viewport: { width: 600, height: 500 } },
32-
{ screen: 'short-wide', viewport: { width: 910, height: 400 } },
32+
{ screen: 'short-wide', viewport: { width: 910, height: 370 } },
3333
{ screen: 'short-narrow', viewport: { width: 890, height: 400 } }
3434
].forEach(({ screen, viewport }) => {
3535
describe(screen, () => {
-309 Bytes
-334 Bytes
-340 Bytes
-315 Bytes
-299 Bytes
-314 Bytes
-316 Bytes

0 commit comments

Comments
 (0)