From 0f6e2c38eea1b111ff891d6847dd47e49b3e6655 Mon Sep 17 00:00:00 2001 From: Stephen Cameron Date: Mon, 9 Sep 2019 17:47:14 +0200 Subject: [PATCH] Done #3018 --- app/Http/Controllers/AjaxController.php | 3 +- package.json | 4 +-- resources/js/app.js | 6 ++-- resources/js/components/Search.vue | 39 +++++++++++++---------- resources/styles/components/cart.styl | 11 +++++-- resources/styles/components/header.styl | 31 ++++++++++-------- resources/views/partials/header.blade.php | 32 ++++++++++--------- yarn.lock | 9 +++++- 8 files changed, 78 insertions(+), 57 deletions(-) diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php index 66134db..67b2f84 100644 --- a/app/Http/Controllers/AjaxController.php +++ b/app/Http/Controllers/AjaxController.php @@ -152,9 +152,10 @@ class AjaxController extends CubistFrontController $cart_items[$id] += $quantity; } else { $cart_items[$id] = $quantity; - $needs_update = true; } $ga['add'][$id] = $quantity; + + $needs_update = true; break; case 'update': diff --git a/package.json b/package.json index d5383c7..8226e86 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,5 @@ "vue-slider-component": "^3.0.40", "vue-template-compiler": "^2.6.10" }, - "dependencies": { - - } + "dependencies": {} } diff --git a/resources/js/app.js b/resources/js/app.js index 8bc68f4..6c8f2ae 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -137,12 +137,10 @@ function checkScroll() { window.headerHeight = 134; var scroll = getBodyScrollTop(); if (scroll > 200) { - document.getElementById('site-header').classList.add('minimized'); - document.getElementById('mobile-menu-icon').classList.add('minimized'); + document.body.classList.add('header-minimized'); window.headerHeight = 60; } else { - document.getElementById('site-header').classList.remove('minimized'); - document.getElementById('mobile-menu-icon').classList.remove('minimized'); + document.body.classList.remove('header-minimized'); } document.querySelector('html').style.setProperty('--header-height', window.headerHeight + 'px'); } diff --git a/resources/js/components/Search.vue b/resources/js/components/Search.vue index cb1fd1d..fdbe839 100644 --- a/resources/js/components/Search.vue +++ b/resources/js/components/Search.vue @@ -1,24 +1,29 @@ diff --git a/resources/styles/components/cart.styl b/resources/styles/components/cart.styl index ef7c770..fec5bce 100644 --- a/resources/styles/components/cart.styl +++ b/resources/styles/components/cart.styl @@ -38,12 +38,19 @@ &-title background-color: #314D6E - height: 134px // Todo: handle this when header is smaller (on scroll down) + height: var(--header-height) + transition: height var(--transition-duration) &-content - max-height: calc(100vh - 134px - 120px) + // Fill available height if needed. Footer of popout is 139px tall + max-height: calc(100vh - var(--header-height) - 139px) + transition: max-height var(--transition-duration) overflow-y: auto + &-footer + @apply bg-grey-100 p-10 + + // Show cart popout when .cart-open is applied to body .cart-open .cart-header-popout diff --git a/resources/styles/components/header.styl b/resources/styles/components/header.styl index 6d6c2b2..9c1f446 100644 --- a/resources/styles/components/header.styl +++ b/resources/styles/components/header.styl @@ -1,30 +1,33 @@ +$header-height = 134px + #header-placeholder - height 134px + height: $header-height .template-home & background-color:theme('colors.navy') .site-header - --transition-duration 500ms + --transition-duration: 500ms + @apply bg-navy text-white text-lg font-display font-medium antialiased fixed top-0 - transition height var(--transition-duration) - width 100% - z-index 100 - height 134px + transition: height var(--transition-duration) + width: 100% + z-index: 100 + height: $header-height .container - transition padding-top var(--transition-duration), padding-bottom var(--transition-duration) + transition: padding-top var(--transition-duration), padding-bottom var(--transition-duration) .nav height: 67px - transition height var(--transition-duration) + transition: height var(--transition-duration) .logo - height 70px - transition height var(--transition-duration) + height: 70px + transition: height var(--transition-duration) img - height 70px - transition height var(--transition-duration) + height: 70px + transition: height var(--transition-duration) +below($breakpoint-menu) .logo @@ -33,7 +36,8 @@ .nav display: none - &.minimized + //=== Mini header + .header-minimized & height: 60px .container @@ -48,4 +52,3 @@ img height: 44px - diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index 19fc2a1..84abc7d 100644 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -16,8 +16,19 @@ @if (config('features.quote')) @@ -28,7 +39,7 @@
-
+
{{ __('Ma sélection') }} @@ -43,7 +54,7 @@ {{ __("Vous n'avez encore rien sélectionné") }}
-
+
{{ __('Obtenir un devis') }} @@ -53,15 +64,6 @@
- + -@if(config('features.search')) - - - - -@endif + diff --git a/yarn.lock b/yarn.lock index 247ce11..1d4a81d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5248,7 +5248,7 @@ pkg-dir@^3.0.0: dependencies: find-up "^3.0.0" -popper.js@^1.12: +popper.js@^1.12, popper.js@^1.14.7: version "1.15.0" resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2" integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA== @@ -6974,6 +6974,13 @@ timsort@^0.3.0: resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= +tippy.js@^4.3.5: + version "4.3.5" + resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.3.5.tgz#882bff8d92f09bb0546d2826d5668c0560006f54" + integrity sha512-NDq3efte8nGK6BOJ1dDN1/WelAwfmh3UtIYXXck6+SxLzbIQNZE/cmRSnwScZ/FyiKdIcvFHvYUgqmoGx8CcyA== + dependencies: + popper.js "^1.14.7" + to-array@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" -- 2.39.5