diff --git a/resources/css/app.css b/resources/css/app.css index 58dd3d261..4bcf8b5cc 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -1,4 +1,5 @@ @import 'components/vue-slider'; +@import 'components/price-slider'; @import './theme-variables.css'; @import './components/pagination.css'; diff --git a/resources/css/components/price-slider.css b/resources/css/components/price-slider.css new file mode 100644 index 000000000..80bcc1364 --- /dev/null +++ b/resources/css/components/price-slider.css @@ -0,0 +1,44 @@ +div.vue-slider { + @apply mt-5 mb-3.5 max-w-sm; +} + +div.vue-slider-process, +div.vue-slider-rail { + @apply h-2 bg-neutral !important; +} + +div.vue-slider-rail { + @apply bg-highlight !important; +} + +div.vue-slider .vue-slider-dot { + @apply size-6 !important; +} + +div.vue-slider-dot-tooltip-inner { + @apply bg-white text-neutral border-border border px-1.5 !important; +} + +span.vue-slider-dot-tooltip-text { + @apply font-medium font-sans text-neutral; +} + +div.vue-slider-dot-tooltip::before { + @apply hidden; +} + +div.vue-slider-dot .vue-slider-dot-handle { + @apply border border-border shadow; +} + +div.vue-slider-tooltip-wrap.vue-slider-tooltip-top { + @apply font-sans; +} + +.price-input { + @apply space-x-3; +} + +.vue-slider-component.vue-slider-horizontal { + @apply mt-5; +} diff --git a/resources/views/components/filter/heading.blade.php b/resources/views/components/filter/heading.blade.php new file mode 100644 index 000000000..b68fab213 --- /dev/null +++ b/resources/views/components/filter/heading.blade.php @@ -0,0 +1,14 @@ + + + +
+
+ {{ $slot }} +
+
diff --git a/resources/views/components/slideover/index.blade.php b/resources/views/components/slideover/index.blade.php index 1c70eccdb..51943796a 100644 --- a/resources/views/components/slideover/index.blade.php +++ b/resources/views/components/slideover/index.blade.php @@ -27,13 +27,13 @@ @if (!$hasParent) - merge(['id' => $id, 'class' => 'peer hidden']) }} v-on:change="toggleScroll($event.target.checked)" type="checkbox"> + @else - merge(['id' => $id, 'class' => 'peer hidden']) }} type="checkbox"> + @endif
class([ 'fixed inset-y-0 transition-all bg-white z-40 flex flex-col max-w-md w-full', diff --git a/resources/views/components/slideover/partials/header.blade.php b/resources/views/components/slideover/partials/header.blade.php index 6a068ed6c..616726c3e 100644 --- a/resources/views/components/slideover/partials/header.blade.php +++ b/resources/views/components/slideover/partials/header.blade.php @@ -13,7 +13,7 @@ {{ $title }} @endif -
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 4807c3666..5dbf346de 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -26,7 +26,7 @@ @config('design/head/includes') -
+
@includeWhen(!request()->is('checkout'), 'rapidez::layouts.partials.header') @includeWhen(request()->is('checkout'), 'rapidez::layouts.checkout.header')
diff --git a/resources/views/listing/partials/filter/boolean.blade.php b/resources/views/listing/partials/filter/boolean.blade.php index ed1534dfc..af036861e 100644 --- a/resources/views/listing/partials/filter/boolean.blade.php +++ b/resources/views/listing/partials/filter/boolean.blade.php @@ -2,23 +2,31 @@ v-else-if="filter.input == 'boolean'" :component-id="filter.code" :data-field="filter.code+(filter.type != 'int' ? '.keyword' : '')" - :inner-class="{ - title: 'capitalize text-sm font-medium text-gray-900', - count: 'text-gray-400', - list: '!max-h-full', - label: 'ml-1 text-sm text-gray-600' - }" - :title="filter.name.replace('_', ' ')" :react="{and: reactiveFilters}" :show-search="false" u-r-l-params > - - - - (@{{ count }}) - + +
    +
  • + +
    + + + (@{{ item.doc_count }}) +
    +
    +
  • +
+
+
diff --git a/resources/views/listing/partials/filter/price.blade.php b/resources/views/listing/partials/filter/price.blade.php index 816e560fa..7e06f394a 100644 --- a/resources/views/listing/partials/filter/price.blade.php +++ b/resources/views/listing/partials/filter/price.blade.php @@ -1,13 +1,16 @@ - +
+ + + + +
diff --git a/resources/views/listing/partials/filter/select.blade.php b/resources/views/listing/partials/filter/select.blade.php index 3d4433fe4..35b3b2d9e 100644 --- a/resources/views/listing/partials/filter/select.blade.php +++ b/resources/views/listing/partials/filter/select.blade.php @@ -3,14 +3,49 @@ :component-id="filter.code" :data-field="filter.code+'.keyword'" :inner-class="{ - title: 'capitalize font-semibold', - count: 'text-gray-400', + count: 'text-inactive', list: '!max-h-full [&>li]:!h-auto', - label: 'text-gray-600 before:shrink-0' + label: 'text-inactive before:shrink-0' }" - :title="filter.name.replace('_', ' ')" :react="{and: filter.input == 'multiselect' ? reactiveFilters : reactiveFilters.filter(item => item != filter.code) }" :query-format="filter.input == 'multiselect' ? 'and' : 'or'" :show-search="false" u-r-l-params -> +> +
+ + +
    +
  • +
    + +
    + @{{ item.key }} + (@{{ item.doc_count }}) +
    +
    +
    +
  • +
  • + +
  • +
+
+
+
+ diff --git a/resources/views/listing/partials/filter/swatch.blade.php b/resources/views/listing/partials/filter/swatch.blade.php index a67700a96..a28c05c56 100644 --- a/resources/views/listing/partials/filter/swatch.blade.php +++ b/resources/views/listing/partials/filter/swatch.blade.php @@ -1,37 +1,38 @@ -
- -
- -
- @{{ $root.swatches[filter.code]?.options[label].swatch }} +
+ +
+ +
+