Procházet zdrojové kódy

fix: Set standard indicator colors

- Rename lightblue -> light-blue
version-14
Faris Ansari před 3 roky
rodič
revize
99bf94f784
3 změnil soubory, kde provedl 17 přidání a 11 odebrání
  1. +3
    -2
      frappe/core/doctype/doctype_state/doctype_state.json
  2. +7
    -6
      frappe/public/js/frappe/model/indicator.js
  3. +7
    -3
      frappe/public/scss/common/indicator.scss

+ 3
- 2
frappe/core/doctype/doctype_state/doctype_state.json Zobrazit soubor

@@ -22,14 +22,14 @@
"fieldtype": "Select",
"in_list_view": 1,
"label": "Color",
"options": "Blue\nBlack\nGreen\nGray\nLight Blue\nOrange\nRed",
"options": "Blue\nCyan\nGray\nGreen\nLight Blue\nOrange\nPink\nPurple\nRed\nRed\nYellow",
"reqd": 1
}
],
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2021-12-09 13:40:16.233158",
"modified": "2021-12-14 13:08:38.441775",
"modified_by": "Administrator",
"module": "Core",
"name": "DocType State",
@@ -37,5 +37,6 @@
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC",
"states": [],
"track_changes": 1
}

+ 7
- 6
frappe/public/js/frappe/model/indicator.js Zobrazit soubor

@@ -64,6 +64,13 @@ frappe.get_indicator = function(doc, doctype) {
return [__("Cancelled"), "red", "docstatus,=,2"];
}

// based on document state
if (doc.status && meta && meta.states && meta.states.find(d => d.title === doc.status)) {
let state = meta.states.find(d => d.title === doc.status);
let color_class = frappe.scrub(state.color, '-');
return [__(doc.status), color_class, "status,=," + doc.status];
}

if(settings.get_indicator) {
var indicator = settings.get_indicator(doc);
if(indicator) return indicator;
@@ -74,12 +81,6 @@ frappe.get_indicator = function(doc, doctype) {
return [__("Submitted"), "blue", "docstatus,=,1"];
}

// based on document state
if (doc.status && meta && meta.states && meta.states.find(d => d.title === doc.status)) {
let state = meta.states.find(d => d.title === doc.status)
return [__(doc.status), frappe.scrub(state.color, '-'), "status,=," + doc.status];
}

// based on status
if(doc.status) {
return [__(doc.status), frappe.utils.guess_colour(doc.status)];


+ 7
- 3
frappe/public/scss/common/indicator.scss Zobrazit soubor

@@ -163,9 +163,13 @@
@include indicator-pill-color('purple');
}

.indicator-pill.lightblue,
.indicator-pill-right.lightblue,
.indicator-pill-round.lightblue {
.indicator.light-blue {
@include indicator-color('light-blue');
}

.indicator-pill.light-blue,
.indicator-pill-right.light-blue,
.indicator-pill-round.light-blue {
@include indicator-pill-color('light-blue');
}



Načítá se…
Zrušit
Uložit