From ca6eae5794be0019c5e7e2a3860beedd0c3c577f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 22 Aug 2019 12:35:19 +0530 Subject: [PATCH] feat: added sidebar visibility class to body for consistent layout across pages --- frappe/public/js/frappe/list/base_list.js | 11 +++++------ frappe/public/less/desk.less | 12 ++++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index d99ab79a4a..8d5a7b5770 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -3,7 +3,6 @@ frappe.provide('frappe.views'); frappe.views.BaseList = class BaseList { constructor(opts) { Object.assign(this, opts); - this.show_sidebar = JSON.parse(localStorage.show_sidebar || 'true'); } show() { @@ -200,15 +199,15 @@ frappe.views.BaseList = class BaseList { } toggle_side_bar() { - this.show_sidebar = !this.show_sidebar - localStorage.show_sidebar = this.show_sidebar; + let show_sidebar = JSON.parse(localStorage.show_sidebar || 'true'); + show_sidebar = !show_sidebar + localStorage.show_sidebar = show_sidebar; this.show_or_hide_sidebar() } show_or_hide_sidebar() { - this.list_sidebar.parent.toggleClass('hide', !this.show_sidebar); - cur_list.page.current_view.find('.layout-main-section-wrapper').toggleClass('col-md-10', this.show_sidebar) - cur_list.page.current_view.find('.layout-main-section-wrapper').toggleClass('col-md-12', this.show_sidebar) + let show_sidebar = JSON.parse(localStorage.show_sidebar || 'true'); + $(document.body).toggleClass('no-sidebar', !show_sidebar); } setup_main_section() { diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 4c5ca5bba8..5a515b6e84 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -1081,6 +1081,18 @@ body.full-width { } } +body.no-sidebar { + @media (min-width: @screen-md) { + .layout-side-section { + display: none; + } + + .layout-main-section-wrapper { + width: 100% !important; + } + } +} + // utilities .whitespace-nowrap {