From 86b65adf7e7d7e05d8b5b89135e74a15d01ebe3d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 14 Jul 2016 17:49:29 +0530 Subject: [PATCH] hide toggle-sidebar on single_column --- frappe/desk/page/modules/modules.js | 1 + frappe/public/css/docs.css | 12 ++++++------ frappe/public/css/mobile.css | 7 +++++++ frappe/public/css/navbar.css | 12 ++++++------ frappe/public/js/frappe/ui/toolbar/navbar.html | 4 ++-- frappe/public/less/mobile.less | 9 +++++++++ frappe/public/less/navbar.less | 2 +- 7 files changed, 32 insertions(+), 15 deletions(-) diff --git a/frappe/desk/page/modules/modules.js b/frappe/desk/page/modules/modules.js index 46ffde84dc..0eb4e0f5f0 100644 --- a/frappe/desk/page/modules/modules.js +++ b/frappe/desk/page/modules/modules.js @@ -140,6 +140,7 @@ frappe.pages['modules'].on_page_load = function(wrapper) { frappe.pages['modules'].on_page_show = function(wrapper) { var route = frappe.get_route(); + $("body").attr("data-sidebar", 1); if(route.length > 1) { // activate section based on route frappe.modules_page.activate_link( diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index 57a9c4bf73..8c47d38318 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -185,21 +185,21 @@ body { width: 60% !important; } } -#searchModal .modal-dialog, -#searchModal .modal-content { +#search-modal .modal-dialog, +#search-modal .modal-content { background: transparent; } -#searchModal .modal-header { +#search-modal .modal-header { background: #fff; display: table; width: 100%; } -#searchModal .modal-header form, -#searchModal .modal-header button { +#search-modal .modal-header form, +#search-modal .modal-header button { display: table-cell; vertical-align: middle; } -#searchModal .modal-header button { +#search-modal .modal-header button { height: 30px; } .dropdown-navbar-new-comments > a { diff --git a/frappe/public/css/mobile.css b/frappe/public/css/mobile.css index 294e04b158..57e4e1a511 100644 --- a/frappe/public/css/mobile.css +++ b/frappe/public/css/mobile.css @@ -293,6 +293,13 @@ body { body[data-route="desktop"] .toggle-sidebar { display: none !important; } + body[data-sidebar="0"] .toggle-sidebar { + display: none !important; + } + body[data-sidebar="0"] #navbar-breadcrumbs, + body[data-sidebar="0"] .navbar-home { + margin-left: 15px !important; + } .linked-with-dialog { width: 100% !important; } diff --git a/frappe/public/css/navbar.css b/frappe/public/css/navbar.css index bbe20e52a3..a702a41207 100644 --- a/frappe/public/css/navbar.css +++ b/frappe/public/css/navbar.css @@ -51,21 +51,21 @@ width: 60% !important; } } -#searchModal .modal-dialog, -#searchModal .modal-content { +#search-modal .modal-dialog, +#search-modal .modal-content { background: transparent; } -#searchModal .modal-header { +#search-modal .modal-header { background: #fff; display: table; width: 100%; } -#searchModal .modal-header form, -#searchModal .modal-header button { +#search-modal .modal-header form, +#search-modal .modal-header button { display: table-cell; vertical-align: middle; } -#searchModal .modal-header button { +#search-modal .modal-header button { height: 30px; } .dropdown-navbar-new-comments > a { diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html index 57d166be28..6aae9b6189 100644 --- a/frappe/public/js/frappe/ui/toolbar/navbar.html +++ b/frappe/public/js/frappe/ui/toolbar/navbar.html @@ -12,7 +12,7 @@ -