Skip to content

Commit

Permalink
chore: version bump, changelog updated
Browse files Browse the repository at this point in the history
  • Loading branch information
sabbir1991 committed Jun 13, 2019
1 parent 43837b0 commit 1ada44f
Show file tree
Hide file tree
Showing 10 changed files with 58 additions and 41 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,11 @@ A. Just install and activate the PRO version without deleting the free plugin. A

## Changelog ##

v2.9.17 -> June 13, 2019
------------------------------------
- **Fix*** Remove unwanted code to fix conflict with yith plugin
- **Tweak*** Dokan theme support and responsive menu

v2.9.16 -> June 11, 2019
------------------------------------
- **Fix*** Hide hidden and out of stock products in vendor store page
Expand Down
61 changes: 32 additions & 29 deletions assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -1931,55 +1931,55 @@ article.dokan-notice-single-notice-area span.dokan-single-announcement-date {
overflow: hidden;
background-color: #242424;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu {
background: #242424;
list-style: none;
margin: 0 0 20px 0;
padding: 0;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li {
margin: 0;
border-bottom: 1px solid #454545;
position: relative;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li a {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a {
padding: 10px 0 10px 18px;
display: block;
color: #fff;
font-size: 14px;
font-weight: normal;
text-decoration: none;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li a i {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a i {
font-size: 17px;
padding-right: 15px;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li:hover {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li:hover {
background: #f05025;
color: #fff;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.dokan-common-links:hover {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.dokan-common-links:hover {
background: none !important;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.dokan-common-links a {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.dokan-common-links a {
display: inline-block !important;
width: 33.333333%;
padding: 6% 13%;
float: left;
border-right: 1px solid #454545;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.dokan-common-links a:hover {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.dokan-common-links a:hover {
background: #f05025;
color: #fff;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.dokan-common-links a:last-child {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.dokan-common-links a:last-child {
border-right: none;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.active {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.active {
position: relative;
background: #f05025;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.active:after {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.active:after {
left: 93%;
top: 50%;
border: transparent solid;
Expand All @@ -1993,7 +1993,7 @@ article.dokan-notice-single-notice-area span.dokan-single-announcement-date {
border-width: 16px 16px 16px 0;
margin-top: -16px;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li ul.sub-menu {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li ul.sub-menu {
background: #fff;
margin: 0;
list-style: none;
Expand All @@ -2008,36 +2008,39 @@ article.dokan-notice-single-notice-area span.dokan-single-announcement-date {
border-right: 1px solid #ECECEC;
border-bottom: 1px solid #ECECEC;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li ul.sub-menu a {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li ul.sub-menu a {
padding: 2px 0 2px 10px;
font-size: 13px;
color: #333;
font-weight: normal;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li ul.sub-menu a:hover {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li ul.sub-menu a:hover {
background: #f37655;
color: #fff;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li ul.sub-menu li {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li ul.sub-menu li {
border-bottom: 1px solid #ccc;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li ul.sub-menu li:last-child {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li ul.sub-menu li:last-child {
border-bottom: none;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu li.settings i.pull-right {
.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.settings i.pull-right {
padding-top: 5px;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation #toggle-mobile-menu {
display: none;
}
#dokan-navigation > label {
display: block;
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation #mobile-menu-icon {
display: none;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation > #mobile-menu-icon {
font-size: 17px;
color: #fff;
position: absolute;
top: 10px;
right: 15px;
width: 33px;
z-index: 99999;
cursor: pointer;
-webkit-touch-callout: none;
-webkit-user-select: none;
Expand All @@ -2049,14 +2052,10 @@ article.dokan-notice-single-notice-area span.dokan-single-announcement-date {
border-radius: 3px;
padding: 3px 8px;
}
#dokan-navigation > input:checked + ul.dokan-dashboard-menu {
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation > input:checked + ul.dokan-dashboard-menu {
display: block !important;
clear: both;
top: 48px;
position: absolute;
background: #000;
color: #fff;
z-index: 9999;
animation: showNav 350ms ease-in-out both;
}
@keyframes showNav {
Expand All @@ -2068,17 +2067,21 @@ article.dokan-notice-single-notice-area span.dokan-single-announcement-date {
}
}
@media only screen and (max-width: 450px) {
#dokan-navigation {
display: #303030;
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation {
background: #000;
height: 48px;
position: relative;
}
#dokan-navigation #toggle-mobile-menu {
display: block;
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation #mobile-menu-icon {
display: block !important;
}
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation #toggle-mobile-menu {
display: none !important;
}
#dokan-navigation ul.dokan-dashboard-menu {
.dokan-dashboard .dokan-dash-sidebar #dokan-navigation ul.dokan-dashboard-menu {
display: none;
height: auto !important;
padding-top: 48px !important;
}
}
html,
Expand Down
1 change: 0 additions & 1 deletion assets/js/dokan.js
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,6 @@ jQuery(function($) {
// gallery
$('body, #dokan-product-images').on('click', 'a.add-product-images', this.gallery.addImages );
$('body, #dokan-product-images').on( 'click', 'a.action-delete', this.gallery.deleteImage );
$('body, #dokan-product-images').on( 'click', 'a.delete', this.gallery.deleteImage );
this.gallery.sortable();

// featured image
Expand Down
5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
v2.9.17 -> June 13, 2019
------------------------------------
- **Fix*** Remove unwanted code to fix conflict with yith plugin
- **Tweak*** Dokan theme support and responsive menu

v2.9.16 -> June 11, 2019
------------------------------------
- **Fix*** Hide hidden and out of stock products in vendor store page
Expand Down
4 changes: 2 additions & 2 deletions dokan.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: Dokan
Plugin URI: https://wordpress.org/plugins/dokan-lite/
Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
Version: 2.9.16
Version: 2.9.17
Author: weDevs, LLC
Author URI: https://wedevs.com/
Text Domain: dokan-lite
Expand Down Expand Up @@ -78,7 +78,7 @@ final class WeDevs_Dokan {
*
* @var string
*/
public $version = '2.9.16';
public $version = '2.9.17';

/**
* Instance of self
Expand Down
2 changes: 1 addition & 1 deletion includes/class-theme-support.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private function include_support() {
*
* @param string $file
*
* @since DOKAN_LITE_SINCE
* @since 2.9.17
*
* @return string|null on failure
*/
Expand Down
4 changes: 2 additions & 2 deletions includes/theme-support/class-rehub.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* Rehub Theme Support
*
* @since DOKAN_LITE_SINCE
* @since 2.9.17
*/
class Dokan_Theme_Support_Rehub {
/**
Expand All @@ -16,7 +16,7 @@ public function __construct() {
/**
* Remove hamburger menu
*
* @since DOKAN_LITE_SINCE
* @since 2.9.17
*
* @return boolean
*/
Expand Down
10 changes: 5 additions & 5 deletions languages/dokan-lite.pot
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# This file is distributed under the GPL2.
msgid ""
msgstr ""
"Project-Id-Version: Dokan 2.9.16\n"
"Project-Id-Version: Dokan 2.9.17\n"
"Report-Msgid-Bugs-To: https://wedevs.com/contact/\n"
"POT-Creation-Date: 2019-06-11 03:21:00+00:00\n"
"POT-Creation-Date: 2019-06-13 09:18:57+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -4131,16 +4131,16 @@ msgstr ""
msgid "Back to Dashboard"
msgstr ""

#: includes/template-tags.php:481 templates/settings/header.php:13
#: includes/template-tags.php:490 templates/settings/header.php:13
#: templates/store-lists-loop.php:71
msgid "Visit Store"
msgstr ""

#: includes/template-tags.php:482 templates/global/header-menu.php:48
#: includes/template-tags.php:491 templates/global/header-menu.php:48
msgid "Edit Account"
msgstr ""

#: includes/template-tags.php:483
#: includes/template-tags.php:492
msgid "Log out"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dokan",
"version": "2.9.16",
"version": "2.9.17",
"description": "A WordPress marketplace plugin",
"author": "weDevs",
"license": "GPL",
Expand Down
5 changes: 5 additions & 0 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,11 @@ A. Just install and activate the PRO version without deleting the free plugin. A

== Changelog ==

v2.9.17 -> June 13, 2019
------------------------------------
- **Fix*** Remove unwanted code to fix conflict with yith plugin
- **Tweak*** Dokan theme support and responsive menu

v2.9.16 -> June 11, 2019
------------------------------------
- **Fix*** Hide hidden and out of stock products in vendor store page
Expand Down

0 comments on commit 1ada44f

Please sign in to comment.