Icon Positions Changed

packages/Webkul/Admin/publishable/assets/js/admin.js.LICENSE.txt

@@ -1,12 +1,12 @@
 /*!
- * Sizzle CSS Selector Engine v2.3.6
+ * Sizzle CSS Selector Engine v2.3.5
  * https://sizzlejs.com/
  *
  * Copyright JS Foundation and other contributors
  * Released under the MIT license
  * https://js.foundation/
  *
- * Date: 2021-02-16
+ * Date: 2020-03-14
  */
 
 /*!
@@ -16,17 +16,17 @@
  */
 
 /*!
- * jQuery JavaScript Library v3.6.0
+ * jQuery JavaScript Library v3.5.1
  * https://jquery.com/
  *
  * Includes Sizzle.js
  * https://sizzlejs.com/
  *
- * Copyright OpenJS Foundation and other contributors
+ * Copyright JS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2021-03-02T17:08Z
+ * Date: 2020-05-04T22:49Z
  */
 
 /**

packages/Webkul/Admin/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/js/admin.js": "/js/admin.js?id=dc1e219a5abbaf707c3b",
-    "/css/admin.css": "/css/admin.css?id=67661904efcf8e7ad275"
+    "/js/admin.js": "/js/admin.js?id=f3d20a6568f3b4473dcc",
+    "/css/admin.css": "/css/admin.css?id=a2f685cc223d86b4c70d"
 }

packages/Webkul/Admin/src/Resources/assets/js/components/navigation/nav-slide-button.vue

@@ -8,17 +8,15 @@
     .toggle-aside-nav {
         position: absolute;
         top: 50px;
-        left: 78px;
+        right: -12px;
     }
 </style>
 
 <script>
 export default {
-    data: function() {
-        return {
-            iconClass: 'accordian-right-icon'
-        };
-    },
+    props: [
+        'iconClass',
+    ],
 
     methods: {
         toggle: function () {
@@ -33,20 +31,20 @@ export default {
             let self = this;
 
             $('.aside-nav').hide(function () {
-                self.iconClass = 'accordian-right-icon';
-
                 $('.content-wrapper').css({
                     marginLeft: 'unset'
                 });
+
+                $('#nav-expand-button').show();
             });
         },
 
         show: function () {
             let self = this;
 
-            $('.aside-nav').show(function () {
-                self.iconClass = 'accordian-left-icon';
+            $('#nav-expand-button').hide();
 
+            $('.aside-nav').show(function () {
                 $('.content-wrapper').css({
                     marginLeft: '280px'
                 });

packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss

@@ -153,7 +153,6 @@ body {
     }
 
     .aside-nav {
-        display: none;
         width: 280px;
         position: fixed;
         top: 60px;
@@ -190,6 +189,7 @@ body {
 
     .content-wrapper {
         padding: 25px 25px 25px 15px;
+        margin-left: 280px;
         margin-top:1px;
         background-color: $white;
     }

packages/Webkul/Admin/src/Resources/views/layouts/nav-aside.blade.php

@@ -1,4 +1,8 @@
 <div class="aside-nav">
+
+    {{-- button for collapsing aside nav --}}
+    <nav-slide-button icon-class="accordian-left-icon"></nav-slide-button>
+
     <ul>
         @if (request()->route()->getName() != 'admin.configuration.index')
             <?php $keys = explode('.', $menu->currentKey);  ?>

packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php

@@ -1,6 +1,7 @@
 <div class="navbar-left">
-    {{-- button for toggling aside nav --}}
-    <nav-slide-button></nav-slide-button>
+
+    {{-- button for expanding nav bar --}}
+    <nav-slide-button id="nav-expand-button" icon-class="accordian-right-icon" style="display: none;"></nav-slide-button>
 
     {{-- left menu bar --}}
     <ul class="menubar">
@@ -14,4 +15,5 @@
             </li>
         @endforeach
     </ul>
+
 </div>