heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow pre+code tags in rendered HTML

Browse Source
This commit is contained in:
Jakob Kramer 2012-04-24 17:16:31 +02:00 committed by Joar Wandborg
parent c042801650
commit cf29edcd74
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mediagoblin/static/css/base.css
View File

@ -544,18 +544,34 @@ table.media_panel th {
margin-left: 10px; margin-left: 10px;
} }
/* ASCII art */ /* ASCII art and code */
@font-face { @font-face {
font-family: Inconsolata; font-family: Inconsolata;
src: local('Inconsolata'), url('../fonts/Inconsolata.otf') format('opentype') src: local('Inconsolata'), url('../fonts/Inconsolata.otf') format('opentype')
} }
.ascii-wrapper pre { pre, code {
font-family: Inconsolata, monospace; font-family: Inconsolata, monospace;
line-height: 1em; line-height: 1em;
} }
pre {
overflow: auto;
/* -10px, because it is usually preceded by <p> with margin-bottom: 20px */
margin: -10px 0 10px 0;
}
.comment_wrapper pre {
/* same as above, but with 2px */
margin: 8px 0 10px 0;
}
.ascii-wrapper pre {
/* but it should not affect the ASCII art */
margin: 0;
}
/* Media queries and other responsivisivity */ /* Media queries and other responsivisivity */
@media screen and (max-width: 940px) { @media screen and (max-width: 940px) {
.media_pane { .media_pane {

3
mediagoblin/tools/text.py
View File

@ -36,7 +36,8 @@ HTML_CLEANER = Cleaner(
forms=True, forms=True,
annoying_tags=True, annoying_tags=True,
allow_tags=[ allow_tags=[
'div', 'b', 'i', 'em', 'strong', 'p', 'ul', 'ol', 'li', 'a', 'br'], 'div', 'b', 'i', 'em', 'strong', 'p', 'ul', 'ol', 'li', 'a', 'br',
'pre', 'code'],
remove_unknown_tags=False, # can't be used with allow_tags remove_unknown_tags=False, # can't be used with allow_tags
safe_attrs_only=True, safe_attrs_only=True,
add_nofollow=True, # for now add_nofollow=True, # for now