Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: change footer's display flex -> block #2661

Merged
merged 1 commit into from
Aug 15, 2023
Merged

fix: change footer's display flex -> block #2661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/scss/_core.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,12 +270,12 @@ div:where(.swal2-container) {
}

div:where(.swal2-footer) {
justify-content: center;
margin: $swal2-footer-margin;
padding: $swal2-footer-padding;
border-top: 1px solid $swal2-footer-border-color;
color: $swal2-footer-color;
font-size: $swal2-footer-font-size;
text-align: $swal2-footer-text-align;
}

.swal2-timer-progress-bar-container {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/dom/renderers/renderFooter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const renderFooter = (instance, params) => {
return
}

dom.toggle(footer, params.footer)
dom.toggle(footer, params.footer, 'block')

if (params.footer) {
dom.parseHtmlToContainer(params.footer, footer)
Expand Down
25 changes: 19 additions & 6 deletions src/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,22 @@ $swal2-input-height: 2.625em !default;
$swal2-input-padding: 0 0.75em !default;
$swal2-input-border: 1px solid lighten($swal2-black, 85) !default;
$swal2-input-border-radius: 0.1875em !default;
$swal2-input-box-shadow: inset 0 1px 1px rgba($swal2-black, 0.06), 0 0 0 3px transparent !default;
$swal2-input-box-shadow:
inset 0 1px 1px rgba($swal2-black, 0.06),
0 0 0 3px transparent !default;
$swal2-input-font-size: 1.125em !default;
$swal2-input-background: transparent !default;
$swal2-input-color: inherit !default;
$swal2-input-transition: border-color 0.1s, box-shadow 0.1s !default;
$swal2-input-transition:
border-color 0.1s,
box-shadow 0.1s !default;

// INPUT:FOCUS
$swal2-input-focus-border: 1px solid #b4dbed !default;
$swal2-input-focus-outline: none !default;
$swal2-input-focus-box-shadow: inset 0 1px 1px rgba($swal2-black, 0.06), 0 0 0 3px $swal2-outline-color !default;
$swal2-input-focus-box-shadow:
inset 0 1px 1px rgba($swal2-black, 0.06),
0 0 0 3px $swal2-outline-color !default;

// TEXTAREA SPECIFIC VARIABLES
$swal2-textarea-height: 6.75em !default;
Expand Down Expand Up @@ -131,6 +137,7 @@ $swal2-footer-padding: 1em 1em 0 !default;
$swal2-footer-border-color: #eee !default;
$swal2-footer-color: inherit !default;
$swal2-footer-font-size: 1em !default;
$swal2-footer-text-align: center !default;

// TIMER POGRESS BAR
$swal2-timer-progress-bar-height: 0.25em;
Expand All @@ -145,7 +152,9 @@ $swal2-close-button-height: 1.2em !default;
$swal2-close-button-position: null !default;
$swal2-close-button-gap: 0 !default;
$swal2-close-button-padding: 0 !default;
$swal2-close-button-transition: color 0.1s, box-shadow 0.1s !default;
$swal2-close-button-transition:
color 0.1s,
box-shadow 0.1s !default;
$swal2-close-button-border: none !default;
$swal2-close-button-border-radius: $swal2-border-radius !default;
$swal2-close-button-outline: null !default;
Expand Down Expand Up @@ -226,8 +235,12 @@ $swal2-loader-border-color: #2778c4 transparent #2778c4 transparent !default;
$swal2-toast-show-animation: swal2-toast-show 0.5s !default;
$swal2-toast-hide-animation: swal2-toast-hide 0.1s forwards !default;
$swal2-toast-border: none !default;
$swal2-toast-box-shadow: 0 0 1px hsl(0deg 0% 0% / 0.075), 0 1px 2px hsl(0deg 0% 0% / 0.075),
1px 2px 4px hsl(0deg 0% 0% / 0.075), 1px 3px 8px hsl(0deg 0% 0% / 0.075), 2px 4px 16px hsl(0deg 0% 0% / 0.075) !default;
$swal2-toast-box-shadow:
0 0 1px hsl(0deg 0% 0% / 0.075),
0 1px 2px hsl(0deg 0% 0% / 0.075),
1px 2px 4px hsl(0deg 0% 0% / 0.075),
1px 3px 8px hsl(0deg 0% 0% / 0.075),
2px 4px 16px hsl(0deg 0% 0% / 0.075) !default;
$swal2-toast-background: $swal2-white !default;
$swal2-toast-close-button-width: 0.8em !default;
$swal2-toast-close-button-height: 0.8em !default;
Expand Down