odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Revert "[FIX] web: set_cache want unicode when caching css" 

This reverts commit e75e2ce2e5.
This commit is contained in:
Nicolas Lempereur 2015-04-07 10:55:24 +02:00
parent e75e2ce2e5
commit b8b8329044
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/web_kanban/static/src/css/kanban.css
View File

@ -204,9 +204,6 @@
opacity: 0.75;
top: 26px;
}
:root .openerp .oe_kanban_view .oe_kanban_group_title_vertical {
writing-mode: lr-tb\9;
}
.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle {
margin-left: 4px;
cursor: pointer;

4
addons/web_kanban_gauge/static/lib/justgage/justgage.js
View File

@ -859,7 +859,7 @@ function getColor(val, pct, col, noGradient, custSec) {
/** Fix Raphael display:none tspan dy attribute bug */
function setDy(elem, fontSize, txtYpos) {
if ((!ie || ie > 8) && elem.node.firstChild.attributes.dy) {
if ((!ie || ie > 9) && elem.node.firstChild.attributes.dy) {
elem.node.firstChild.attributes.dy.value = 0;
}
}
@ -943,4 +943,4 @@ var ie = (function(){
all[0]
);
return v > 4 ? v : undef;
}());
}());

4
openerp/addons/base/ir/ir_qweb.py
View File

@ -1238,8 +1238,8 @@ class AssetsBundle(object):
if len(pages) == 1:
pages = []
for idx, page in enumerate(pages):
self.set_cache("css.%d" % (idx+1), u''.join(page))
content = u'\n'.join(css_url % i for i in range(1,len(pages)+1))
self.set_cache("css.%d" % (idx+1), ''.join(page))
content = '\n'.join(css_url % i for i in range(1,len(pages)+1))
self.set_cache("css.0", content)
if not content:
return self.css()