This commit is contained in:
shubhammehrotra.symfony@webkul.com 2020-01-20 19:30:55 +05:30
parent 1271b8a60b
commit 47b06aa3cf
7 changed files with 33 additions and 18 deletions

View File

@ -24,13 +24,6 @@
font-style: normal; font-style: normal;
} }
.wk-icon {
font-size: 20px;
font-weight: 400;
text-align: center;
color: #0041ff;
}
[class^="rango-"], [class*=" rango-"] { [class^="rango-"], [class*=" rango-"] {
/* use !important to prevent issues with browser extensions that change fonts */ /* use !important to prevent issues with browser extensions that change fonts */
font-family: 'Webkul Rango' !important; font-family: 'Webkul Rango' !important;

View File

@ -1463,6 +1463,9 @@
.account-content .sidebar { .account-content .sidebar {
height: 100%; height: 100%;
}
.account-content .sidebar .customer-sidebar {
border-right: 1px solid #E5E5E5; border-right: 1px solid #E5E5E5;
} }
@ -12755,6 +12758,7 @@ body {
} }
#top #account + .account-modal { #top #account + .account-modal {
top: 40px;
right: 10px; right: 10px;
z-index: 100; z-index: 100;
height: -webkit-max-content; height: -webkit-max-content;

View File

@ -1069,7 +1069,8 @@ module.exports = Cancel;
/***/ (function(module, exports, __webpack_require__) { /***/ (function(module, exports, __webpack_require__) {
__webpack_require__(12); __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 // removed by extract-text-webpack-plugin
/***/ }),
/* 70 */
/***/ (function(module, exports) {
// removed by extract-text-webpack-plugin
/***/ }) /***/ })
/******/ ]); /******/ ]);

View File

@ -202,6 +202,7 @@ body {
+ .account-modal { + .account-modal {
@extend .modal-dialog; @extend .modal-dialog;
top: 40px;
right: 10px; right: 10px;
z-index: 100; z-index: 100;
height: max-content; height: max-content;

View File

@ -666,7 +666,10 @@
.account-content { .account-content {
.sidebar { .sidebar {
height: 100%; height: 100%;
border-right: 1px solid $border-general;
.customer-sidebar {
border-right: 1px solid $border-general;
}
.customer-sidebar { .customer-sidebar {
.account-details { .account-details {

View File

@ -14,13 +14,15 @@
<div class="col-6"> <div class="col-6">
<div class="row customer-rating"> <div class="row customer-rating">
<h2 class="full-width">{{ __('shop::app.reviews.write-review') }}</h2> <h2 class="full-width">
{{ __('shop::app.reviews.write-review') }}
</h2>
<form <form
method="POST" method="POST"
class="review-form" class="review-form"
action="{{ route('shop.reviews.store', $product->product_id ) }}" @submit.prevent="onSubmit"
@submit.prevent="onSubmit"> action="{{ route('shop.reviews.store', $product->product_id ) }}">
@csrf @csrf
@ -29,7 +31,7 @@
{{ __('admin::app.customers.reviews.rating') }} {{ __('admin::app.customers.reviews.rating') }}
</label> </label>
<star-ratings ratings="5" size="24" editable="true"></star-ratings> <star-ratings ratings="5" size="24" editable="true"></star-ratings>
<span class="control-error" v-if="errors.has('rating')"> <span :class="`control-error ${errors.has('rating') ? '' : 'hide'}`" v-if="errors.has('rating')">
@{{ errors.first('rating') }} @{{ errors.first('rating') }}
</span> </span>
</div> </div>
@ -45,7 +47,9 @@
v-validate="'required'" v-validate="'required'"
value="{{ old('title') }}" /> value="{{ old('title') }}" />
<span class="control-error" v-if="errors.has('title')">@{{ errors.first('title') }}</span> <span :class="`control-error ${errors.has('title') ? '' : 'hide'}`">
@{{ errors.first('title') }}
</span>
</div> </div>
@if (core()->getConfigData('catalog.products.review.guest_review') && ! auth()->guard('customer')->user()) @if (core()->getConfigData('catalog.products.review.guest_review') && ! auth()->guard('customer')->user())
@ -54,7 +58,9 @@
{{ __('shop::app.reviews.name') }} {{ __('shop::app.reviews.name') }}
</label> </label>
<input type="text" class="control" name="name" v-validate="'required'" value="{{ old('name') }}"> <input type="text" class="control" name="name" v-validate="'required'" value="{{ old('name') }}">
<span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span> <span :class="`control-error ${errors.has('name') ? '' : 'hide'}`">
@{{ errors.first('name') }}
</span>
</div> </div>
@endif @endif
@ -69,7 +75,7 @@
v-validate="'required'" v-validate="'required'"
value="{{ old('comment') }}"> value="{{ old('comment') }}">
</textarea> </textarea>
<span class="control-error" v-if="errors.has('comment')"> <span :class="`control-error ${errors.has('comment') ? '' : 'hide'}`">
@{{ errors.first('comment') }} @{{ errors.first('comment') }}
</span> </span>
</div> </div>

View File

@ -2,10 +2,13 @@ const { mix } = require("laravel-mix");
require("laravel-mix-merge-manifest"); require("laravel-mix-merge-manifest");
var publicPath = "../../../resources/themes/velocity/assets"; var publicPath = "../../../resources/themes/velocity/assets";
if (mix.inProduction()) { if (mix.inProduction()) {
publicPath = 'publishable/assets'; publicPath = 'publishable/assets';
} }
publicPath = 'publishable/assets';
mix.setPublicPath(publicPath).mergeManifest(); mix.setPublicPath(publicPath).mergeManifest();
mix.disableNotifications(); mix.disableNotifications();
@ -15,8 +18,6 @@ mix
"js/velocity.js" "js/velocity.js"
) )
.copy(path.resolve('src/Resources/assets/images'), publicPath + '/images')
.copy(path.resolve('src/Resources/assets/fonts'), publicPath + '/fonts')
.sass( .sass(
__dirname + '/src/Resources/assets/sass/admin.scss', __dirname + '/src/Resources/assets/sass/admin.scss',
__dirname + '/' + publicPath + '/css/velocity-admin.css' __dirname + '/' + publicPath + '/css/velocity-admin.css'