Compare commits
3 Commits
1.0.0-rc.7
...
1.0.0-rc.8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ec13e802e | ||
|
|
ebdf0c0d8e | ||
|
|
22ebcb102f |
@@ -57,6 +57,7 @@ RUN chmod +x artisan
|
|||||||
RUN ./artisan vendor:publish --tag=public --force ## creates public/vendor/jsvalidation
|
RUN ./artisan vendor:publish --tag=public --force ## creates public/vendor/jsvalidation
|
||||||
RUN ./artisan vendor:publish --tag=boilerplate-public --force --ansi ## creates public/vendor/boilerplate
|
RUN ./artisan vendor:publish --tag=boilerplate-public --force --ansi ## creates public/vendor/boilerplate
|
||||||
RUN ./artisan vendor:publish --tag=datatables-buttons --force --ansi ## creates public/vendor/datatables/buttons
|
RUN ./artisan vendor:publish --tag=datatables-buttons --force --ansi ## creates public/vendor/datatables/buttons
|
||||||
|
RUN ./artisan vendor:publish --tag=lfm_public --force --ansi
|
||||||
|
|
||||||
## XXXvlab: 2025-09-25 these migration files are breaking first
|
## XXXvlab: 2025-09-25 these migration files are breaking first
|
||||||
## install, but we had to resolve to not install from scratch and use
|
## install, but we had to resolve to not install from scratch and use
|
||||||
|
|||||||
@@ -348,4 +348,31 @@ div.megamenu ul.megamenu li.megamenu.level1
|
|||||||
.dropdown-menu > li:hover > .submenu{
|
.dropdown-menu > li:hover > .submenu{
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media (max-width: 991.98px){
|
||||||
|
#navbarContentMobile .navbar-nav {
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
#navbarContentMobile .navbar-nav .col {
|
||||||
|
flex: 0 0 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
#navbarContentMobile .dropdown-menu {
|
||||||
|
display: block;
|
||||||
|
position: static;
|
||||||
|
float: none;
|
||||||
|
box-shadow: none;
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
#navbarContentMobile .dropdown-toggle::after {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
#navbarContentMobile .dropdown-menu .container,
|
||||||
|
#navbarContentMobile .dropdown-menu .row {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
#navbarContentMobile .dropdown-menu .shadow {
|
||||||
|
box-shadow: none !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -32,12 +32,14 @@ $(document).on('click', '.dropdown-menu', function (e) {
|
|||||||
// make it as accordion for smaller screens
|
// make it as accordion for smaller screens
|
||||||
if ($(window).width() < 992) {
|
if ($(window).width() < 992) {
|
||||||
$('.dropdown-menu a').click(function(e) {
|
$('.dropdown-menu a').click(function(e) {
|
||||||
e.preventDefault();
|
var $submenu = $(this).next('.submenu');
|
||||||
if ($(this).next('.submenu').length) {
|
if ($submenu.length) {
|
||||||
$(this).next('.submenu').toggle();
|
e.preventDefault();
|
||||||
|
$submenu.toggle();
|
||||||
}
|
}
|
||||||
$('.dropdown').on('hide.bs.dropdown', function () {
|
});
|
||||||
$(this).find('.submenu').hide();
|
|
||||||
});
|
$('.dropdown').on('hide.bs.dropdown', function () {
|
||||||
|
$(this).find('.submenu').hide();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,28 @@
|
|||||||
<div class="row bg-light">
|
<div class="row bg-light align-items-center">
|
||||||
|
|
||||||
<div class="col-sm-12 col-lg-5">
|
<div class="col-6 col-lg-5 d-flex align-items-center">
|
||||||
<a href="/"><img src="/img/logo.png" height="52" alt="Jardin'Envie"></a>
|
<a href="/"><img src="/img/logo.png" height="52" alt="Jardin'Envie"></a>
|
||||||
<span class="green ml-3">Variétés Paysannes de la Semence à l'Assiette</span>
|
<span class="green ml-3 d-none d-md-inline">Variétés Paysannes de la Semence à l'Assiette</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-sm-12 col-lg-4 pt-2">
|
<div class="col-12 col-lg-4 pt-2 order-3 order-lg-2">
|
||||||
@include('Shop.layout.partials.search')
|
@include('Shop.layout.partials.search')
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-sm-12 col-lg-3 pt-2 text-right">
|
<div class="col-6 col-lg-3 pt-2 text-right order-2 order-lg-3 d-flex justify-content-end align-items-center">
|
||||||
@include('Shop.layout.partials.header-catalog')
|
@include('Shop.layout.partials.header-catalog')
|
||||||
@include('Shop.layout.partials.header-profile')
|
@include('Shop.layout.partials.header-profile')
|
||||||
@include('Shop.layout.partials.header-basket')
|
@include('Shop.layout.partials.header-basket')
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="row d-lg-none bg-green-dark">
|
||||||
|
<div class="col-12 p-0">
|
||||||
|
<div class="collapse" id="navbarContentMobile">
|
||||||
|
<nav class="navbar navbar-dark p-0">
|
||||||
|
@include('Shop.layout.partials.sections-menu-list')
|
||||||
|
</nav>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|||||||
@@ -10,6 +10,13 @@
|
|||||||
<div class="input-group-append">
|
<div class="input-group-append">
|
||||||
<span class="input-group-text"><i class="btn btn-sm fa fa-search"></i></span>
|
<span class="input-group-text"><i class="btn btn-sm fa fa-search"></i></span>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="input-group-append d-lg-none">
|
||||||
|
<button class="navbar-toggler navbar-light" type="button" data-toggle="collapse"
|
||||||
|
data-target="#navbarContentMobile" aria-controls="navbarContentMobile" aria-expanded="false"
|
||||||
|
aria-label="Menu catégories">
|
||||||
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|||||||
@@ -1,27 +1,9 @@
|
|||||||
<div class="row mb-3 bg-green-dark">
|
<div class="row mb-3 bg-green-dark d-none d-lg-block">
|
||||||
<div class="col-12 pl-0 pr-0">
|
<div class="col-12 pl-0 pr-0">
|
||||||
<nav class="navbar navbar-expand-lg p-0">
|
<nav class="navbar navbar-expand-lg navbar-dark p-0">
|
||||||
<div class="collapse navbar-collapse" id="navbarContent">
|
<div class="navbar-collapse show" id="navbarContent">
|
||||||
<ul class="navbar-nav w-100">
|
@include('Shop.layout.partials.sections-menu-list')
|
||||||
@foreach ($categories as $menu)
|
|
||||||
<li class="nav-item dropdown megamenu p-2 col
|
|
||||||
@if (in_array($menu['id'], [$category['id'] ?? false, $category['parent_id'] ?? false, $category['parent']['parent_id'] ?? false])) active @endif">
|
|
||||||
@if ($menu['children'] ?? false)
|
|
||||||
<a id="megamenu_{{ $menu['id'] }}" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle text-uppercase">
|
|
||||||
{{ $menu['name'] }}
|
|
||||||
</a>
|
|
||||||
<div aria-labelledby="megamenu_{{ $menu['id'] }}" class="dropdown-menu border-0 p-0 m-0">
|
|
||||||
@include('Shop.layout.partials.megamenu')
|
|
||||||
</div>
|
|
||||||
@else
|
|
||||||
<a href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" class="nav-link text-uppercase text-white">
|
|
||||||
{{ $menu['name'] }}
|
|
||||||
</a>
|
|
||||||
@endif
|
|
||||||
</li>
|
|
||||||
@endforeach
|
|
||||||
</ul>
|
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
''); // Empty tags
|
''); // Empty tags
|
||||||
},
|
},
|
||||||
skin: "oxide",
|
skin: "oxide",
|
||||||
content_css: 'oxide',
|
content_css: 'default',
|
||||||
language: '{{ App::getLocale() }}',
|
language: '{{ App::getLocale() }}',
|
||||||
file_picker_callback: function(callback, value, meta) {
|
file_picker_callback: function(callback, value, meta) {
|
||||||
var x = window.innerWidth || document.documentElement.clientWidth || document.getElementsByTagName(
|
var x = window.innerWidth || document.documentElement.clientWidth || document.getElementsByTagName(
|
||||||
|
|||||||
Reference in New Issue
Block a user