vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(minor): router and use slightly darker text

Browse source
This commit is contained in:
Rushabh Mehta 2020-12-16 09:36:38 +05:30
parent 956c5be57c
commit 7b96bac01a
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
frappe/public/js/frappe/router.js
View file

@ -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) {

2
frappe/public/scss/desk/css_variables.scss
View file

@ -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);

4
frappe/public/scss/desk/global.scss
View file

@ -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);
}