vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'hotfix'

Browse source
This commit is contained in:
Nabin Hait 2016-10-03 18:06:55 +05:30
commit 41eb3e0845
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -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()

4
frappe/desk/page/activity/activity.js
View file

@ -157,7 +157,9 @@ frappe.activity.Feed = Class.extend({
frappe.activity.render_heatmap = function(page) {
var me = this;
$('<div class="heatmap"></div><hr style="margin-bottom: 0px;">').prependTo(page.main);
$('<div class="heatmap-container" style="text-align:center">\
<div class="heatmap" style="display:inline-block;"></div></div>\
<hr style="margin-bottom: 0px;">').prependTo(page.main);
frappe.call({
method: "frappe.desk.page.activity.activity.get_heatmap_data",

3
frappe/templates/styles/modern.css
View file

@ -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;

5
frappe/templates/styles/standard.css
View file

@ -74,6 +74,11 @@
border-radius: 4px;
}
.print-item-image {
max-height: 110px;
object-fit: contain;
}
.pdf-variables,
.pdf-variable,
.visible-pdf {