From 99c976cf04d94eb6425741df010e27e8e9730ed2 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 3 Oct 2016 15:01:06 +0530 Subject: [PATCH 1/3] [ui] fix activity heatmap popover --- frappe/desk/page/activity/activity.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/desk/page/activity/activity.js b/frappe/desk/page/activity/activity.js index c3cf422013..553e8069ea 100644 --- a/frappe/desk/page/activity/activity.js +++ b/frappe/desk/page/activity/activity.js @@ -157,7 +157,9 @@ frappe.activity.Feed = Class.extend({ frappe.activity.render_heatmap = function(page) { var me = this; - $('

').prependTo(page.main); + $('
\ +
\ +
').prependTo(page.main); frappe.call({ method: "frappe.desk.page.activity.activity.get_heatmap_data", From 78f5008f091acd11ac32f4f42db0b8dccb29b0ed Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 3 Oct 2016 17:12:47 +0530 Subject: [PATCH 2/3] [fix] modern print format --- frappe/templates/styles/modern.css | 3 +++ frappe/templates/styles/standard.css | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/frappe/templates/styles/modern.css b/frappe/templates/styles/modern.css index a0ee287b5f..72b8c0cd71 100644 --- a/frappe/templates/styles/modern.css +++ b/frappe/templates/styles/modern.css @@ -1,4 +1,7 @@ .print-heading { + text-align: right; + text-transform: uppercase; + color: #666; padding-bottom: 20px; margin-bottom: 20px; border-bottom: 1px solid #d1d8dd; diff --git a/frappe/templates/styles/standard.css b/frappe/templates/styles/standard.css index 56e4479cf4..262f6d44bc 100644 --- a/frappe/templates/styles/standard.css +++ b/frappe/templates/styles/standard.css @@ -74,6 +74,11 @@ border-radius: 4px; } +.print-item-image { + max-height: 110px; + object-fit: contain; +} + .pdf-variables, .pdf-variable, .visible-pdf { From 6d8d13fb334b3014ac7821789b1295d61b853d3e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 3 Oct 2016 18:36:55 +0600 Subject: [PATCH 3/3] bumped to version 7.0.39 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 341bc93c10..ea9603813f 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = "7.0.38" +__version__ = "7.0.39" local = Local()