merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Sanjaybhattwebkul/bagisto into thad-border

This commit is contained in:
Sanjay 2022-03-30 11:22:24 +05:30
parent 97ef0b4936 f43a2b1538
commit c32e7e325e
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Resources/views/cms/edit.blade.php
View File

@ -68,7 +68,7 @@
<div class="form-container">
@csrf()
<accordian :title="{{ __('admin::app.cms.pages.general') }}" :active="true">
<accordian title="{{ __('admin::app.cms.pages.general') }}" :active="true">
<div slot="body">
<div class="control-group" :class="[errors.has('{{$locale}}[page_title]') ? 'has-error' : '']">
<label for="page_title" class="required">{{ __('admin::app.cms.pages.page-title') }}</label>

2
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Ui/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=a45138406e848b98ad5d",
"/css/ui.css": "/css/ui.css?id=8d793a6d94eb4db0298b"
"/css/ui.css": "/css/ui.css?id=ca90582f920febe7c3ae"
}

3
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -811,7 +811,8 @@ h5 {
margin-left: -34px;
pointer-events: none;
position: absolute;
top: 51%;
top: 50%;
left: 70%;
}
.cross-icon {

2
packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
View File

@ -45,7 +45,7 @@
@foreach ($comparableAttributes as $attribute)
<tr>
<td class="header">
<span class="fs16">{{ isset($attribute['name']) ? $attribute['name'] : $attribute['admin_name'] }}</span>
<span class="fs16 font-weight-bold">{{ isset($attribute['name']) ? $attribute['name'] : $attribute['admin_name'] }}</span>
</td>
<td :key="`title-${index}`" v-for="(product, index) in products">