From 91b799fd75d824f001d341bc0529c69008d4d073 Mon Sep 17 00:00:00 2001 From: Kutalo Alexey Date: Sun, 5 Aug 2018 00:16:28 -0300 Subject: [PATCH] Show footer and header in all guest pages --- resources/assets/js/custom.js | 2 +- resources/assets/js/layouts/DefaultPage.vue | 1 - resources/assets/js/layouts/GuestFooter.vue | 10 ++--- resources/assets/js/layouts/GuestPage.vue | 18 ++++++++- resources/assets/js/layouts/Header.vue | 40 ++++++++++++------- resources/assets/js/routes.js | 32 ++++++++++----- resources/assets/js/views/auth/Activate.vue | 6 --- resources/assets/js/views/auth/Lock.vue | 6 --- resources/assets/js/views/auth/Login.vue | 30 ++++++-------- resources/assets/js/views/auth/Password.vue | 6 --- resources/assets/js/views/auth/Register.vue | 6 --- resources/assets/js/views/auth/Reset.vue | 6 --- resources/assets/js/views/auth/Security.vue | 6 --- resources/assets/js/views/post/View.vue | 32 +++++++-------- .../plugins/sticky-kit/sticky-kit.min.js | 10 ----- resources/assets/sass/app.scss | 22 ++++++++-- resources/assets/sass/responsive.scss | 5 ++- webpack.mix.js | 1 - 18 files changed, 117 insertions(+), 122 deletions(-) delete mode 100755 resources/assets/plugins/sticky-kit/sticky-kit.min.js diff --git a/resources/assets/js/custom.js b/resources/assets/js/custom.js index 4dd96ef..e5e2ef6 100755 --- a/resources/assets/js/custom.js +++ b/resources/assets/js/custom.js @@ -51,7 +51,7 @@ $(function () { $('.navbar-brand span').hide(); } }); - $(".fix-header .topbar").stick_in_parent(); + $(document).on('click', ".nav-toggler", function () { $("body").toggleClass("show-sidebar"); }); diff --git a/resources/assets/js/layouts/DefaultPage.vue b/resources/assets/js/layouts/DefaultPage.vue index c4eb048..fe0fb1a 100755 --- a/resources/assets/js/layouts/DefaultPage.vue +++ b/resources/assets/js/layouts/DefaultPage.vue @@ -26,7 +26,6 @@ mounted() { helper.notification(); $('body').addClass("card-no-border").trigger("resize"); - $(".fix-header .topbar").stick_in_parent(); $(".scroll-sidebar, .slimScrollDiv").css("overflow-x", "visible").parent().css("overflow", "visible"); $('#sidebarnav').metisMenu(); $('.scroll-sidebar').slimScroll({ diff --git a/resources/assets/js/layouts/GuestFooter.vue b/resources/assets/js/layouts/GuestFooter.vue index 2f66865..5036290 100755 --- a/resources/assets/js/layouts/GuestFooter.vue +++ b/resources/assets/js/layouts/GuestFooter.vue @@ -1,9 +1,7 @@ \ No newline at end of file + diff --git a/resources/assets/js/layouts/GuestPage.vue b/resources/assets/js/layouts/GuestPage.vue index a0f22c6..2d8c6fd 100755 --- a/resources/assets/js/layouts/GuestPage.vue +++ b/resources/assets/js/layouts/GuestPage.vue @@ -1,11 +1,25 @@