rattail/appypod-rattail
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[gen] Bugfixes.

Browse source
This commit is contained in:
Gaetan Delannay 2015-03-12 08:44:14 +01:00
parent 934ca360cc
commit 727eec8a91
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fields/string.py
View file

@ -656,7 +656,7 @@ class String(Field):
# Compute the successive changes that occurred on p_value
res = self.getDiffValue(obj, res, language)
elif self.format == String.TEXT:
if layoutType != 'edit':
if layoutType in ('view', 'cell'):
res = obj.formatText(res, format='html')
# If value starts with a carriage return, add a space; else, it will
# be ignored.

8
gen/ui/ckeditor/contents.css
View file

@ -4,16 +4,16 @@
/* From ckeditor default contents.css */
body { font-family: sans-serif, Arial, Verdana, "Trebuchet MS"; font-size: 12px;
color: #333; background-color: #fff; margin: 20px }
.cke_editable { font-size: 13px; line-height: 1.6 }
.cke_editable { font-size: 12px; line-height: 1.4 }
blockquote { font-style: italic;
font-family: Georgia, Times, "Times New Roman", serif; padding: 2px 0;
border-style: solid; border-color: #ccc; border-width: 0 }
.cke_contents_ltr blockquote {
padding-left: 20px; padding-right: 8px; border-left-width: 5px }
padding-left: 5px; padding-right: 5px; border-left-width: 4px }
.cke_contents_rtl blockquote {
padding-left: 8px; padding-right: 20px; border-right-width: 5px }
padding-left: 5px; padding-right: 5px; border-right-width: 4px }
a { color: #0782C1 }
ol,ul,dl { *margin-right: 0px; padding: 0 40px }
ol,ul,dl { *margin-right: 0px; padding: 0 30px }
h1,h2,h3,h4,h5,h6 { font-weight: normal; line-height: 1.2 }
hr { border: 0px; border-top: 1px solid #ccc }
img.right { border: 1px solid #ccc; float: right; margin-left: 15px;