From 7b96bac01a12fecdc06d95cb2a36de21b10d75b4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 16 Dec 2020 09:36:38 +0530 Subject: [PATCH] fix(minor): router and use slightly darker text --- frappe/public/js/frappe/router.js | 19 +++++++++++-------- frappe/public/scss/desk/css_variables.scss | 2 +- frappe/public/scss/desk/global.scss | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 914cf8a74f..83bc31642a 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -279,24 +279,27 @@ frappe.router = { // ["Form", "Sales Order", "SO-0001"] => /sales-order/SO-0001 // ["Tree", "Account"] = /account/view/tree - // route[0] is not available for home "/app" - const view = route[0] && route[0].toLowerCase(); + const view = route[0] ? route[0].toLowerCase() : ''; + let new_route = route; if (view === 'list') { if (route[2] && route[2] !== 'list') { - const new_route = [this.slug(route[1]), 'view', route[2].toLowerCase()]; + new_route = [this.slug(route[1]), 'view', route[2].toLowerCase()]; // calendar / inbox if (route[3]) new_route.push(route[3]); - return new_route; } else { - return [this.slug(route[1])] + new_route = [this.slug(route[1])]; } } else if (view === 'form') { - return [this.slug(route[1]), route[2]] + new_route = [this.slug(route[1])]; + if (route[2]) { + // if not single + new_route.push(route[2]); + } } else if (view === 'tree') { - return [this.slug(route[1]), 'view', 'tree']; + new_route = [this.slug(route[1]), 'view', 'tree']; } - return route; + return new_route; }, slug_parts(route) { diff --git a/frappe/public/scss/desk/css_variables.scss b/frappe/public/scss/desk/css_variables.scss index 4073a611bc..def982d5ff 100644 --- a/frappe/public/scss/desk/css_variables.scss +++ b/frappe/public/scss/desk/css_variables.scss @@ -144,7 +144,7 @@ $input-height: 28px !default; // Type Colors --text-muted: var(--gray-600); - --text-light: var(--gray-700); + --text-light: var(--gray-800); --text-color: var(--gray-900); --heading-color: var(--gray-900); diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss index d39819971c..ad7580b01c 100644 --- a/frappe/public/scss/desk/global.scss +++ b/frappe/public/scss/desk/global.scss @@ -122,7 +122,7 @@ p { } .small { - font-size: var(--text-xs); + font-size: var(--text-sm); } .fill-width { @@ -323,7 +323,7 @@ html.firefox, html.safari { } .head-title { - font-size: var(--text-xl); + font-size: var(--text-lg); font-weight: 700; color: var(--heading-color); }