Commit c551a691 by benjaoming

Fix #263 and style article list header

parent 93464ba7
...@@ -3,20 +3,18 @@ ...@@ -3,20 +3,18 @@
NB! Watch out for line breaks, markdown might add <br />s and <p>s. NB! Watch out for line breaks, markdown might add <br />s and <p>s.
{% endcomment %}{% with image.current_revision.imagerevision as revision %}{% spaceless %} {% endcomment %}{% with image.current_revision.imagerevision as revision %}{% spaceless %}
<div> <div class="thumbnail{% if align %} pull-{{ align }}{% endif %}" style="width: 250px;">
<div class="thumbnail{% if align %} pull-{{ align }}{% endif %}" style="width: 250px;"> {% thumbnail revision.image "250x250" as thumb %}
{% thumbnail revision.image "250x250" as thumb %} <a href="{{ revision.image.url }}">
<a href="{{ revision.image.url }}"> <img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" />
<img src="{{ thumb.url }}" alt="{{ revision.get_filename }}" /> </a>
</a> {% empty %}
{% empty %}
<div class="caption">
<em>{% trans "Image not found" %}</em>
</div>
{% endthumbnail %}
<div class="caption"> <div class="caption">
{{ caption|safe }} <em>{% trans "Image not found" %}</em>
</div> </div>
{% endthumbnail %}
<div class="caption">
{{ caption|safe }}
</div> </div>
</div> </div>
{% endspaceless %}{% endwith %} {% endspaceless %}{% endwith %}
...@@ -4093,6 +4093,14 @@ label { ...@@ -4093,6 +4093,14 @@ label {
.wiki-article div.article-list { .wiki-article div.article-list {
max-width: 340px; max-width: 340px;
clear: left; clear: left;
display: inline-block;
/* Fix height problem when next to floating elements */
}
.wiki-article div.toc .nav-header,
.wiki-article div.article-list .nav-header {
padding: 3px 10px;
border-bottom: 1px solid #DDD;
font-weight: bold;
} }
.wiki-article div.toc ul, .wiki-article div.toc ul,
.wiki-article div.article-list ul { .wiki-article div.article-list ul {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -48,6 +48,12 @@ label { font-size: 16px; font-weight: normal; color: #777;} ...@@ -48,6 +48,12 @@ label { font-size: 16px; font-weight: normal; color: #777;}
.wiki-article div.article-list { .wiki-article div.article-list {
max-width: 340px; max-width: 340px;
clear: left; clear: left;
display: inline-block; /* Fix height problem when next to floating elements */
.nav-header {
padding: 3px 10px;
border-bottom: 1px solid #DDD;
font-weight: bold;
}
} }
.wiki-article div.toc ul, .wiki-article div.toc ul,
......
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