From 9f6667a3b7a320b67331f201b4702ec207ccb17f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 21 Jan 2015 13:48:44 +0530 Subject: [PATCH] [design] semi-transparent navbar-default --- frappe/public/css/bootstrap.css | 12 ++++++------ frappe/public/css/desktop.css | 3 ++- frappe/public/css/navbar.css | 3 ++- frappe/public/js/frappe/router.js | 3 +++ frappe/public/less/desktop.less | 3 ++- frappe/public/less/navbar.less | 3 ++- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/frappe/public/css/bootstrap.css b/frappe/public/css/bootstrap.css index c05e2f2432..ca80d3bd63 100644 --- a/frappe/public/css/bootstrap.css +++ b/frappe/public/css/bootstrap.css @@ -4372,8 +4372,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } } .navbar-default { - background-color: #f5f7fa; - border-color: #ebeff2; + background-color: rgba(241, 244, 248, .7); + border-color: rgba(231, 236, 239, .7); } .navbar-default .navbar-brand { color: #6c7680; @@ -4398,7 +4398,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { color: #555; - background-color: #dfe5ef; + background-color: rgba(219, 227, 237, .7); } .navbar-default .navbar-nav > .disabled > a, .navbar-default .navbar-nav > .disabled > a:hover, @@ -4418,13 +4418,13 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .navbar-default .navbar-collapse, .navbar-default .navbar-form { - border-color: #ebeff2; + border-color: rgba(231, 236, 239, .7); } .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { color: #555; - background-color: #dfe5ef; + background-color: rgba(219, 227, 237, .7); } @media (max-width: 767px) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { @@ -4439,7 +4439,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus { color: #555; - background-color: #dfe5ef; + background-color: rgba(219, 227, 237, .7); } .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a, .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover, diff --git a/frappe/public/css/desktop.css b/frappe/public/css/desktop.css index 192f0bedac..b9df5feb0b 100644 --- a/frappe/public/css/desktop.css +++ b/frappe/public/css/desktop.css @@ -1,6 +1,7 @@ #page-desktop { min-width: 100%; - padding-top: 40px; + padding-top: 80px; + margin-top: 0px; border: 0px; position: absolute; top: 0; diff --git a/frappe/public/css/navbar.css b/frappe/public/css/navbar.css index 2826501488..f67d2ac6c0 100644 --- a/frappe/public/css/navbar.css +++ b/frappe/public/css/navbar.css @@ -14,7 +14,7 @@ margin-top: 10px; } .navbar .breadcrumb-divider i { - color: #9d9d9d; + color: #C0C9D2; } .navbar-icon-home { vertical-align: middle; @@ -45,6 +45,7 @@ } #navbar-search { width: 300px; + background-color: rgba(255, 255, 255, 0.9); } .navbar .navbar-search-icon { color: #6c7680; diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 1ebabdcac9..a34707dfc9 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -47,6 +47,9 @@ frappe.route = function() { if(frappe.route_titles[window.location.hash]) { document.title = frappe.route_titles[window.location.hash]; } + + // collapse offcanvas sidebars! + $(".offcanvas").removeClass("active-left active-right"); } frappe.get_route = function(route) { diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less index 895e82f461..c75256c87a 100644 --- a/frappe/public/less/desktop.less +++ b/frappe/public/less/desktop.less @@ -5,7 +5,8 @@ #page-desktop { min-width: 100%; - padding-top: 40px; + padding-top: 80px; + margin-top: 0px; border: 0px; position: absolute; top: 0; diff --git a/frappe/public/less/navbar.less b/frappe/public/less/navbar.less index 8227485b07..c400e04ced 100644 --- a/frappe/public/less/navbar.less +++ b/frappe/public/less/navbar.less @@ -20,7 +20,7 @@ } .navbar .breadcrumb-divider i { - color: @navbar-inverse-color; + color: #C0C9D2; } .navbar-icon-home { @@ -55,6 +55,7 @@ #navbar-search { width: 300px; + background-color: rgba(255, 255, 255, 0.9); } .navbar .navbar-search-icon {