Commit ea70181c by benjaoming

bootstrap typography and remove extra <li>s on article_list

parent 61131d8d
{% load wiki_macro_tags %} {% load wiki_macro_tags %}
{% load url from future %} {% load url from future %}
<li><a href="{% url 'wiki:get' path=parent.path article_id=parent.article.id %}">{{ parent.article.current_revision.title }}</a> <li>
{% with parent.children.active as children %} <a href="{% url 'wiki:get' path=parent.path article_id=parent.article.id %}">
{% if parent.level < depth and children.count %} {{ parent.article.current_revision.title }}
{% if not parent.article.other_read %}<i class="icon-lock"></i>{% endif %}
</a>
{% if parent.article.other_read %}
{% with parent.children.active as children %}
{% if parent.level < depth and children.count %}
<ul> <ul>
{% for child in parent.children.active %} {% for child in parent.children.active %}
<li>{% article_list child depth %}</li> {% article_list child depth %}
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %}
{% endwith %}
{% endif %} {% endif %}
{% endwith %}
</li> </li>
...@@ -138,11 +138,15 @@ h1#article-title {font-size: 2em; margin-top: -5px;} ...@@ -138,11 +138,15 @@ h1#article-title {font-size: 2em; margin-top: -5px;}
{ {
font-size: @baseFontSize * 1.75; font-size: @baseFontSize * 1.75;
.page-header; .page-header;
margin-bottom: 20px;
padding-bottom: 0px;
} }
.wiki-article h3 .wiki-article h3
{ {
font-size: @baseFontSize * 1.50; font-size: @baseFontSize * 1.50;
margin: 15px 0 10px;
line-height: 30px;
} }
.wiki-article h4 .wiki-article h4
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment