diff -urN ../roundcube-thunderbird_labels-1.6.1.orig/tb_label.js ./tb_label.js --- ../roundcube-thunderbird_labels-1.6.1.orig/tb_label.js 2023-02-02 08:06:38.000000000 +0200 +++ ./tb_label.js 2024-04-21 00:54:01.019829000 +0300 @@ -215,17 +215,17 @@ box: "#882200", }; this.label_colors = { - LABEL1: { - bg: "#FCC", - fg: "#FF0000", - light: "#f00", - box: "#FF2200", + LABEL5: { + bg: "#C9C", + fg: "#993399", + light: "#B6F", + box: "#FF33FF", }, - LABEL2: { - bg: "#FC3", - fg: "#FF9900", - light: "#f90", - box: "#FF9900", + LABEL4: { + bg: "#99F", + fg: "#3333FF", + light: "#0CF", + box: "#0CF", }, LABEL3: { bg: "#3C3", @@ -233,17 +233,17 @@ light: "#090", box: "#00CC00", }, - LABEL4: { - bg: "#99F", - fg: "#3333FF", - light: "#0CF", - box: "#0CF", + LABEL2: { + bg: "#FC3", + fg: "#FF9900", + light: "#f90", + box: "#FF9900", }, - LABEL5: { - bg: "#C9C", - fg: "#993399", - light: "#B6F", - box: "#FF33FF", + LABEL1: { + bg: "#FCC", + fg: "#FF0000", + light: "#f00", + box: "#FF2200", }, }; } @@ -256,27 +256,46 @@ colors = ref[label_name]; // TODO escape label_name escaped_label_name = "tb_label_" + label_name; - css += "table.{0}\n{\n background-color: {1};\n}".format( + css += "\n\ntable.{0}\n{\n background-color: {1};\n}".format( escaped_label_name, colors.bg ); // Unselected (unfocused) message css += - "#messagelist tr.{0} td,\n#messagelist tr.{0} td a,\nspan.{0},\n.records-table tr.selected td span.{0}\n{\n color: {1} !important;\n}\n\n.toolbarmenu li.{0},\n.toolbarmenu li.{0} a.active\n{\n color: {2};\n}".format( + "\n#messagelist tr.{0} td,\n#messagelist tr.{0} td a,\nspan.{0},\n.records-table tr.selected td span.{0}\n{\n color: {1} !important;\n}\n.toolbarmenu li.{0},\n.toolbarmenu li.{0} a.active\n{\n color: {2};\n}".format( escaped_label_name, colors.fg, colors.light ); + // Unselected (unfocused) flagged message + css += + "\n#messagelist.messagelist tr.{0}.flagged td.subject span.subject a span\n{\n color: {2} !important;\n}".format( + escaped_label_name, + colors.fg, + colors.light + ); // Selected messages css += - "#messagelist tr.selected.{0} td,\n#messagelist tr.selected.{0} td a\n{\n color: #FFFFFF;\n background-color: {1};\n}".format( + "\n#messagelist tr.selected.{0} td,\n#messagelist tr.selected.{0} td a\n{\n color: #FFFFFF;\n background-color: {1};\n}".format( escaped_label_name, colors.bg ); - css += "div#labelbox span.box_{0}\n{\n background-color: {1};\n}".format( + css += "\ndiv#labelbox span.box_{0}\n{\n background-color: {1};\n}".format( escaped_label_name, colors.box ); + // Selected messages whole tr bgcolor + css += + "\n#messagelist tr.selected.{0},\n#messagelist tr.selected.{0} td\n{\n background-color: {1} !important;\n}".format( + escaped_label_name, + colors.bg + ); + // Message view + css += + "\ndiv#message-header.{0}\n{\n background-color: {1};\n}".format( + escaped_label_name, + colors.bg + ); } return css; };