diff --git a/frappe/desk/doctype/note/note_list.js b/frappe/desk/doctype/note/note_list.js index 30ae7862ca..f7f8d37dcf 100644 --- a/frappe/desk/doctype/note/note_list.js +++ b/frappe/desk/doctype/note/note_list.js @@ -7,7 +7,7 @@ frappe.listview_settings['Note'] = { if(doc.public) { return [__("Public"), "green", "public,=,Yes"]; } else { - return [__("Private"), "darkgray", "public,=,No"]; + return [__("Private"), "gray", "public,=,No"]; } } } diff --git a/frappe/email/doctype/email_account/email_account_list.js b/frappe/email/doctype/email_account/email_account_list.js index fa36626abf..8cc8b02c52 100644 --- a/frappe/email/doctype/email_account/email_account_list.js +++ b/frappe/email/doctype/email_account/email_account_list.js @@ -2,19 +2,19 @@ frappe.listview_settings["Email Account"] = { add_fields: ["default_incoming", "default_outgoing", "enable_incoming", "enable_outgoing"], get_indicator: function(doc) { if(doc.default_incoming && doc.default_outgoing) { - var color = (doc.enable_incoming && doc.enable_outgoing) ? "blue" : "darkgray"; + var color = (doc.enable_incoming && doc.enable_outgoing) ? "blue" : "gray"; return [__("Default Sending and Inbox"), color, "default_incoming,=,Yes|default_outgoing,=,Yes"] } else if(doc.default_incoming) { - var color = doc.enable_incoming ? "blue" : "darkgray"; + var color = doc.enable_incoming ? "blue" : "gray"; return [__("Default Inbox"), color, "default_incoming,=,Yes"]; } else if(doc.default_outgoing) { - var color = doc.enable_outgoing ? "blue" : "darkgray"; + var color = doc.enable_outgoing ? "blue" : "gray"; return [__("Default Sending"), color, "default_outgoing,=,Yes"]; } else { - var color = doc.enable_incoming ? "blue" : "darkgray"; + var color = doc.enable_incoming ? "blue" : "gray"; return [__("Inbox"), color, "is_global,=,No|is_default=No"]; } } diff --git a/frappe/public/css/indicator.css b/frappe/public/css/indicator.css index d1cb250f2d..8644b36c40 100644 --- a/frappe/public/css/indicator.css +++ b/frappe/public/css/indicator.css @@ -44,8 +44,8 @@ .indicator-right.purple::after { background: #743ee2; } -.indicator.darkgray::before, -.indicator-right.darkgray::after { +.indicator.gray::before, +.indicator-right.gray::after { background: #b8c2cc; } .indicator.black::before, diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index 3ceb5772ac..a769cca799 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -388,8 +388,8 @@ a.no-decoration:active { .indicator-right.purple::after { background: #743ee2; } -.indicator.darkgray::before, -.indicator-right.darkgray::after { +.indicator.gray::before, +.indicator-right.gray::after { background: #b8c2cc; } .indicator.black::before, diff --git a/frappe/public/js/frappe/chat.js b/frappe/public/js/frappe/chat.js index 1f0f9881b2..e17a7ebb4d 100644 --- a/frappe/public/js/frappe/chat.js +++ b/frappe/public/js/frappe/chat.js @@ -682,7 +682,7 @@ frappe.chat.profile.STATUSES }, { name: "Offline", - color: "darkgray" + color: "gray" } ] diff --git a/frappe/public/js/frappe/model/indicator.js b/frappe/public/js/frappe/model/indicator.js index c8732bd60b..94d9241d67 100644 --- a/frappe/public/js/frappe/model/indicator.js +++ b/frappe/public/js/frappe/model/indicator.js @@ -45,7 +45,7 @@ frappe.get_indicator = function(doc, doctype) { "Info": "light-blue", }[locals["Workflow State"][value].style]; } - if(!colour) colour = "darkgray"; + if(!colour) colour = "gray"; return [__(value), colour, workflow_fieldname + ',=,' + value]; } diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 10da5d7010..36c232d95a 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -398,7 +398,7 @@ Object.assign(frappe.utils, { }, guess_style: function(text, default_style, _colour) { var style = default_style || "default"; - var colour = "darkgray"; + var colour = "gray"; if (text) { if (has_words(["Pending", "Review", "Medium", "Not Approved"], text)) { style = "warning"; diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js index 53d7f1ce76..2857eab8b7 100644 --- a/frappe/public/js/frappe/views/kanban/kanban_board.js +++ b/frappe/public/js/frappe/views/kanban/kanban_board.js @@ -642,7 +642,7 @@ frappe.provide("frappe.views"); title: col.column_name, status: col.status, order: col.order, - indicator: col.indicator || 'darkgray' + indicator: col.indicator || 'gray' }; }); } diff --git a/frappe/public/less/email.less b/frappe/public/less/email.less index 883bce3f9e..ef95caed8c 100644 --- a/frappe/public/less/email.less +++ b/frappe/public/less/email.less @@ -180,7 +180,7 @@ hr { width: 8px; height: 8px; border-radius: 8px; - background-color: @indicator-darkgray; + background-color: @indicator-gray; display: inline-block; margin-right: 5px; diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less index 4d3003063f..2dcf634619 100644 --- a/frappe/public/less/form.less +++ b/frappe/public/less/form.less @@ -66,7 +66,7 @@ .document-flow-link-wrapper:not(:last-child) { - border-top: 1px solid @indicator-darkgray; + border-top: 1px solid @indicator-gray; // padding-left: 20px; // padding-right: 20px; margin-right: -4px; diff --git a/frappe/public/less/variables.less b/frappe/public/less/variables.less index 3e77e4aa73..c2d0cfd7fe 100644 --- a/frappe/public/less/variables.less +++ b/frappe/public/less/variables.less @@ -26,7 +26,7 @@ @indicator-green: #98d85b; @indicator-orange: #ffa00a; @indicator-purple: #743ee2; -@indicator-darkgray: #b8c2cc; +@indicator-gray: #b8c2cc; @indicator-yellow: #feef72; @indicator-light-blue: #7cd6fd; @heart-color: @indicator-red; diff --git a/frappe/public/scss/indicator.scss b/frappe/public/scss/indicator.scss index ab770baeec..3151fed296 100644 --- a/frappe/public/scss/indicator.scss +++ b/frappe/public/scss/indicator.scss @@ -71,10 +71,7 @@ --indicator-yellow-bg: var(--yellow-50); --indicator-gray: var(--gray-600); - --indicator-gray-bg: var(--gray-100); - - --indicator-dark-gray: var(--gray-700); - --indicator-dark-gray-bg: var(--gray-400); + --indicator-gray-bg: var(--gray-200); --indicator-red: var(--red-500); --indicator-red-bg: var(--red-50); @@ -96,9 +93,6 @@ --indicator-gray: var(--gray-100); --indicator-gray-bg: var(--gray-600); - --indicator-dark-gray: var(--gray-500); - --indicator-dark-gray-bg: var(--gray-900); - --indicator-red: var(--red-50); --indicator-red-bg: var(--red-500); } @@ -154,13 +148,13 @@ } } -.indicator.darkgray, -.indicator-pill.darkgray, -.indicator-pill-right.darkgray { - background: var(--indicator-dark-gray-bg); - color: var(--indicator-dark-gray); +.indicator.gray, +.indicator-pill.gray, +.indicator-pill-right.gray { + background: var(--indicator-gray-bg); + color: var(--indicator-gray); &::before, &::after { - background: var(--indicator-dark-gray); + background: var(--indicator-gray); } } diff --git a/frappe/website/doctype/blog_post/blog_post_list.js b/frappe/website/doctype/blog_post/blog_post_list.js index 6e194ac693..f9f042250e 100644 --- a/frappe/website/doctype/blog_post/blog_post_list.js +++ b/frappe/website/doctype/blog_post/blog_post_list.js @@ -4,7 +4,7 @@ frappe.listview_settings['Blog Post'] = { if(doc.published) { return [__("Published"), "green", "published,=,Yes"]; } else { - return [__("Not Published"), "darkgray", "published,=,Yes"]; + return [__("Not Published"), "gray", "published,=,Yes"]; } } }; diff --git a/frappe/website/doctype/web_page/web_page_list.js b/frappe/website/doctype/web_page/web_page_list.js index a9eff7f358..3184763248 100644 --- a/frappe/website/doctype/web_page/web_page_list.js +++ b/frappe/website/doctype/web_page/web_page_list.js @@ -4,7 +4,7 @@ frappe.listview_settings['Web Page'] = { if(doc.published) { return [__("Published"), "green", "published,=,Yes"]; } else { - return [__("Not Published"), "darkgray", "published,=,Yes"]; + return [__("Not Published"), "gray", "published,=,Yes"]; } } }; diff --git a/frappe/workflow/doctype/workflow/workflow_list.js b/frappe/workflow/doctype/workflow/workflow_list.js index 038e2ffdfb..199adb590f 100644 --- a/frappe/workflow/doctype/workflow/workflow_list.js +++ b/frappe/workflow/doctype/workflow/workflow_list.js @@ -4,7 +4,7 @@ frappe.listview_settings['Workflow'] = { if(doc.is_active) { return [__("Active"), "green", "is_active,=,Yes"]; } else if(!doc.is_active) { - return [__("Not active"), "darkgray", "is_active,=,No"]; + return [__("Not active"), "gray", "is_active,=,No"]; } } }; diff --git a/frappe/www/404.html b/frappe/www/404.html index d41c847ddb..a796924f1a 100644 --- a/frappe/www/404.html +++ b/frappe/www/404.html @@ -20,7 +20,7 @@ html, body {
- {{_("Page Missing or Moved")}} + {{_("Page Missing or Moved")}}

{{_("The page you are looking for is missing. This could be because it is moved or there is a typo in the link.")}}

{{ _("Home") }}
diff --git a/frappe/www/login.html b/frappe/www/login.html index 927f3e9026..ad70285f0f 100644 --- a/frappe/www/login.html +++ b/frappe/www/login.html @@ -83,7 +83,7 @@ {%- else -%}
- {{_("Signup Disabled")}} + {{_("Signup Disabled")}}

{{_("Signups have been disabled for this website.")}}

{{ _("Home") }}