Skip to content

Commit

Permalink
Merge branch 'release/3.10.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@nurul-umbhiya
nurul-umbhiya committed Mar 4, 2024
2 parents b631a1a + fda8905 commit 7829ea5
Show file tree
Hide file tree
Showing 14 changed files with 385 additions and 330 deletions.
10 changes: 8 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
**Requires at least:** 5.6
**Tested up to:** 6.4.3
**WC requires at least:** 5.0.0
**WC tested up to:** 8.5.2
**WC tested up to:** 8.6.1
**Requires PHP:** 7.4
**Stable tag:** 3.9.9
**Stable tag:** 3.10.0
**License:** GPLv2 or later
**License URI:** http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -338,6 +338,12 @@ A. Just install and activate the PRO version without deleting the free plugin. A

## Changelog ##

### v3.10.0 ( Mar 04, 2024 ) ###

- **new:** Added a new filter hook named `dokan_product_cache_delete_all_data`, by using this one can prevent deleting product cache if necessary.
- **update:** Updated FontAwesome library to version 6.5.1
- **fix:** Fixed Elementor mega menu z-index conflict and removed line break from address fields

### v3.9.9 ( Feb 12, 2024 ) ###

- **new:** Added PHP 8.2 support
Expand Down
12 changes: 10 additions & 2 deletions assets/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5284,6 +5284,9 @@ div.media-sidebar a.edit-attachment {
font-size: 25px;
text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.55);
}
.dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info .store-social-wrapper .store-social li a i.fa-square-x-twitter {
color: #000000;
}
.dokan-single-store .profile-frame .profile-info-box.profile-layout-default img.profile-info-img {
position: absolute;
top: 0;
Expand Down Expand Up @@ -5524,6 +5527,10 @@ div.media-sidebar a.edit-attachment {
.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout1 .profile-info-summery-wrapper .profile-info-summery .profile-info .store-social-wrapper .store-social li a i {
font-size: 25px;
text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.55);
color: #0B8379;
}
.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout1 .profile-info-summery-wrapper .profile-info-summery .profile-info .store-social-wrapper .store-social li a i.fa-square-x-twitter {
color: #000000;
}
.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout2 .profile-info-summery-wrapper .profile-info-summery .profile-info {
margin-top: 0;
Expand Down Expand Up @@ -5995,7 +6002,6 @@ p.vendor-customer-registration .radio:hover {
position: absolute;
top: 0;
left: 0;
z-index: 9;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.45);
Expand Down Expand Up @@ -6041,13 +6047,15 @@ p.vendor-customer-registration .radio:hover {
margin: 0 0 5px 0;
line-height: 23px;
}
#dokan-seller-listing-wrap.grid-view .store-content .store-data-container .store-data .store-address br {
display: none;
}
#dokan-seller-listing-wrap.grid-view .store-content .store-data-container .store-data .store-phone {
margin: 0 0 5px 0;
}
#dokan-seller-listing-wrap.grid-view .store-footer {
background: #fff;
position: relative;
z-index: 99;
}
#dokan-seller-listing-wrap.grid-view .store-footer a:active,
#dokan-seller-listing-wrap.grid-view .store-footer a:focus {
Expand Down
168 changes: 81 additions & 87 deletions assets/css/vue-admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2030,27 +2030,24 @@ ul[data-v-525b077c] {
.switch input {
display: none;
}
.switch input:checked + .slider {
background-color: #0090ff;
.switch input.enabled + .slider {
background-color: var(--dokan-toggle-active-color);
}
.switch input:checked + .slider:before {
.switch input.enabled + .slider:before {
-webkit-transform: translateX(22px);
-ms-transform: translateX(22px);
transform: translateX(22px);
}
.switch input:focus + .slider {
box-shadow: 0 0 1px #2196F3;
}
.switch .slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #d7dadd;
-webkit-transition: 0.4s;
transition: 0.4s;
background-color: var(--dokan-toggle-inactive-color);
-webkit-transition: 0.2s;
transition: 0.2s;
}
.switch .slider:before {
position: absolute;
Expand All @@ -2059,9 +2056,9 @@ ul[data-v-525b077c] {
width: 14px;
left: 3px;
bottom: 3px;
background-color: white;
-webkit-transition: 0.4s;
transition: 0.4s;
background-color: var(--dokan-toggle-color);
-webkit-transition: 0.2s;
transition: 0.2s;
}
.switch .slider.round {
border-radius: 34px;
Expand All @@ -2070,16 +2067,16 @@ ul[data-v-525b077c] {
border-radius: 50%;
}

.secret-box-wraper[data-v-d315bc24] {
.secret-box-wraper[data-v-2a9a6c5c] {
display: flex;
flex-direction: row-reverse;
}
.secret-box-wraper .secret-input-box[data-v-d315bc24] {
.secret-box-wraper .secret-input-box[data-v-2a9a6c5c] {
position: relative;
display: flex;
width: 25em;
}
.secret-box-wraper .secret-input-box div button[data-v-d315bc24] {
.secret-box-wraper .secret-input-box div button[data-v-2a9a6c5c] {
cursor: pointer;
height: 20px;
min-height: 32px;
Expand All @@ -2090,22 +2087,22 @@ ul[data-v-525b077c] {
background: white;
color: #686666;
}
.secret-box-wraper .secret-input-box .secret-input[data-v-d315bc24] {
.secret-box-wraper .secret-input-box .secret-input[data-v-2a9a6c5c] {
width: 100%;
}
.secret-box-wraper .secret-input-box .secret-input.blurry-input[data-v-d315bc24] {
.secret-box-wraper .secret-input-box .secret-input.blurry-input[data-v-2a9a6c5c] {
color: transparent;
text-shadow: 0 0 7px #333;
}
.secret-box-wraper .secret-input-box .secret-input-placeholder[data-v-d315bc24] {
.secret-box-wraper .secret-input-box .secret-input-placeholder[data-v-2a9a6c5c] {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
color: #686666;
}
@media only screen and (max-width: 768px) {
.secret-box-wraper .secret-input-box[data-v-d315bc24] {
.secret-box-wraper .secret-input-box[data-v-2a9a6c5c] {
max-width: 125px !important;
}
}
Expand All @@ -2123,50 +2120,106 @@ ul[data-v-525b077c] {
width: 100px;
}

.wm-box-container[data-v-31bb288b] {
.wm-box-container[data-v-3b142b94] {
display: flex;
flex-direction: column;
}
.wm-box-container .wm-methods-box-container[data-v-31bb288b] {
.wm-box-container .wm-methods-box-container[data-v-3b142b94] {
margin-top: 15px;
}
.wm-box-container .wm-methods-box-container .wm-methods-box[data-v-31bb288b] {
.wm-box-container .wm-methods-box-container .wm-methods-box[data-v-3b142b94] {
border-bottom: 1px solid #f3f4f6;
padding: 0 30px;
display: flex;
justify-content: space-between;
align-items: center;
}
.wm-box-container .wm-methods-box-container .wm-methods-box[data-v-31bb288b]:last-child {
.wm-box-container .wm-methods-box-container .wm-methods-box[data-v-3b142b94]:last-child {
border-bottom: 0;
}
.wm-box-container .wm-methods-box-container .wm-methods-box .wm-method[data-v-31bb288b] {
.wm-box-container .wm-methods-box-container .wm-methods-box .wm-method[data-v-3b142b94] {
display: flex;
align-items: center;
}
.wm-box-container .wm-methods-box-container .wm-methods-box .wm-charges[data-v-31bb288b] {
.wm-box-container .wm-methods-box-container .wm-methods-box .wm-charges[data-v-3b142b94] {
display: flex;
align-items: center;
}
.wm-box-container .wm-methods-box-container .wm-methods-box .wm-charges .wm-automated[data-v-31bb288b] {
.wm-box-container .wm-methods-box-container .wm-methods-box .wm-charges .wm-automated[data-v-3b142b94] {
border: 1px solid #dbdbdb;
color: #838181;
padding: 5px 8px;
border-radius: 12px;
background: #f5f5f6;
}
@media only screen and (max-width: 782px) {
.wm-box-container .wm-methods-box-container .wm-methods-box[data-v-31bb288b] {
.wm-box-container .wm-methods-box-container .wm-methods-box[data-v-3b142b94] {
flex-direction: column;
justify-content: start;
align-items: start;
}
.wm-box-container .wm-methods-box-container .wm-methods-box .wm-charges[data-v-31bb288b] {
.wm-box-container .wm-methods-box-container .wm-methods-box .wm-charges[data-v-3b142b94] {
margin-left: -20px;
margin-bottom: 20px;
}
}

.dokan-radio-fields[data-v-49a35897] {
display: flex;
flex: 2;
align-self: center;
}
.dokan-radio-fields label[data-v-49a35897] {
border: 1px solid #b0a7a7;
padding: 10px 15px;
display: inline-block;
overflow: hidden;
font-size: 12px;
font-family: Roboto, sans-serif;
font-weight: 400;
line-height: 14px;
border-right: 0;
}
.dokan-radio-fields label .dashicons-yes[data-v-49a35897] {
color: #fff;
width: 15px;
height: 15px;
margin: -1px 3px 0 0;
cursor: pointer;
display: none;
font-size: 15px;
background: #1aa0f7;
padding-top: 0;
border-radius: 50%;
}
.dokan-radio-fields label input[type=radio][data-v-49a35897] {
display: none;
}
.dokan-radio-fields label[data-v-49a35897]:hover {
color: rgba(3, 58, 163, 0.85);
background: rgba(182, 206, 254, 0.38);
box-sizing: border-box;
box-shadow: 0 4px 4px rgba(0, 0, 0, 0.1);
}
.dokan-radio-fields label.checked[data-v-49a35897] {
color: rgba(3, 58, 163, 0.85);
border: 1px solid rgba(3, 58, 163, 0.81) !important;
background: rgba(182, 206, 254, 0.38);
box-sizing: border-box;
}
.dokan-radio-fields label.checked .dashicons-yes[data-v-49a35897] {
display: inline-block;
}
.dokan-radio-fields label[data-v-49a35897]:first-child {
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
}
.dokan-radio-fields label[data-v-49a35897]:last-child {
border-right: 1px solid #b0a7a7;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
}

span.repeatable-item-description {
color: #999;
font-size: 11px;
Expand Down Expand Up @@ -2699,9 +2752,6 @@ ul.dokan-settings-repeatable-list li span.remove-item {
.field_contents fieldset .field .large {
max-width: 100% !important;
}
.field_contents fieldset .radio_fields label:first-child {
display: flex;
}
.field_contents .scl_fields {
padding: 10px 15px;
}
Expand Down Expand Up @@ -4096,62 +4146,6 @@ to {
}
}

.dokan-radio-fields[data-v-41450cfc] {
display: flex;
flex: 2;
align-self: center;
}
.dokan-radio-fields label[data-v-41450cfc] {
border: 1px solid #b0a7a7;
padding: 10px 15px;
display: inline-block;
overflow: hidden;
font-size: 12px;
font-family: Roboto, sans-serif;
font-weight: 400;
line-height: 14px;
border-right: 0;
}
.dokan-radio-fields label .dashicons-yes[data-v-41450cfc] {
color: #fff;
width: 15px;
height: 15px;
margin: -1px 3px 0 0;
cursor: pointer;
display: none;
font-size: 15px;
background: #1aa0f7;
padding-top: 0;
border-radius: 50%;
}
.dokan-radio-fields label input[type=radio][data-v-41450cfc] {
display: none;
}
.dokan-radio-fields label[data-v-41450cfc]:hover {
color: rgba(3, 58, 163, 0.85);
background: rgba(182, 206, 254, 0.38);
box-sizing: border-box;
box-shadow: 0 4px 4px rgba(0, 0, 0, 0.1);
}
.dokan-radio-fields label.checked[data-v-41450cfc] {
color: rgba(3, 58, 163, 0.85);
border: 1px solid rgba(3, 58, 163, 0.81) !important;
background: rgba(182, 206, 254, 0.38);
box-sizing: border-box;
}
.dokan-radio-fields label.checked .dashicons-yes[data-v-41450cfc] {
display: inline-block;
}
.dokan-radio-fields label[data-v-41450cfc]:first-child {
border-top-left-radius: 5px;
border-bottom-left-radius: 5px;
}
.dokan-radio-fields label[data-v-41450cfc]:last-child {
border-right: 1px solid #b0a7a7;
border-top-right-radius: 5px;
border-bottom-right-radius: 5px;
}

.dokan-rw-footer {
display: flex;
flex-direction: row-reverse;
Expand Down
Loading

0 comments on commit 7829ea5

Please sign in to comment.