From ec63141692b415387e71f83700d4d6d11c2cf2c2 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 23 Dec 2020 13:07:22 +0530 Subject: [PATCH 1/3] fix: remove console statement --- frappe/public/js/frappe/form/templates/timeline_message_box.html | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/js/frappe/form/templates/timeline_message_box.html b/frappe/public/js/frappe/form/templates/timeline_message_box.html index c3250ee47b..2fb70a613c 100644 --- a/frappe/public/js/frappe/form/templates/timeline_message_box.html +++ b/frappe/public/js/frappe/form/templates/timeline_message_box.html @@ -2,7 +2,6 @@ {% if (doc.comment_type && doc.comment_type == "Comment") { %} - {% console.log(doc) %} {{ doc.user_full_name || frappe.user.full_name(doc.owner) }} {{ __("commented") }} From 23b7a1b45fb30d9369a912a4e74ef8278824a368 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 24 Dec 2020 14:14:32 +0530 Subject: [PATCH 2/3] fix: navbar and breadcrumb bg --- frappe/public/scss/website/index.scss | 2 +- frappe/public/scss/website/navbar.scss | 1 + frappe/public/scss/website/variables.scss | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/website/index.scss b/frappe/public/scss/website/index.scss index 0e3d5d1511..89a4beb726 100644 --- a/frappe/public/scss/website/index.scss +++ b/frappe/public/scss/website/index.scss @@ -90,7 +90,7 @@ .breadcrumb { padding: 0; font-size: $font-size-sm; - background-color: white; + background-color: $breadcrumb-bg; } a.card { diff --git a/frappe/public/scss/website/navbar.scss b/frappe/public/scss/website/navbar.scss index a34a41e7a4..b633ae2b7a 100644 --- a/frappe/public/scss/website/navbar.scss +++ b/frappe/public/scss/website/navbar.scss @@ -1,5 +1,6 @@ .navbar-light { border-bottom: 1px solid $border-color; + background: $navbar-bg; } .navbar-brand { diff --git a/frappe/public/scss/website/variables.scss b/frappe/public/scss/website/variables.scss index 6165147e04..49f0e865f0 100644 --- a/frappe/public/scss/website/variables.scss +++ b/frappe/public/scss/website/variables.scss @@ -18,6 +18,8 @@ $body-color: $gray-700 !default; $text-muted: $gray-600 !default; $border-color: $gray-300 !default; $headings-color: $gray-900 !default; +$breadcrumb-bg: transparent !default; +$navbar-bg: white !default; $font-sizes: ( "xs": 0.75rem, From 383274f1b27bb3a397835e08dc6f24498ac509a1 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 24 Dec 2020 14:14:44 +0530 Subject: [PATCH 3/3] feat: allow adding a class to HTML body --- frappe/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 29e776058f..8b97e079af 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -58,7 +58,7 @@ window.socketio_port = {{ (frappe.socketio_port or 'null') }}; - + {%- block banner -%} {% include "templates/includes/banner_extension.html" ignore missing %}