From 5a582da41736cdfc67d365e2edca6c1063903ec0 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Mon, 1 Oct 2018 13:19:04 +0530 Subject: [PATCH] responsive --- .../Shop/src/Providers/ComposerServiceProvider.php | 2 +- .../Webkul/Shop/src/Resources/assets/sass/app.scss | 9 +++++++++ .../src/Resources/views/layouts/header/index.blade.php | 7 +++++-- .../Shop/src/Resources/views/layouts/master.blade.php | 4 ++++ public/themes/default/assets/css/shop.css | 10 ++++++++++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php b/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php index 1fb2ebf9d..c3838140f 100644 --- a/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php +++ b/packages/Webkul/Shop/src/Providers/ComposerServiceProvider.php @@ -17,7 +17,7 @@ class ComposerServiceProvider extends ServiceProvider public function boot() { //using the class based composers... - View::composer(['shop::layouts.header.index', 'shop::layouts.footer'], 'Webkul\Shop\Http\ViewComposers\Categories\CategoryComposer'); + View::composer(['shop::layouts.header.index', 'shop::layouts.footer','shop::layouts.master'], 'Webkul\Shop\Http\ViewComposers\Categories\CategoryComposer'); } /** diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index b6d994808..d253c216e 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -344,6 +344,15 @@ body { } } +.nav-responsive { + position: fixed; + display: none; + width: 100%; + height: 100%; + top: 0; + background:white; + margin-top: 60px; +} // header page responsive css start here diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index 36a7294a1..3be3c2436 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -145,6 +145,7 @@ var search = document.getElementById("search"); var searchSuggestion = document.getElementsByClassName('search-suggestion')[0]; var headerBottom = document.getElementsByClassName('header-bottom')[0]; + var nav= document.getElementsByClassName('nav-responsive')[0]; search.addEventListener("click", header); hamMenu.addEventListener("click", header); @@ -167,11 +168,12 @@ search.classList.add("cross-icon"); searchSuggestion.style.display = 'block'; document.body.style.overflow = 'hidden'; + nav.style.display = 'none'; }else if(className === 'icon sortable-icon'){ hamMenu.classList.remove("sortable-icon"); hamMenu.classList.add("cross-icon"); - - headerBottom.style.display = 'block'; + searchSuggestion.style.display = 'none'; + nav.style.display = 'block'; document.body.style.overflow = 'hidden'; }else{ search.classList.remove("cross-icon"); @@ -179,6 +181,7 @@ hamMenu.classList.remove("cross-icon"); hamMenu.classList.add("sortable-icon"); searchSuggestion.style.display = 'none'; + nav.style.display = 'none'; document.body.style.overflow = "scroll"; } diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php index 9293008d0..97c9c4e66 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/master.blade.php @@ -55,6 +55,10 @@ + + @include('shop::layouts.footer') diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index c431917d7..963857558 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -473,6 +473,16 @@ body { margin-left: 52px; } +.nav-responsive { + position: fixed; + display: none; + width: 100%; + height: 100%; + top: 0; + background: white; + margin-top: 60px; +} + @media only screen and (max-width: 770px) { .header .header-top div.left-content ul.search-container li.search-group { display: none;