From 1391bac6d6530f7b235354dfff874a6151c5ab9d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 22 Sep 2016 12:11:17 +0530 Subject: [PATCH 1/2] [ui][fix] notification indicator bg grey --- frappe/public/css/docs.css | 2 +- frappe/public/css/navbar.css | 2 +- frappe/public/less/navbar.less | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css index b9df6826ca..257506c5af 100644 --- a/frappe/public/css/docs.css +++ b/frappe/public/css/docs.css @@ -126,7 +126,7 @@ color: #fff; text-align: center; padding: 2px 5px; - background-color: #98d85b; + background-color: #b8c2cc; } .navbar-new-comments-true { background-color: #ff5858; diff --git a/frappe/public/css/navbar.css b/frappe/public/css/navbar.css index 414b5b9df5..409e49ed43 100644 --- a/frappe/public/css/navbar.css +++ b/frappe/public/css/navbar.css @@ -126,7 +126,7 @@ color: #fff; text-align: center; padding: 2px 5px; - background-color: #98d85b; + background-color: #b8c2cc; } .navbar-new-comments-true { background-color: #ff5858; diff --git a/frappe/public/less/navbar.less b/frappe/public/less/navbar.less index 88b1b0c816..2636eb7d96 100644 --- a/frappe/public/less/navbar.less +++ b/frappe/public/less/navbar.less @@ -153,7 +153,7 @@ color: #fff; text-align: center; padding: 2px 5px; - background-color: @indicator-green; + background-color: @indicator-darkgrey; } .navbar-new-comments-true { From 24b07f6445e68677ce8b2196ac62101d1a159722 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 22 Sep 2016 12:27:24 +0530 Subject: [PATCH 2/2] [ui][fix] overflow navbar breadcrumbs --- frappe/public/css/navbar.css | 8 ++++++++ frappe/public/less/navbar.less | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/frappe/public/css/navbar.css b/frappe/public/css/navbar.css index 409e49ed43..8fd6326174 100644 --- a/frappe/public/css/navbar.css +++ b/frappe/public/css/navbar.css @@ -187,6 +187,14 @@ #navbar-breadcrumbs > li > a { padding: 6px 15px 10px 0px; } +@media (max-width: 1199px) { + #navbar-breadcrumbs > li > a { + width: 140px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } +} .toolbar-user-fullname { max-width: 200px; display: inline-block; diff --git a/frappe/public/less/navbar.less b/frappe/public/less/navbar.less index 2636eb7d96..d2cafaf77f 100644 --- a/frappe/public/less/navbar.less +++ b/frappe/public/less/navbar.less @@ -210,6 +210,13 @@ #navbar-breadcrumbs > li > a { padding: 6px 15px 10px 0px; + + @media (max-width: 1199px) { + width: 140px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } .toolbar-user-fullname {