Merge branch 'release/3.13.1'

getdokan · Nov 11, 2024 · c961a2d · c961a2d
2 parents eb7d387 + 5efcc12
commit c961a2d
Show file tree

Hide file tree

Showing 34 changed files with 1,607 additions and 3,522 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -2101,6 +2101,9 @@ article.dokan-notice-single-notice-area span.dokan-single-announcement-date {
 .dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a i.menu-dropdown::before {
   padding-left: 15px;
 }
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a svg {
+  margin-right: 15px;
+}
 .dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li:hover {
   background: #f05025;
   color: #fff;
@@ -3401,7 +3404,6 @@ div.media-sidebar a.edit-attachment {
 .product-edit-new-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder a.action-delete {
   position: absolute;
   top: 0;
-  right: 0;
   color: red;
   background: rgba(0, 0, 0, 0.6);
   margin: 0;
@@ -3415,7 +3417,9 @@ div.media-sidebar a.edit-attachment {
 }
 .product-edit-new-container #dokan-product-images ul.product_images li.image:hover a.action-delete,
 .product-edit-new-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder:hover a.action-delete {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .product-edit-new-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder {
   border: 1px dashed #ccc;
@@ -3964,7 +3968,6 @@ div.media-sidebar a.edit-attachment {
 .product-edit-container #dokan-product-images ul.product_images li.add-image a.action-delete {
   position: absolute;
   top: 0;
-  right: 0;
   color: red;
   background: rgba(0, 0, 0, 0.6);
   margin: 0;
@@ -3979,7 +3982,9 @@ div.media-sidebar a.edit-attachment {
 .product-edit-container #dokan-product-images ul.product_images li.image:hover a.action-delete,
 .product-edit-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder:hover a.action-delete,
 .product-edit-container #dokan-product-images ul.product_images li.add-image:hover a.action-delete {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .product-edit-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder {
   border: 1px dashed #ccc;
@@ -4192,23 +4197,22 @@ div.media-sidebar a.edit-attachment {
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.add-image a.action-delete {
   position: absolute;
   top: 0;
-  right: 0;
   color: red;
   background: rgba(0, 0, 0, 0.6);
   margin: 0;
-  padding: 0 3px;
   font-size: 50px;
   width: 100%;
   text-align: center;
   height: 100%;
-  padding-top: 25%;
   font-weight: bold;
   display: none;
 }
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.image:hover a.action-delete,
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.dokan-sortable-placeholder:hover a.action-delete,
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.add-image:hover a.action-delete {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.dokan-sortable-placeholder {
   border: 1px dashed #ccc;

diff --git a/assets/css/vue-admin.css b/assets/css/vue-admin.css
@@ -2510,6 +2510,20 @@ ul.dokan-settings-repeatable-list li span.remove-item {
 .field_contents .dokan-setting-warning .dokan-setting-warning-label span {
   margin-top: 6px !important;
 }
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link {
+  display: block;
+  margin-top: 8px;
+  text-decoration: none;
+}
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link:hover,
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link:active,
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link:focus {
+  outline: none;
+  box-shadow: none;
+}
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link i.dashicons {
+  font-size: 18px;
+}
 .field_contents .dokan-setting-warning .dashicons {
   margin: 0px;
   padding: 0px;

diff --git a/assets/js/style-rtl.css b/assets/js/style-rtl.css
@@ -2101,6 +2101,9 @@ article.dokan-notice-single-notice-area span.dokan-single-announcement-date {
 .dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a i.menu-dropdown::before {
   padding-right: 15px;
 }
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a svg {
+  margin-left: 15px;
+}
 .dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li:hover {
   background: #f05025;
   color: #fff;
@@ -3401,7 +3404,6 @@ div.media-sidebar a.edit-attachment {
 .product-edit-new-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder a.action-delete {
   position: absolute;
   top: 0;
-  left: 0;
   color: red;
   background: rgba(0, 0, 0, 0.6);
   margin: 0;
@@ -3415,7 +3417,9 @@ div.media-sidebar a.edit-attachment {
 }
 .product-edit-new-container #dokan-product-images ul.product_images li.image:hover a.action-delete,
 .product-edit-new-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder:hover a.action-delete {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .product-edit-new-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder {
   border: 1px dashed #ccc;
@@ -3964,7 +3968,6 @@ div.media-sidebar a.edit-attachment {
 .product-edit-container #dokan-product-images ul.product_images li.add-image a.action-delete {
   position: absolute;
   top: 0;
-  left: 0;
   color: red;
   background: rgba(0, 0, 0, 0.6);
   margin: 0;
@@ -3979,7 +3982,9 @@ div.media-sidebar a.edit-attachment {
 .product-edit-container #dokan-product-images ul.product_images li.image:hover a.action-delete,
 .product-edit-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder:hover a.action-delete,
 .product-edit-container #dokan-product-images ul.product_images li.add-image:hover a.action-delete {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .product-edit-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder {
   border: 1px dashed #ccc;
@@ -4192,23 +4197,22 @@ div.media-sidebar a.edit-attachment {
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.add-image a.action-delete {
   position: absolute;
   top: 0;
-  left: 0;
   color: red;
   background: rgba(0, 0, 0, 0.6);
   margin: 0;
-  padding: 0 3px;
   font-size: 50px;
   width: 100%;
   text-align: center;
   height: 100%;
-  padding-top: 25%;
   font-weight: bold;
   display: none;
 }
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.image:hover a.action-delete,
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.dokan-sortable-placeholder:hover a.action-delete,
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.add-image:hover a.action-delete {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.dokan-sortable-placeholder {
   border: 1px dashed #ccc;

diff --git a/assets/js/style.asset.php b/assets/js/style.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'ce9e86ac7b08cc2b755c');
+<?php return array('dependencies' => array(), 'version' => 'fd1c77489837349e3bf2');
diff --git a/assets/js/style.css b/assets/js/style.css
@@ -2101,6 +2101,9 @@ article.dokan-notice-single-notice-area span.dokan-single-announcement-date {
 .dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a i.menu-dropdown::before {
   padding-left: 15px;
 }
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a svg {
+  margin-right: 15px;
+}
 .dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li:hover {
   background: #f05025;
   color: #fff;
@@ -3401,7 +3404,6 @@ div.media-sidebar a.edit-attachment {
 .product-edit-new-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder a.action-delete {
   position: absolute;
   top: 0;
-  right: 0;
   color: red;
   background: rgba(0, 0, 0, 0.6);
   margin: 0;
@@ -3415,7 +3417,9 @@ div.media-sidebar a.edit-attachment {
 }
 .product-edit-new-container #dokan-product-images ul.product_images li.image:hover a.action-delete,
 .product-edit-new-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder:hover a.action-delete {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .product-edit-new-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder {
   border: 1px dashed #ccc;
@@ -3964,7 +3968,6 @@ div.media-sidebar a.edit-attachment {
 .product-edit-container #dokan-product-images ul.product_images li.add-image a.action-delete {
   position: absolute;
   top: 0;
-  right: 0;
   color: red;
   background: rgba(0, 0, 0, 0.6);
   margin: 0;
@@ -3979,7 +3982,9 @@ div.media-sidebar a.edit-attachment {
 .product-edit-container #dokan-product-images ul.product_images li.image:hover a.action-delete,
 .product-edit-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder:hover a.action-delete,
 .product-edit-container #dokan-product-images ul.product_images li.add-image:hover a.action-delete {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .product-edit-container #dokan-product-images ul.product_images li.dokan-sortable-placeholder {
   border: 1px dashed #ccc;
@@ -4192,23 +4197,22 @@ div.media-sidebar a.edit-attachment {
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.add-image a.action-delete {
   position: absolute;
   top: 0;
-  right: 0;
   color: red;
   background: rgba(0, 0, 0, 0.6);
   margin: 0;
-  padding: 0 3px;
   font-size: 50px;
   width: 100%;
   text-align: center;
   height: 100%;
-  padding-top: 25%;
   font-weight: bold;
   display: none;
 }
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.image:hover a.action-delete,
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.dokan-sortable-placeholder:hover a.action-delete,
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.add-image:hover a.action-delete {
-  display: inline-block;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .dokan-add-new-product-popup #dokan-product-images ul.product_images li.dokan-sortable-placeholder {
   border: 1px dashed #ccc;

diff --git a/assets/js/vue-admin-rtl.css b/assets/js/vue-admin-rtl.css
@@ -2510,6 +2510,20 @@ ul.dokan-settings-repeatable-list li span.remove-item {
 .field_contents .dokan-setting-warning .dokan-setting-warning-label span {
   margin-top: 6px !important;
 }
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link {
+  display: block;
+  margin-top: 8px;
+  text-decoration: none;
+}
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link:hover,
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link:active,
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link:focus {
+  outline: none;
+  box-shadow: none;
+}
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link i.dashicons {
+  font-size: 18px;
+}
 .field_contents .dokan-setting-warning .dashicons {
   margin: 0px;
   padding: 0px;

diff --git a/assets/js/vue-admin.asset.php b/assets/js/vue-admin.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('jquery', 'moment'), 'version' => 'fb2301a5a16fc86c916b');
+<?php return array('dependencies' => array('jquery', 'moment'), 'version' => '434780bbb89cd166487a');
diff --git a/assets/js/vue-admin.css b/assets/js/vue-admin.css
@@ -2510,6 +2510,20 @@ ul.dokan-settings-repeatable-list li span.remove-item {
 .field_contents .dokan-setting-warning .dokan-setting-warning-label span {
   margin-top: 6px !important;
 }
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link {
+  display: block;
+  margin-top: 8px;
+  text-decoration: none;
+}
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link:hover,
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link:active,
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link:focus {
+  outline: none;
+  box-shadow: none;
+}
+.field_contents .dokan-setting-warning a.dokan-setting-warning-link i.dashicons {
+  font-size: 18px;
+}
 .field_contents .dokan-setting-warning .dashicons {
   margin: 0px;
   padding: 0px;

diff --git a/assets/js/vue-admin.js b/assets/js/vue-admin.js
diff --git a/assets/js/vue-bootstrap.asset.php b/assets/js/vue-bootstrap.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('jquery', 'moment', 'wp-i18n'), 'version' => 'db0f41849b3c331ef68f');
+<?php return array('dependencies' => array('jquery', 'moment', 'wp-i18n'), 'version' => '90563cb6164ff83c246b');
diff --git a/assets/js/vue-bootstrap.js b/assets/js/vue-bootstrap.js
diff --git a/assets/src/less/products.less b/assets/src/less/products.less
@@ -540,7 +540,6 @@
         a.action-delete {
           position: absolute;
           top: 0;
-          right: 0;
           color: red;
           background: rgba(0, 0, 0, 0.6);
           margin: 0;
@@ -555,7 +554,9 @@
 
         &:hover {
           a.action-delete {
-            display: inline-block;
+            display: flex;
+            align-items: center;
+            justify-content: center;
           }
         }
       }
@@ -1261,7 +1262,6 @@
         a.action-delete {
           position: absolute;
           top: 0;
-          right: 0;
           color: red;
           background: rgba(0, 0, 0, 0.6);
           margin: 0;
@@ -1276,7 +1276,9 @@
 
         &:hover {
           a.action-delete {
-            display: inline-block;
+            display: flex;
+            align-items: center;
+            justify-content: center;
           }
         }
       }
@@ -1534,23 +1536,22 @@
         a.action-delete {
           position: absolute;
           top: 0;
-          right: 0;
           color: red;
           background: rgba(0, 0, 0, 0.6);
           margin: 0;
-          padding: 0 3px;
           font-size: 50px;
           width: 100%;
           text-align: center;
           height: 100%;
-          padding-top: 25%;
           font-weight: bold;
           display: none;
         }
 
         &:hover {
           a.action-delete {
-            display: inline-block;
+            display: flex;
+            align-items: center;
+            justify-content: center;
           }
         }
       }

diff --git a/assets/src/less/site-navigation.less b/assets/src/less/site-navigation.less
@@ -34,6 +34,10 @@
               }
             }
           }
+
+          svg {
+            margin-right: 15px;
+          }
         }
 
         &:hover {

diff --git a/dokan-class.php b/dokan-class.php
@@ -23,7 +23,7 @@ final class WeDevs_Dokan {
      *
      * @var string
      */
-    public $version = '3.13.0';
+    public $version = '3.13.1';
 
     /**
      * Instance of self

diff --git a/dokan.php b/dokan.php
@@ -3,7 +3,7 @@
  * Plugin Name: Dokan
  * Plugin URI: https://dokan.co/wordpress/
  * Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
- * Version: 3.13.0
+ * Version: 3.13.1
  * Author: weDevs
  * Author URI: https://dokan.co/
  * Text Domain: dokan-lite
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array(), 'version' => 'ce9e86ac7b08cc2b755c');
		<?php return array('dependencies' => array(), 'version' => 'fd1c77489837349e3bf2');
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,10 @@ @@
                   }
                 }
               }
+              svg {
+                margin-right: 15px;
+              }
             }
             &:hover {
@@ Expand Down @@