Browse Source

Merge branch 'hotfix'

version-14
Nabin Hait 8 years ago
parent
commit
41eb3e0845
4 changed files with 12 additions and 2 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +3
    -1
      frappe/desk/page/activity/activity.js
  3. +3
    -0
      frappe/templates/styles/modern.css
  4. +5
    -0
      frappe/templates/styles/standard.css

+ 1
- 1
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()



+ 3
- 1
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
- 0
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
- 0
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 {


Loading…
Cancel
Save