Browse Source

hide toggle-sidebar on single_column

version-14
Faris Ansari 9 years ago
parent
commit
86b65adf7e
7 changed files with 32 additions and 15 deletions
  1. +1
    -0
      frappe/desk/page/modules/modules.js
  2. +6
    -6
      frappe/public/css/docs.css
  3. +7
    -0
      frappe/public/css/mobile.css
  4. +6
    -6
      frappe/public/css/navbar.css
  5. +2
    -2
      frappe/public/js/frappe/ui/toolbar/navbar.html
  6. +9
    -0
      frappe/public/less/mobile.less
  7. +1
    -1
      frappe/public/less/navbar.less

+ 1
- 0
frappe/desk/page/modules/modules.js View File

@@ -140,6 +140,7 @@ frappe.pages['modules'].on_page_load = function(wrapper) {


frappe.pages['modules'].on_page_show = function(wrapper) { frappe.pages['modules'].on_page_show = function(wrapper) {
var route = frappe.get_route(); var route = frappe.get_route();
$("body").attr("data-sidebar", 1);
if(route.length > 1) { if(route.length > 1) {
// activate section based on route // activate section based on route
frappe.modules_page.activate_link( frappe.modules_page.activate_link(


+ 6
- 6
frappe/public/css/docs.css View File

@@ -185,21 +185,21 @@ body {
width: 60% !important; width: 60% !important;
} }
} }
#searchModal .modal-dialog,
#searchModal .modal-content {
#search-modal .modal-dialog,
#search-modal .modal-content {
background: transparent; background: transparent;
} }
#searchModal .modal-header {
#search-modal .modal-header {
background: #fff; background: #fff;
display: table; display: table;
width: 100%; width: 100%;
} }
#searchModal .modal-header form,
#searchModal .modal-header button {
#search-modal .modal-header form,
#search-modal .modal-header button {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
} }
#searchModal .modal-header button {
#search-modal .modal-header button {
height: 30px; height: 30px;
} }
.dropdown-navbar-new-comments > a { .dropdown-navbar-new-comments > a {


+ 7
- 0
frappe/public/css/mobile.css View File

@@ -293,6 +293,13 @@ body {
body[data-route="desktop"] .toggle-sidebar { body[data-route="desktop"] .toggle-sidebar {
display: none !important; 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 { .linked-with-dialog {
width: 100% !important; width: 100% !important;
} }


+ 6
- 6
frappe/public/css/navbar.css View File

@@ -51,21 +51,21 @@
width: 60% !important; width: 60% !important;
} }
} }
#searchModal .modal-dialog,
#searchModal .modal-content {
#search-modal .modal-dialog,
#search-modal .modal-content {
background: transparent; background: transparent;
} }
#searchModal .modal-header {
#search-modal .modal-header {
background: #fff; background: #fff;
display: table; display: table;
width: 100%; width: 100%;
} }
#searchModal .modal-header form,
#searchModal .modal-header button {
#search-modal .modal-header form,
#search-modal .modal-header button {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
} }
#searchModal .modal-header button {
#search-modal .modal-header button {
height: 30px; height: 30px;
} }
.dropdown-navbar-new-comments > a { .dropdown-navbar-new-comments > a {


+ 2
- 2
frappe/public/js/frappe/ui/toolbar/navbar.html View File

@@ -12,7 +12,7 @@


<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="visible-xs"> <li class="visible-xs">
<a class="navbar-search-button" href="#" data-toggle="modal" data-target="#searchModal"><i class="octicon octicon-search"></i></a>
<a class="navbar-search-button" href="#" data-toggle="modal" data-target="#search-modal"><i class="octicon octicon-search"></i></a>
</li> </li>
<li class="dropdown dropdown-navbar-user"> <li class="dropdown dropdown-navbar-user">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" <a class="dropdown-toggle" data-toggle="dropdown" href="#"
@@ -53,7 +53,7 @@
</li> </li>
</ul> </ul>


<div id="searchModal" class="modal fade" role="dialog">
<div id="search-modal" class="modal fade" role="dialog">
<div class="modal-dialog" style="height: 50px;"> <div class="modal-dialog" style="height: 50px;">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">


+ 9
- 0
frappe/public/less/mobile.less View File

@@ -208,6 +208,15 @@
} }
} }


body[data-sidebar="0"] {
.toggle-sidebar {
display: none !important;
}
#navbar-breadcrumbs, .navbar-home {
margin-left: 15px !important;
}
}

.linked-with-dialog { .linked-with-dialog {
width: 100% !important; width: 100% !important;
} }


+ 1
- 1
frappe/public/less/navbar.less View File

@@ -63,7 +63,7 @@
} }
} }


#searchModal {
#search-modal {
.modal-dialog, .modal-content { .modal-dialog, .modal-content {
background: transparent; background: transparent;
} }


Loading…
Cancel
Save