Merge branch 'master' into laravel-8-support

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
           composer install --no-cache
 
       - name: Migrate database
-        run: set -e && php artisan migrate --env=testing
+        run: set -e && php artisan config:cache && php artisan migrate --env=testing
 
       - name: Execute unit tests
         run: set -e && vendor/bin/codecept run unit

packages/Webkul/Velocity/publishable/assets/images/Icon-remove.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50.2 (55047) - http://www.bohemiancoding.com/sketch -->
+    <title>Icon-remove</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Icon-remove" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <circle id="Oval-9" stroke="#979797" stroke-width="2" cx="12" cy="12" r="10"></circle>
+        <g id="Icon-Cross-Sm" transform="translate(9.000000, 9.000000)" stroke="#8E8E8E" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+            <path d="M0,0 L6,6" id="Path-2"></path>
+            <path d="M0,0 L6,6" id="Path-2" transform="translate(3.000000, 3.000000) scale(-1, 1) translate(-3.000000, -3.000000) "></path>
+        </g>
+    </g>
+</svg>

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

@@ -1,5 +1,5 @@
 {
-    "/js/velocity.js": "/js/velocity.js?id=a45dba1beb5c6f79193d",
+    "/js/velocity.js": "/js/velocity.js?id=88772f0049a360a2c02e",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
-    "/css/velocity.css": "/css/velocity.css?id=2ee191136dd475471b01"
+    "/css/velocity.css": "/css/velocity.css?id=b900a5750cddffe0d3f5"
 }

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

@@ -215,7 +215,7 @@
                 height: 24px;
                 margin-right: 0;
                 position: absolute;
-                background-image: url(/themes/velocity/assets/images/Icon-remove.svg);
+                background-image: url("../images/Icon-remove.svg");
             }
         }
     }

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

@@ -98,14 +98,9 @@
             padding: 0;
             width: 100%;
             height: $header-height;
-            position: fixed;
             background-color: $white-color;
             box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
 
-            + div {
-                margin-top: $header-height;
-            }
-
             > div {
                 display: none;
             }