Merge pull request #3492 from akhtarkhan1/patch3

Fixed layout issue in order and downloadable grid at customer #3472

packages/Webkul/Ui/publishable/assets/js/ui.js.LICENSE.txt

@@ -1,24 +0,0 @@
-/* flatpickr v4.6.3, @license MIT */
-
-/*! *****************************************************************************
-    Copyright (c) Microsoft Corporation. All rights reserved.
-    Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-    this file except in compliance with the License. You may obtain a copy of the
-    License at http://www.apache.org/licenses/LICENSE-2.0
-
-    THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-    WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-    MERCHANTABLITY OR NON-INFRINGEMENT.
-
-    See the Apache Version 2.0 License for specific language governing permissions
-    and limitations under the License.
-    ***************************************************************************** */
-
-/**
- *
- *
- * @author Jerry Bendy <jerry@icewingcc.com>
- * @licence MIT
- *
- */

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

@@ -1,4 +1,4 @@
 {
-    "/js/ui.js": "/js/ui.js?id=e5e928de0a10dc274cd5",
-    "/css/ui.css": "/css/ui.css?id=7a610c96759844d71103"
+    "/js/ui.js": "/js/ui.js?id=3ccd955983e91b6ccc96",
+    "/css/ui.css": "/css/ui.css?id=b5bedc0ff04a145ca18a"
 }

packages/Webkul/Ui/src/Resources/assets/sass/components.scss

@@ -120,7 +120,7 @@
     justify-content: space-between;
     align-items: center;
     font-size: 14px;
-    height: 28px;
+    height: 40px;
     border-radius: 2px;
     margin-right: 20px;
 
@@ -132,7 +132,7 @@
         align-items: center;
         background: #E7E7E7;
         font-size: 14px;
-        height: 28px;
+        height: 40px;
         color: #000311;
         letter-spacing: -0.22px;
         @include border-radius(2px);

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

@@ -1,5 +1,5 @@
 {
-    "/js/velocity.js": "/js/velocity.js?id=ed145773873729794808",
+    "/js/velocity.js": "/js/velocity.js?id=e7cb83bdbcabf25995cc",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
-    "/css/velocity.css": "/css/velocity.css?id=02ba781fdeb5ad5b10eb"
+    "/css/velocity.css": "/css/velocity.css?id=a6ba44ccf2158be5a1d9"
 }

packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss

@@ -1,3 +1,4 @@
+
 .vc-small-screen {
     display: none !important;
 }
@@ -30,6 +31,7 @@
     }
 }
 
+
 @media only screen and (max-width: 992px) {
 
 }
@@ -47,6 +49,36 @@
     .footer .currency {
         display: block !important;
     }
+
+
+    .table {
+        width: 90%;
+        margin-bottom: 1rem;
+        margin-top: 68px;
+        color: #212529;
+    }
+
+    .per-page {
+        position: absolute;
+        margin-top: 66px;
+        margin-right: -1px;
+        margin-left: 17px;
+        width: 151px;
+    }
+
+     .filter-left {
+        position: relative;
+        margin-right: -6px!important;
+    }
+
+     .dropdown-filters {
+        margin-left: 15px;
+    }
+
+      button.btn.btn-sm.btn-primary.apply-filter {
+        margin-top: 10px;
+        margin-left: -158px;
+    }
 }
 
 @media only screen and (max-width: 992px) {

packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php

@@ -6,7 +6,7 @@
 
 @section('page-detail-wrapper')
     @if ($addresses->isEmpty())
-        <a href="{{ route('customer.address.create') }}" class="theme-btn light unset pull-right">
+        <a href="{{ route('customer.address.create') }}" class="theme-btn light unset address-button">
             {{ __('shop::app.customer.account.address.index.add') }}
         </a>
     @endif
@@ -80,3 +80,12 @@
         }
     </script>
 @endpush
+
+@if ($addresses->isEmpty())
+<style>
+    .address-button {
+        position: absolute;
+        margin-top: 92px;
+    }
+</style>
+@endif