Merge branch 'prashant' of https://github.com/bagisto/bagisto into rahul

This commit is contained in:
rahul shukla 2018-10-29 13:06:20 +05:30
commit bcabb00e9a
2 changed files with 2 additions and 5 deletions

View File

@ -15,8 +15,8 @@
<ul class="search-container">
<li class="search-group">
<form role="search" action="{{ route('shop.search.index') }}" method="GET" @submit.prevent="onSubmit" style="display: inherit;">
<input type="search" name="term" class="search-field" placeholder="products, categories" v-validate="'required'">
<form role="search" action="{{ route('shop.search.index') }}" method="GET" style="display: inherit;">
<input type="search" name="term" class="search-field" placeholder="products, categories" required>
<div class="search-icon-wrapper">
<button class="icon icon-search" class="background: none;"></button>

View File

@ -55,9 +55,6 @@
window.flashMessages = [{'type': 'alert-success', 'message': "{{ $success }}" }];
@elseif($warning = session('warning'))
window.flashMessages = [{'type': 'alert-warning', 'message': "{{ $warning }}" }];
@elseif($warning = session('info'))
window.flashMessages = [{'type': 'alert-info', 'message': "{{ $info }}" }
];
@elseif($error = session('error'))
window.flashMessages = [{'type': 'alert-error', 'message': "{{ $error }}" }
];