Skip to content

Commit a62789d

Browse files
authored
Fix/modal open 3dot open and some design (#1665)
* fix: build issues * fix: design * fix: not reflecting the design * fix: 3 dot menu
1 parent 50207c1 commit a62789d

File tree

8 files changed

+39
-22
lines changed

8 files changed

+39
-22
lines changed

assets/css/admin/form-builder.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2855,6 +2855,10 @@ input.wpuf-tab:checked + .wpuf-tab-content,
28552855
margin-top: 0.5rem;
28562856
}
28572857

2858+
.wpuf-mt-20 {
2859+
margin-top: 5rem;
2860+
}
2861+
28582862
.wpuf-mt-3 {
28592863
margin-top: 0.75rem;
28602864
}

assets/css/admin/subscriptions.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/forms-list.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/components/FormsList.vue

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,21 @@ const openModal = (event) => {
324324
325325
// Trigger the jQuery modal
326326
if (window.jQuery) {
327-
window.jQuery('.wpuf-form-template-modal').show();
328-
window.jQuery('#wpbody-content .wrap').hide();
327+
328+
const $ = window.jQuery;
329+
const $modal = $('.wpuf-form-template-modal');
330+
331+
$modal.show().removeClass('wpuf-hidden');
332+
333+
$modal[0].offsetHeight;
334+
335+
setTimeout(function() {
336+
$modal.addClass('wpuf-modal-show');
337+
}, 10);
338+
339+
$('body').addClass('wpuf-modal-open');
340+
$('body').css('overflow', 'hidden');
341+
$('#wpbody-content .wrap').hide();
329342
} else {
330343
// Fallback if jQuery is not available
331344
window.location.href = newFormUrl;
@@ -621,7 +634,7 @@ onMounted(() => {
621634
</div>
622635
623636
<!-- Pagination -->
624-
<div v-if="totalPages > 1" class="wpuf-flex wpuf-items-center wpuf-justify-center wpuf-mt-8">
637+
<div v-if="totalPages > 1" class="wpuf-flex wpuf-items-center wpuf-justify-center wpuf-mt-20">
625638
<nav class="wpuf-flex wpuf-items-center wpuf-w-full">
626639
<div>
627640
<button

assets/js/forms-list.min.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/forms-list.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

includes/Admin/template-parts/modal-v4.2.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ function wpuf_get_template_category( $template_title, $categories, $form_type =
8585
}
8686
?>
8787
<div class="wpuf-form-template-modal wpuf-fixed wpuf-top-0 wpuf-left-0 wpuf-w-screen wpuf-h-screen wpuf-bg-gray-100 wpuf-hidden wpuf-z-[999999]" role="dialog" aria-modal="true" aria-labelledby="template-modal-title" aria-describedby="template-modal-description" style="background-color: #F8FAFC;">
88+
<button
89+
class="wpuf-absolute wpuf-right-8 wpuf-top-4 wpuf-text-gray-400 hover:wpuf-text-gray-600 focus:wpuf-outline-none wpuf-close-btn wpuf-border wpuf-border-gray-200 wpuf-rounded-full wpuf-p-2 hover:wpuf-border-gray-300 wpuf-bg-white wpuf-z-[1000000]">
90+
<svg xmlns="http://www.w3.org/2000/svg" class="wpuf-h-6 wpuf-w-6" fill="none" viewBox="0 0 24 24"
91+
stroke="currentColor">
92+
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
93+
</svg>
94+
</button>
95+
8896
<div class="wpuf-relative wpuf-mx-auto wpuf-p-8 wpuf-h-full wpuf-overflow-y-auto wpuf-max-w-[1400px]">
89-
<button
90-
class="wpuf-absolute wpuf-right-4 wpuf-top-4 wpuf-text-gray-400 hover:wpuf-text-gray-600 focus:wpuf-outline-none wpuf-close-btn wpuf-border wpuf-border-gray-200 wpuf-rounded-full wpuf-p-2 hover:wpuf-border-gray-300 wpuf-bg-white wpuf-z-[1000000]">
91-
<svg xmlns="http://www.w3.org/2000/svg" class="wpuf-h-6 wpuf-w-6" fill="none" viewBox="0 0 24 24"
92-
stroke="currentColor">
93-
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"/>
94-
</svg>
95-
</button>
96-
9797
<div class="wpuf-max-w-full wpuf-mx-auto wpuf-relative wpuf-z-[999998]">
9898
<!-- Header -->
9999
<div class="wpuf-mb-14 wpuf-mt-10 wpuf-ml-10">

includes/Admin/views/post-forms-list-table-view.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div id="wpuf-post-forms-list-table-view" class="wpuf-h-100vh wpuf-bg-white wpuf-ml-[-20px] wpuf-py-0 wpuf-px-[20px] wpuf-overflow-hidden">
1+
<div id="wpuf-post-forms-list-table-view" class="wpuf-h-100vh wpuf-bg-white wpuf-ml-[-20px] wpuf-py-0 wpuf-px-[20px]">
22
<noscript>
33
<strong>
44
<?php esc_html_e( "We're sorry but this page doesn't work properly without JavaScript. Please enable it to continue.", 'wp-user-frontend' ); ?>

0 commit comments

Comments
 (0)