Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

misc. velocity theme updates #2809

Merged
merged 3 commits into from
Apr 1, 2020
Merged

misc. velocity theme updates #2809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0005241
misc. updates
shubh-mehrotra Mar 30, 2020
2bd1458
Merge branch 'master' of https://github.com/bagisto/bagisto into patch-1
shubh-mehrotra Mar 30, 2020
dd88a81
remove line
shubh-mehrotra Apr 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Velocity/publishable/assets/css/velocity.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 4 additions & 1 deletion packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,8 @@
}

input,
select {
select,
textarea {
width: 100%;
resize: none;
font-size: 16px;
Expand All @@ -872,6 +873,8 @@

input:active,
input:focus,
textarea:active,
textarea:focus,
select:focus,
select:active {
border-color: $theme-color;
Expand Down
22 changes: 13 additions & 9 deletions packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -111,46 +111,50 @@ class="control"
<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]">
</image-wrapper>
@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]">
</image-wrapper>
@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>

<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]">
</image-wrapper>
@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>
Expand Down
9 changes: 8 additions & 1 deletion packages/Webkul/Velocity/src/Resources/views/shop/customers/account/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down
3 changes: 1 addition & 2 deletions packages/Webkul/Velocity/src/Resources/views/shop/layouts/top-nav/locale-currency.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@ class="btn btn-link dropdown-toggle control locale-switcher styled-select"
@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' : '' }}>
Expand Down