diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity-admin.css b/packages/Webkul/Velocity/publishable/assets/css/velocity-admin.css index 34022ab73..31a19d3fa 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity-admin.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity-admin.css @@ -24,13 +24,6 @@ font-style: normal; } -.wk-icon { - font-size: 20px; - font-weight: 400; - text-align: center; - color: #0041ff; -} - [class^="rango-"], [class*=" rango-"] { /* use !important to prevent issues with browser extensions that change fonts */ font-family: 'Webkul Rango' !important; diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index 881340915..2d35efe64 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -1463,6 +1463,9 @@ .account-content .sidebar { height: 100%; +} + +.account-content .sidebar .customer-sidebar { border-right: 1px solid #E5E5E5; } @@ -12755,6 +12758,7 @@ body { } #top #account + .account-modal { + top: 40px; right: 10px; z-index: 100; height: -webkit-max-content; diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js index f3e879663..d74aa5762 100644 --- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js +++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js @@ -1069,7 +1069,8 @@ module.exports = Cancel; /***/ (function(module, exports, __webpack_require__) { __webpack_require__(12); -module.exports = __webpack_require__(69); +__webpack_require__(69); +module.exports = __webpack_require__(70); /***/ }), @@ -36779,5 +36780,11 @@ if (false) { // removed by extract-text-webpack-plugin +/***/ }), +/* 70 */ +/***/ (function(module, exports) { + +// removed by extract-text-webpack-plugin + /***/ }) /******/ ]); \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss index e4cf9a222..b94c06065 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss @@ -202,6 +202,7 @@ body { + .account-modal { @extend .modal-dialog; + top: 40px; right: 10px; z-index: 100; height: max-content; diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss index aa07515e2..f40678f89 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss @@ -666,7 +666,10 @@ .account-content { .sidebar { height: 100%; - border-right: 1px solid $border-general; + + .customer-sidebar { + border-right: 1px solid $border-general; + } .customer-sidebar { .account-details { diff --git a/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php index e9e46e230..dfc03f776 100644 --- a/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php @@ -14,13 +14,15 @@
-

{{ __('shop::app.reviews.write-review') }}

+

+ {{ __('shop::app.reviews.write-review') }} +

+ @submit.prevent="onSubmit" + action="{{ route('shop.reviews.store', $product->product_id ) }}"> @csrf @@ -29,7 +31,7 @@ {{ __('admin::app.customers.reviews.rating') }} - + @{{ errors.first('rating') }}
@@ -45,7 +47,9 @@ v-validate="'required'" value="{{ old('title') }}" /> - @{{ errors.first('title') }} + + @{{ errors.first('title') }} +
@if (core()->getConfigData('catalog.products.review.guest_review') && ! auth()->guard('customer')->user()) @@ -54,7 +58,9 @@ {{ __('shop::app.reviews.name') }} - @{{ errors.first('name') }} + + @{{ errors.first('name') }} + @endif @@ -69,7 +75,7 @@ v-validate="'required'" value="{{ old('comment') }}"> - + @{{ errors.first('comment') }} diff --git a/packages/Webkul/Velocity/webpack.mix.js b/packages/Webkul/Velocity/webpack.mix.js index e8be51c40..d707857ff 100644 --- a/packages/Webkul/Velocity/webpack.mix.js +++ b/packages/Webkul/Velocity/webpack.mix.js @@ -2,10 +2,13 @@ const { mix } = require("laravel-mix"); require("laravel-mix-merge-manifest"); var publicPath = "../../../resources/themes/velocity/assets"; + if (mix.inProduction()) { publicPath = 'publishable/assets'; } +publicPath = 'publishable/assets'; + mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications(); @@ -15,8 +18,6 @@ mix "js/velocity.js" ) - .copy(path.resolve('src/Resources/assets/images'), publicPath + '/images') - .copy(path.resolve('src/Resources/assets/fonts'), publicPath + '/fonts') .sass( __dirname + '/src/Resources/assets/sass/admin.scss', __dirname + '/' + publicPath + '/css/velocity-admin.css'