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

fix: minor data import rebrand compatibility

Browse source
This commit is contained in:
hasnain2808@gmail.com 2021-02-10 23:46:29 +05:30
parent 473cb16093
commit 7b49882f5f
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/public/build.json
View file

@ -305,5 +305,6 @@
"css/email.css": "public/scss/email.scss",
"js/barcode_scanner.min.js": "public/js/frappe/barcode_scanner/quagga.js",
"js/user_profile_controller.min.js": "desk/page/user_profile/user_profile_controller.js",
"css/login.css": "public/scss/login.scss"
"css/login.css": "public/scss/login.scss",
"js/data_import_tools.min.js": "public/js/frappe/data_import/index.js"
}

5
frappe/public/js/frappe/data_import/import_preview.js
View file

@ -188,12 +188,13 @@ frappe.data_import.ImportPreview = class ImportPreview {
.join(',');
this.datatable.style.setStyle(row_classes, {
pointerEvents: 'none',
backgroundColor: frappe.ui.color.get_color_shade('white', 'light'),
color: frappe.ui.color.get_color_shade('black', 'extra-light')
backgroundColor: frappe.ui.color.get_color_shade('gray', 'extra-light'),
color: frappe.ui.color.get_color_shade('gray', 'dark')
});
}
add_actions() {
console.log("add_actions")
let actions = [
{
label: __('Map Columns'),

3
frappe/public/js/frappe/ui/colors.js
View file

@ -39,7 +39,8 @@ frappe.ui.color = {
};
if(Object.keys(shades).includes(shade)) {
return frappe.ui.color_map[color_name][shades[shade]];
const color = this.get_color(color_name)
return color[shades[shade]];
} else {
// eslint-disable-next-line
console.warn(`'shade' can be one of ${Object.keys(shades)} and not ${shade}`);