archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into wip-asset-obscure

Browse Source
This commit is contained in:
Pablo Vazquez
2018-03-28 12:42:42 +02:00
parent 5eb464a1f3 d3ff88e5cf
commit dcde2a4551
55 changed files with 945 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/templates/nodes/custom/blog/_macros.pug
View File

@@ -25,7 +25,7 @@ a.blog_index-header(href="{{ node.url }}")
| {{ node.name }}
.item-content
| {{ node.properties.content | markdown }}
| {{ node.properties | markdowned('content') }}
| {% endmacro %}

2
src/templates/nodes/custom/blog/index.pug
View File

@@ -5,7 +5,7 @@
| {% block css %}
| {{ super() }}
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css', v=17320171) }}", rel="stylesheet")
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel="stylesheet")
| {% endblock %}
| {% block project_context %}

2
src/templates/nodes/custom/comment/_macros.pug
View File

@@ -11,7 +11,7 @@
.comment-body
p.comment-author {{ comment._user.full_name }}
span {{comment.properties.content_html | safe }}
span {{comment.properties | markdowned('content') }}
// TODO: Markdown preview when editing

8
src/templates/nodes/custom/group/view_embed.pug
View File

@@ -13,10 +13,10 @@
data-placement="top")
i.pi-list
| {% if node.description %}
.node-details-description#node-description
| {{ node.description | markdown }}
| {% endif %}
| {% if node.description %}
.node-details-description
| {{ node | markdowned('description') }}
| {% endif %}
section.node-children.group

2
src/templates/nodes/custom/group_hdri/view_embed.pug
View File

@@ -7,7 +7,7 @@
| {% if node.description %}
section.node-row
.node-details-description
| {{ node.description | markdown }}
| {{ node | markdowned('description') }}
| {% endif %}
| {% if children %}

2
src/templates/nodes/custom/group_texture/view_embed.pug
View File

@@ -7,7 +7,7 @@
| {% if node.description %}
section.node-row
.node-details-description
| {{ node.description | markdown }}
| {{ node | markdowned('description') }}
| {% endif %}
| {% if children %}

2
src/templates/nodes/custom/page/view_embed.pug
View File

@@ -17,7 +17,7 @@
| {% if node.description %}
.node-details-description#node-description
| {{ node.description | markdown }}
| {{ node | markdowned('description') }}
| {% endif %}
.node-details-meta.footer

2
src/templates/nodes/custom/post/view.pug
View File

@@ -21,7 +21,7 @@ meta(property="og:image", content="{{ node.picture.thumbnail('l', api=api) }}")
| {% block css %}
| {{ super() }}
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css', v=17320171) }}", rel="stylesheet")
link(href="{{ url_for('static_pillar', filename='assets/css/blog.css') }}", rel="stylesheet")
| {% endblock %}
| {% block project_context %}