mirror of
https://github.com/netbox-community/netbox.git
synced 2025-08-07 16:18:16 -06:00
Remove clamp_height option, apply scrolling style to all markdown divs inside td's
This commit is contained in:
parent
42c4bdddef
commit
0813db666b
BIN
netbox/project-static/dist/netbox.css
vendored
BIN
netbox/project-static/dist/netbox.css
vendored
Binary file not shown.
@ -30,16 +30,14 @@
|
||||
|
||||
// Remove the bottom margin of <p> elements inside a table cell
|
||||
td > .rendered-markdown {
|
||||
max-height: 200px;
|
||||
overflow-y: scroll;
|
||||
|
||||
p:last-of-type {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
td > .rendered-markdown.vertical-scroll {
|
||||
max-height: 200px;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
// Markdown preview
|
||||
.markdown-widget {
|
||||
.preview {
|
||||
|
@ -3,7 +3,7 @@
|
||||
{% if customfield.type == 'integer' and value is not None %}
|
||||
{{ value }}
|
||||
{% elif customfield.type == 'longtext' and value %}
|
||||
{{ value|markdown:True }}
|
||||
{{ value|markdown }}
|
||||
{% elif customfield.type == 'boolean' and value == True %}
|
||||
{% checkmark value true="True" %}
|
||||
{% elif customfield.type == 'boolean' and value == False %}
|
||||
|
@ -159,16 +159,11 @@ def content_type_id(model):
|
||||
#
|
||||
|
||||
@register.filter('markdown', is_safe=True)
|
||||
def render_markdown(value, clamp_height=False):
|
||||
def render_markdown(value):
|
||||
"""
|
||||
Render a string as Markdown. This filter is invoked as "markdown":
|
||||
|
||||
{{ md_source_text|markdown }}
|
||||
|
||||
If clamp_height is True, the "vertical-scroll" class will be added to the container div which sets a max-height
|
||||
and adds a vertical scrollbar:
|
||||
|
||||
{{ md_source_text|markdown:True }}
|
||||
"""
|
||||
if not value:
|
||||
return ''
|
||||
@ -183,11 +178,7 @@ def render_markdown(value, clamp_height=False):
|
||||
|
||||
# If the string is not empty wrap it in rendered-markdown to style tables
|
||||
if html:
|
||||
classes = ['rendered-markdown']
|
||||
if clamp_height:
|
||||
classes.append('vertical-scroll')
|
||||
classes_str = ' '.join(classes)
|
||||
html = f'<div class="{classes_str}">{html}</div>'
|
||||
html = f'<div class="rendered-markdown">{html}</div>'
|
||||
|
||||
schemes = get_config().ALLOWED_URL_SCHEMES
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user