Merge branch 'release/2.6.5'

getdokan · Jul 16, 2017 · 5a3fa14 · 5a3fa14
2 parents 72f38a9 + b4e032d
commit 5a3fa14
Show file tree

Hide file tree

Showing 30 changed files with 1,233 additions and 256 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -25,7 +25,8 @@ module.exports = function(grunt) {
                     sourceMapRootpath: '../../'
                 },
                 files: {
-                    '<%= dirs.css %>/style.css': '<%= dirs.devLessSrc %>/style.less'
+                    '<%= dirs.css %>/style.css': '<%= dirs.devLessSrc %>/style.less',
+                    '<%= dirs.css %>/rtl.css': '<%= dirs.devLessSrc %>/rtl.less'
                 }
             },
 

diff --git a/assets/css/rtl.css b/assets/css/rtl.css
@@ -0,0 +1,210 @@
+.dokan-right {
+  float: left !important;
+}
+.dokan-left {
+  float: right !important;
+}
+.dokan-w1,
+.dokan-w2,
+.dokan-w3,
+.dokan-w4,
+.dokan-w5,
+.dokan-w6,
+.dokan-w7,
+.dokan-w8,
+.dokan-w9,
+.dokan-w10,
+.dokan-w11,
+.dokan-w12 {
+  float: right;
+}
+.dokan-form-horizontal .dokan-control-label {
+  text-align: left;
+  padding-left: 15px;
+}
+.dokan-form-group .checkbox input[type="checkbox"] {
+  float: right;
+  margin-left: 10px;
+}
+.dokan-form-group .ajax_prev {
+  margin-right: 23% !important;
+}
+.dokan-text-left {
+  text-align: right;
+}
+#dokan-comments-table td.col-author .dokan-author-img,
+#dokan-comments-table th.col-author .dokan-author-img {
+  float: right !important;
+  margin-left: 5px !important;
+}
+#dokan-comments-table td.col-author .dokan-author-meta,
+#dokan-comments-table th.col-author .dokan-author-meta {
+  float: right !important;
+}
+.dokan-dashboard .dokan-dashboard-content {
+  padding: 0 25px 0 0;
+}
+.dokan-dashboard .dokan-dashboard-content article.dashboard-content-area .dokan-dash-left {
+  padding-right: 0px;
+  padding-left: 15px;
+}
+.dokan-dashboard .dokan-dashboard-content article.dashboard-content-area .dashboard-widget .list-count .count {
+  float: left;
+}
+.dokan-dashboard .dokan-dashboard-content article.dashboard-content-area .dashboard-widget.orders .content-half-part {
+  float: right;
+}
+.dokan-dashboard .dokan-dashboard-content article.dokan-orders-area .dokan-order-left-content {
+  margin-right: 0;
+  margin-left: 3%;
+}
+.dokan-dashboard .dokan-dashboard-content article.dokan-orders-area .dokan-order-left-content .dokan-order-billing-address {
+  min-width: 49%;
+  margin-right: 0;
+  margin-left: 2%;
+}
+.dokan-dashboard .dokan-dashboard-content article.dokan-orders-area .dokan-order-left-content .dokan-order-shipping-address {
+  min-width: 49%;
+}
+.dokan-dashboard .dokan-dashboard-content .dokan-product-listing-area .product-listing-top .dokan-listing-filter {
+  float: right !important;
+}
+.dokan-dashboard .dokan-dashboard-content .dokan-product-listing-area .product-listing-top span.dokan-add-product-link a {
+  float: left !important;
+}
+.dokan-dashboard .dokan-dashboard-content .dokan-product-listing-area button[name="product_listing_search"] {
+  float: left !important;
+  margin-right: 5px;
+}
+.dokan-dashboard .dokan-dashboard-content .dokan-product-listing-area .dokan-product-date-filter .dokan-form-group {
+  float: right;
+}
+.dokan-dashboard .dokan-dashboard-content .dokan-product-listing-area .dokan-product-date-filter button {
+  float: right;
+  margin-right: 5px;
+}
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.active:after {
+  left: 0px;
+  right: 93%;
+  border-width: 16px 0px 16px 16px;
+}
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.back a {
+  padding-left: 0px;
+  padding-right: 16px;
+}
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.back a i {
+  float: left;
+}
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a i {
+  margin-top: 5px;
+}
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li a i.fa-angle-right {
+  padding-top: 0px;
+  -webkit-transform: rotate(180deg);
+  -moz-transform: rotate(180deg);
+  -o-transform: rotate(180deg);
+  -ms-transform: rotate(180deg);
+  transform: rotate(180deg);
+}
+.dokan-dashboard .dokan-dash-sidebar ul.dokan-dashboard-menu li.dokan-common-links a {
+  padding: 5% 5%;
+}
+.dokan-dashboard .product-edit-new-container .dokan-edit-row .dokan-section-heading h2 {
+  float: right;
+}
+.dokan-dashboard .product-edit-new-container .dokan-edit-row .dokan-section-heading p {
+  float: right;
+  margin-right: 8px;
+}
+.dokan-dashboard .product-edit-new-container .dokan-edit-row .dokan-section-toggle {
+  float: left;
+}
+.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-attribute-wrapper ul {
+  padding-right: 0px;
+  margin-right: 0px;
+}
+.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-attribute-wrapper ul li.product-attribute-list .dokan-product-attribute-heading a.dokan-product-remove-attribute {
+  position: relative;
+  float: left;
+  right: 0px;
+  top: 0px;
+}
+.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-attribute-wrapper ul li.product-attribute-list .dokan-product-attribute-heading a.dokan-product-toggle-attribute {
+  left: 50px;
+  right: auto;
+}
+.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-attribute-type select {
+  margin-right: 0px;
+  margin-left: 10px;
+}
+.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-variation-wrapper .dokan-variations-container .dokan-product-variation-itmes h3.variation-topbar-heading strong {
+  float: right;
+}
+.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-variation-wrapper .dokan-variations-container .dokan-product-variation-itmes h3.variation-topbar-heading select {
+  float: right;
+}
+.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-variation-wrapper .dokan-variations-container .dokan-product-variation-itmes .actions {
+  left: 15px;
+  right: auto;
+}
+.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-variation-wrapper .dokan-variations-container .dokan-product-variation-itmes .dokan-variable-attributes .thumbnail-checkbox-options .upload_image {
+  float: right;
+}
+.dokan-dashboard .product-edit-new-container .dokan-attribute-variation-options .dokan-product-variation-wrapper .dokan-variations-container .dokan-product-variation-itmes .dokan-variable-attributes .thumbnail-checkbox-options .options {
+  float: right;
+  margin-right: 24px;
+}
+#dokan-seller-listing-wrap ul.dokan-seller-wrap li .store-footer .seller-avatar {
+  left: 20px;
+  right: auto;
+}
+.dokan-store-sidebar {
+  margin-right: 0 !important;
+  margin-left: 3%;
+}
+.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout1 .profile-info-summery-wrapper .profile-info-summery .profile-info-head {
+  float: right;
+}
+.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout1 .profile-info-summery-wrapper .profile-info-summery .profile-info {
+  float: right;
+}
+.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout1 .profile-info-summery-wrapper .profile-info-summery .profile-info .store-name {
+  margin: 10px 15px 25px 15px;
+}
+.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout3 .profile-info-summery-wrapper .profile-info-summery .profile-info-head {
+  float: right;
+}
+.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout3 .profile-info-summery-wrapper .profile-info-summery .profile-info {
+  float: right;
+  width: 80%;
+}
+.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout3 .profile-info-summery-wrapper .profile-info-summery .profile-info .dokan-store-info li {
+  float: right;
+  margin-left: 40px;
+  margin-right: 0px;
+}
+.dokan-single-store .profile-frame .profile-info-box.profile-layout-layout3 .profile-info-summery-wrapper .profile-info-summery .profile-info .dokan-store-info li.dokan-store-rating {
+  float: none !important;
+}
+.dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info-head .profile-img img {
+  float: none;
+}
+.dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info i {
+  float: right;
+  margin-right: -25px;
+  margin-left: 0;
+}
+@media (min-width: 1200px) {
+  .dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info .store-social-wrapper {
+    left: 20px !important;
+    right: auto !important;
+  }
+}
+@media (max-width: 1199px) {
+  .dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info .dokan-store-info {
+    padding-right: 40px;
+  }
+  .dokan-single-store .profile-frame .profile-info-box .profile-info-summery-wrapper .profile-info-summery .profile-info .dokan-store-info li {
+    text-align: right !important;
+  }
+}
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -1732,6 +1732,66 @@ span.error {
   font-size: 2em;
   color: rgba(0, 0, 0, 0.75);
 }
+.dokan-category-menu {
+  padding: 0;
+  border: 1px solid #ece7e7;
+}
+.dokan-category-menu h3.widget-title {
+  margin: 0;
+  padding: 10px 10px 10px 15px;
+  background: #eee;
+  border: 1px solid #eee;
+  color: #444;
+}
+.dokan-category-menu ul li {
+  border-bottom: none;
+}
+.dokan-category-menu #cat-drop-stack ul .children {
+  display: none;
+}
+.dokan-category-menu #cat-drop-stack ul li:last-child a {
+  border-bottom: none !important;
+}
+.dokan-category-menu #cat-drop-stack ul li:last-child.has-children a {
+  border-bottom: 1px solid #eee !important;
+}
+.dokan-category-menu #cat-drop-stack > ul {
+  padding: 0px;
+  margin: 0px;
+}
+.dokan-category-menu #cat-drop-stack > ul li {
+  padding: 0;
+}
+.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap {
+  background: #fff;
+}
+.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap a {
+  border-bottom: 1px solid #eee;
+  margin: 0px 15px;
+  text-decoration: none;
+}
+.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap ul.level-0 {
+  background: #fafafa;
+}
+.dokan-category-menu #cat-drop-stack > ul li.parent-cat-wrap ul.level-0 li.has-children {
+  border-bottom: none;
+}
+.dokan-category-menu #cat-drop-stack > ul li a {
+  padding: 9px 0px;
+  display: block;
+  color: #3C3C3C;
+  position: relative;
+  font-size: 13px;
+  text-decoration: none;
+}
+.dokan-category-menu #cat-drop-stack > ul li a .caret-icon {
+  position: absolute;
+  right: -2px;
+  display: inline-block;
+  width: 20px;
+  vertical-align: middle;
+  text-align: center;
+}
 .dokan-announcement-wrapper .dokan-no-announcement .annoument-no-wrapper {
   height: 100%;
   margin: 70px auto;
@@ -2126,6 +2186,16 @@ div.media-sidebar a.edit-attachment {
 .dokan-dashboard .dokan-dashboard-content .dokan-page-help p {
   margin-bottom: 10px;
 }
+.dokan-orders-content .dokan-orders-area .dokan-order-left-content {
+  margin-right: 3%;
+}
+.dokan-orders-content .dokan-orders-area .dokan-order-left-content .dokan-order-billing-address {
+  min-width: 49%;
+  margin-right: 2%;
+}
+.dokan-orders-content .dokan-orders-area .dokan-order-left-content .dokan-order-shipping-address {
+  min-width: 49%;
+}
 .dokan-orders-content .dokan-orders-area .dokan-order-filter-serach {
   padding: 10px 7px;
 }
@@ -2278,6 +2348,12 @@ div.media-sidebar a.edit-attachment {
 .dokan-product-listing .dokan-product-listing-area .product-listing-top span.dokan-add-product-link {
   width: 30%;
 }
+.dokan-product-listing .dokan-product-listing-area form.dokan-product-search-form button[name="product_listing_search"] {
+  float: right;
+}
+.dokan-product-listing .dokan-product-listing-area form.dokan-product-search-form .dokan-form-group {
+  float: right;
+}
 .dokan-product-listing .dokan-product-listing-area table.product-listing-table span.product-type:before {
   font-family: FontAwesome;
   content: "\f133";
@@ -3686,6 +3762,7 @@ div.media-sidebar a.edit-attachment {
   float: left;
   padding: 0 25px;
   color: #444;
+  width: 80%;
 }
 .dokan-single-store .profile-frame.profile-frame-no-banner .profile-layout-layout3 .profile-info-summery-wrapper .profile-info-summery .profile-info .store-name {
   margin-top: 5px;

diff --git a/assets/js/dokan.js b/assets/js/dokan.js
@@ -1937,4 +1937,30 @@ jQuery(function($) {
         resize_dummy_image();
     });
 
-})(jQuery);
+})(jQuery);
+
+;( function ( $ ) {
+
+    $( '#cat-drop-stack li.has-children' ).on( 'click', '> a span.caret-icon', function ( e ) {
+        e.preventDefault();
+        var self = $( this ),
+            liHasChildren = self.closest( 'li.has-children' );
+
+        if ( !liHasChildren.find( '> ul.children' ).is( ':visible' ) ) {
+            self.find( 'i.fa' ).addClass( 'fa-rotate-90' );
+            if ( liHasChildren.find( '> ul.children' ).hasClass( 'level-0' ) ) {
+                self.closest( 'a' ).css( { 'borderBottom': 'none' } );
+            }
+        }
+
+        liHasChildren.find( '> ul.children' ).slideToggle( 'fast', function () {
+            if ( !$( this ).is( ':visible' ) ) {
+                self.find( 'i.fa' ).removeClass( 'fa-rotate-90' );
+
+                if ( liHasChildren.find( '> ul.children' ).hasClass( 'level-0' ) ) {
+                    self.closest( 'a' ).css( { 'borderBottom': '1px solid #eee' } );
+                }
+            }
+        } );
+    } );
+} )( jQuery );
diff --git a/assets/src/js/script.js b/assets/src/js/script.js
@@ -683,4 +683,30 @@ jQuery(function($) {
         resize_dummy_image();
     });
 
-})(jQuery);
+})(jQuery);
+
+;( function ( $ ) {
+
+    $( '#cat-drop-stack li.has-children' ).on( 'click', '> a span.caret-icon', function ( e ) {
+        e.preventDefault();
+        var self = $( this ),
+            liHasChildren = self.closest( 'li.has-children' );
+
+        if ( !liHasChildren.find( '> ul.children' ).is( ':visible' ) ) {
+            self.find( 'i.fa' ).addClass( 'fa-rotate-90' );
+            if ( liHasChildren.find( '> ul.children' ).hasClass( 'level-0' ) ) {
+                self.closest( 'a' ).css( { 'borderBottom': 'none' } );
+            }
+        }
+
+        liHasChildren.find( '> ul.children' ).slideToggle( 'fast', function () {
+            if ( !$( this ).is( ':visible' ) ) {
+                self.find( 'i.fa' ).removeClass( 'fa-rotate-90' );
+
+                if ( liHasChildren.find( '> ul.children' ).hasClass( 'level-0' ) ) {
+                    self.closest( 'a' ).css( { 'borderBottom': '1px solid #eee' } );
+                }
+            }
+        } );
+    } );
+} )( jQuery );