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

Merge pull request #2809 from shubhwebkul/patch-1 

misc. velocity theme updates
This commit is contained in:
Jitendra Singh 2020-04-01 14:09:11 +05:30 committed by GitHub
parent 88ce2bd320 dd88a81f92
commit d65653a6fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
View File

@ -6,7 +6,12 @@
@section('content')
<div class="content">
<form method="POST" action="{{ route('admin.sliders.create') }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
<form
method="POST"
@submit.prevent="onSubmit"
enctype="multipart/form-data"
action="{{ route('admin.sliders.create') }}">
<div class="page-header">
<div class="page-title">
<h1>

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=d1e8a6d2c78f6d0657a7",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=16024aee144fa5e1275e"
"/css/velocity.css": "/css/velocity.css?id=c93522195912f75d54dc"
}

5
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -860,7 +860,8 @@
}
input,
select {
select,
textarea {
width: 100%;
resize: none;
font-size: 16px;
@ -872,6 +873,8 @@
input:active,
input:focus,
textarea:active,
textarea:focus,
select:focus,
select:active {
border-color: $theme-color;

22
packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
View File

@ -37,13 +37,13 @@
<label class="switch">
<input
type="checkbox"
class="control"
id="slides"
name="slides"
type="checkbox"
class="control"
data-vv-as="&quot;slides&quot;"
{{ $metaData && $metaData->slider ? 'checked' : ''}} />
<span class="slider round"></span>
</label>
</div>
@ -111,7 +111,11 @@
<div class="control-group">
<label>{{ __('velocity::app.admin.meta-data.advertisement-four') }}</label>
@if(! isset($metaData->advertisement[4]))
@php
$advertisement = json_decode($metaData->get('advertisement')->all()[0]->advertisement, true);
@endphp
@if(! isset($advertisement[4]))
<image-wrapper
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
input-name="images[4]">
@ -119,14 +123,14 @@
@else
<image-wrapper
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
input-name="images[4]" :images='@json($metaData->advertisement[4])'>
input-name="images[4]" :images='@json($advertisement[4])'>
</image-wrapper>
@endif
</div>
<div class="control-group">
<label>{{ __('velocity::app.admin.meta-data.advertisement-three') }}</label>
@if(! isset($metaData->advertisement[3]))
@if(! isset($advertisement[3]))
<image-wrapper
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
input-name="images[3]">
@ -134,7 +138,7 @@
@else
<image-wrapper
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
input-name="images[3]" :images='@json($metaData->advertisement[3])'>
input-name="images[3]" :images='@json($advertisement[3])'>
</image-wrapper>
@endif
</div>
@ -142,7 +146,7 @@
<div class="control-group">
<label>{{ __('velocity::app.admin.meta-data.advertisement-two') }}</label>
@if(! isset($metaData->advertisement[2]))
@if(! isset($advertisement[2]))
<image-wrapper
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
input-name="images[2]">
@ -150,7 +154,7 @@
@else
<image-wrapper
:button-label="'{{ __('velocity::app.admin.meta-data.add-image-btn-title') }}'"
input-name="images[2]" :images='@json($metaData->advertisement[2])'>
input-name="images[2]" :images='@json($advertisement[2])'>
</image-wrapper>
@endif
</div>

9
packages/Webkul/Velocity/src/Resources/views/shop/customers/account/index.blade.php
View File

@ -15,7 +15,14 @@
@push('scripts')
<script>
$(document).ready(function() {
let height = $('.customer-sidebar').css('height');
let sidebarHeight = $('.customer-sidebar').css('height');
let contentHeight = $('.account-layout').css('height');
sidebarHeight = parseInt(sidebarHeight.substring(0, sidebarHeight.length - 2));
contentHeight = parseInt(contentHeight.substring(0, contentHeight.length - 2));
let height = sidebarHeight > contentHeight ? sidebarHeight + 30 : contentHeight;
height = height + "px";
$('.account-content').css('height', height);
});

3
packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/locale-currency.blade.php
View File

@ -28,10 +28,9 @@
@if (count(core()->getCurrentChannel()->locales) == 1)
disabled="disabled"
@endif>
@foreach (core()->getCurrentChannel()->locales as $locale)
@if (isset($serachQuery))
@dd(app()->getLocale());
<option
value="?{{ $serachQuery }}&locale={{ $locale->code }}"
{{ $locale->code == app()->getLocale() ? 'selected' : '' }}>