Merge branch 'latest'

WPDevelopers · Nov 23, 2023 · 6c17873 · 6c17873
2 parents cc2f9be + 7ff8989
commit 6c17873
Show file tree

Hide file tree

Showing 11 changed files with 324 additions and 38 deletions.
diff --git a/EmbedPress/Ends/Back/Handler.php b/EmbedPress/Ends/Back/Handler.php
@@ -152,15 +152,7 @@ public function enqueueScripts()
         wp_enqueue_script(
             'embedpress-admin',
             EMBEDPRESS_URL_ASSETS . 'js/admin.js',
-            ['jquery'],
-            $this->pluginVersion,
-            true
-        );
-
-        wp_enqueue_script(
-            'embedpress-admin',
-            EMBEDPRESS_URL_ASSETS . 'js/admin.js',
-            ['jquery'],
+            ['jquery', 'wp-i18n', 'wp-url'],
             $this->pluginVersion,
             true
         );

diff --git a/EmbedPress/Ends/Back/Settings/assets/css/style.css b/EmbedPress/Ends/Back/Settings/assets/css/style.css
@@ -2436,14 +2436,15 @@ a.site__logo {
 }
 
 @media (max-width:1024px) {
-    .shortcode-settings-wrapper , .embedpress_general_settings__form:not(:last-child), .embedpress__shortcode{
+    .shortcode-settings-wrapper, .embedpress_general_settings__form:not(:last-child), .embedpress__shortcode {
         width: 100%;
         display: block;
     }
+
     .embedpress-upgrade-pro-sidebar {
         display: none;
     }
-    
+
 }
 
 @media (max-width: 767px) {
@@ -2548,10 +2549,14 @@ p.embedpress-tagline {
     }
 }
 
-.form__inline {
+.form__inline .form-inner-field {
     display: -webkit-box;
     display: -ms-flexbox;
     display: flex;
+    gap: 15px;
+}
+.form-inner-field button {
+    height: 60px;
 }
 
 .form__inline .form__group {
@@ -2617,6 +2622,60 @@ p.embedpress-tagline {
     height: 172px;
 }
 
+#valid-license-key-message {
+    font-weight: 500;
+}
+
+div#valid-license-key-message {
+    margin-top: 10px;
+    margin-bottom: 30px;
+}
+
+span#email-placeholder {
+    font-weight: 700;
+}
+
+.form__inline .hidden, #otp-varify-form.hidden {
+    display: none !important;
+}
+
+.short-description {
+    margin-top: 10px;
+    padding: 10px 15px;
+    background: #f2f2f2;
+    margin-bottom: 10px;
+    border-radius: 5px;
+}
+div#invalid-license-key-message, #invalid-verification-key-message {
+    padding: 10px;
+    background: #f2f2f2;
+    border-radius: 5px;
+    margin-top: 10px;
+}
+.short-description a {
+    color: #5b4e96;
+}
+div#resend-verification-key-message {
+    margin-top: 10px;
+}
+div#resend-verification-key-message a{
+    color: #5b4e96;
+}
+.show-toast{
+    visibility: visible!important;
+    opacity: 1!important;
+}
+div#resend-verification-key-message span {
+    font-weight: bold;
+    color: #5b4e96;
+    cursor: pointer;
+}
+div#resend-verification-key-message a {
+    font-weight: 600;
+}
+.form-inner-field .form__group {
+    margin-right: 0;
+}
 @media (max-width: 479px) {
     .logo__adjust__wrap .logo__upload {
         width: 225px;
@@ -3243,6 +3302,10 @@ p.embedpress-tagline {
     padding-left: 50px;
 }
 
+input#embedpress-pro-license-key::placeholder {
+    font-size: 18px;
+}
+
 .embedpress-license__details .license__content .form__group .form__control::-webkit-input-placeholder {
     color: #7C8DB5;
 }
@@ -3271,6 +3334,10 @@ p.embedpress-tagline {
         padding-left: 35px;
         font-size: 14px;
     }
+    .form-inner-field button {
+        height: 60px;
+    }
+
 }
 
 .embedpress-license__details .license__manage {
@@ -3573,7 +3640,7 @@ p.embedpress-tagline {
     }
 
     .embedpress-license__details .license__content .form__group .form__control {
-        height: 50px;
+        height: 60px;
         font-size: 14px;
     }
 
@@ -3628,6 +3695,7 @@ p.embedpress-tagline {
     border: 1px solid #D7DEEE;
     border-radius: 8px;
     padding: 12px;
+    display: flex;
 }
 
 .embedpress__shortcode .shortcode__form .form__group {

diff --git a/EmbedPress/Ends/Back/Settings/assets/js/settings.js b/EmbedPress/Ends/Back/Settings/assets/js/settings.js
@@ -322,23 +322,25 @@ jQuery(document).ready( function($){
 
 
     // license
-    $(document).on('click', '.embedpress-license-deactivation-btn', function (e) {
-        let $this = $(this);
-        setTimeout(function (){
-            $this.attr('disabled', 'disabled');
-        }, 2000);
-        $this.html('Deactivating.....');
-    });
-    $(document).on('click', '.embedpress-license-activation-btn', function (e) {
-        let $this = $(this);
-        let val = $('#embedpress-pro-license-key').val();
-        if (val){
-            setTimeout(function (){
-                $this.attr('disabled', 'disabled');
-            }, 2000);
-            $this.html('Activating.....');
-        }
-    });
+    // $(document).on('click', '.embedpress-license-deactivation-btn', function (e) {
+    //     let $this = $(this);
+    //     setTimeout(function (){
+    //         $this.attr('disabled', 'disabled');
+    //     }, 2000);
+    //     $this.html('Deactivating.....');
+    // });
+
+    // $(document).on('click', '.embedpress-license-activation-btn', function (e) {
+    //     let $this = $(this);
+    //     let val = $('#embedpress-pro-license-key').val();
+    //     if (val){
+    //         setTimeout(function (){
+    //             $this.attr('disabled', 'disabled');
+    //         }, 2000);
+    //         $this.html('Activating.....');
+    //     }
+    // });
+
     // Helpers
     function copyToClipboard(text) {
         if (window.clipboardData && window.clipboardData.setData) {