diff --git a/build/css/site.css b/build/css/site.css index 884e7ed9..8e70b88d 100644 --- a/build/css/site.css +++ b/build/css/site.css @@ -224,6 +224,10 @@ div.megamenu ul.megamenu li.megamenu.level1 color: #335012!important; } +.filters-width { + width: 192px; +} + @font-face { font-family: 'noto_sanscondensed'; src: url('/fonts/notosans-condensed/notosans-condensed-webfont.eot'); diff --git a/resources/views/Shop/Articles/partials/article.blade.php b/resources/views/Shop/Articles/partials/article.blade.php index 04db5939..78dff5be 100644 --- a/resources/views/Shop/Articles/partials/article.blade.php +++ b/resources/views/Shop/Articles/partials/article.blade.php @@ -1,17 +1,17 @@ -
+
{{ $product_name }}
-
- +
{{ $article['parent_name'] }}
{{ $article['product_name'] }}
@include('Shop.Articles.partials.article_' . $product_type) +
diff --git a/resources/views/Shop/Shelves/partials/display-type.blade.php b/resources/views/Shop/Shelves/partials/display-type.blade.php new file mode 100644 index 00000000..7f1910c9 --- /dev/null +++ b/resources/views/Shop/Shelves/partials/display-type.blade.php @@ -0,0 +1,15 @@ +@include('components.form.button', [ + 'id' => 'by_cards', + 'icon' => 'fa-th', + 'style' => ($display_by_rows ?? false) ? ' font-size: x-small;' : '', + 'class' => 'btn-secondary', + 'title' => 'Vue par vignettes', +]) + +@include('components.form.button', [ + 'id' => 'by_rows', + 'icon' => 'fa-list', + 'style' => (!$display_by_rows ?? true) ? ' font-size: x-small;' : '', + 'class' => 'btn-secondary', + 'title' => 'Vue par lignes', +]) diff --git a/resources/views/Shop/Shelves/shelve.blade.php b/resources/views/Shop/Shelves/shelve.blade.php index 408b2c42..7c9e80b4 100644 --- a/resources/views/Shop/Shelves/shelve.blade.php +++ b/resources/views/Shop/Shelves/shelve.blade.php @@ -10,13 +10,18 @@
+
+ @include('Shop.Shelves.partials.breadcrumb') +
+
+ @include('Shop.Shelves.partials.display-type') +
+
+
@include('Shop._partials.display_filters')
-
- @include('Shop.Shelves.partials.breadcrumb') -
-
+
@include('Shop.Shelves.partials.category_add')
diff --git a/resources/views/Shop/Tags/partials/filter.blade.php b/resources/views/Shop/Tags/partials/filter.blade.php index c46255e5..2ac81143 100644 --- a/resources/views/Shop/Tags/partials/filter.blade.php +++ b/resources/views/Shop/Tags/partials/filter.blade.php @@ -42,6 +42,8 @@ $('#sidebar').toggleClass('d-none'); $('#filter-on').toggleClass('d-none'); $('#filter-off').toggleClass('d-none'); + $('#filter-off-text').toggleClass('d-none'); + $('#filters').toggleClass('filters-width'); }); $('.filter_tags input').change(function() { $('#category-form').submit(); diff --git a/resources/views/Shop/_partials/display_filters.blade.php b/resources/views/Shop/_partials/display_filters.blade.php index 10e59f19..0d41281d 100644 --- a/resources/views/Shop/_partials/display_filters.blade.php +++ b/resources/views/Shop/_partials/display_filters.blade.php @@ -1,5 +1,5 @@ @if (!($no_filter ?? false)) - @endif - -@if ($display_by_rows ?? false) - @include('components.form.button', [ - 'id' => 'by_cards', - 'icon' => 'fa-th', - 'class' => 'btn-secondary', - 'title' => 'Vue par vignettes', - ]) -@else - @include('components.form.button', [ - 'id' => 'by_rows', - 'icon' => 'fa-list', - 'class' => 'btn-secondary', - 'title' => 'Vue par lignes', - ]) -@endif - diff --git a/resources/views/Shop/layout/partials/megamenu.blade.php b/resources/views/Shop/layout/partials/megamenu.blade.php index 6bdea402..1dd7e071 100644 --- a/resources/views/Shop/layout/partials/megamenu.blade.php +++ b/resources/views/Shop/layout/partials/megamenu.blade.php @@ -26,17 +26,17 @@
@for ($i = 0; $i < count($submenu[3]); $i++) - @include('Shop.layout.partials.megamenu_leafs', ['menu_children' => $submenu[2][$i]]) + @include('Shop.layout.partials.megamenu_leafs', ['menu_children' => $submenu[3][$i]]) @endfor
@for ($i = 0; $i < count($submenu[4]); $i++) - @include('Shop.layout.partials.megamenu_leafs', ['menu_children' => $submenu[2][$i]]) + @include('Shop.layout.partials.megamenu_leafs', ['menu_children' => $submenu[4][$i]]) @endfor
@for ($i = 0; $i < count($submenu[5]); $i++) - @include('Shop.layout.partials.megamenu_leafs', ['menu_children' => $submenu[2][$i]]) + @include('Shop.layout.partials.megamenu_leafs', ['menu_children' => $submenu[5][$i]]) @endfor
diff --git a/resources/views/components/form/button.blade.php b/resources/views/components/form/button.blade.php index 20a6ae24..7b29c834 100644 --- a/resources/views/components/form/button.blade.php +++ b/resources/views/components/form/button.blade.php @@ -1,5 +1,6 @@