Commit d0c92aa1 by Kyle Fiedler

Added styles for the wiki directory

parent 02f29c22
...@@ -201,10 +201,10 @@ section.wiki { ...@@ -201,10 +201,10 @@ section.wiki {
} }
.toc { .toc {
border: 1px solid #ccc;
background-color: $sidebar-color; background-color: $sidebar-color;
padding: 20px; padding: 9px;
margin: 10px 0; margin: 10px 0;
@include border-radius(5px);
ul { ul {
margin: 0; margin: 0;
...@@ -227,7 +227,7 @@ section.wiki { ...@@ -227,7 +227,7 @@ section.wiki {
padding: 40px 40px; padding: 40px 40px;
@include box-sizing(border-box); @include box-sizing(border-box);
.timestamp { .timestamp{
margin-top: 15px; margin-top: 15px;
padding: 15px 0 0 10px; padding: 15px 0 0 10px;
border-top: 1px solid $light-gray; border-top: 1px solid $light-gray;
...@@ -241,6 +241,26 @@ section.wiki { ...@@ -241,6 +241,26 @@ section.wiki {
.date { .date {
font-size: 0.9em; font-size: 0.9em;
} }
}
.see-children {
padding: 15px 0 0;
border-top: 1px solid $light-gray;
margin-top: 15px;
a {
display: block;
padding: 2px 4px 2px 10px;
border-radius: 3px;
font-size: 0.9em;
line-height: 25px;
&:hover {
background-color: #f6f6f6;
text-decoration: none;
}
}
} }
} }
...@@ -670,6 +690,59 @@ section.wiki { ...@@ -670,6 +690,59 @@ section.wiki {
margin-top: 9px; margin-top: 9px;
} }
/*-----------------
Directory
-----------------*/
.directory-toolbar {
background-color: $sidebar-color;
padding: 9px;
margin: 0 -9px 20px;
@include border-radius(5px);
.well-small {
@include clearfix;
a {
@include inline-block;
}
}
+ p {
font-size: 0.9em;
color: #aaa;
}
}
.filter-clear {
margin-right: 10px;
margin-top: 10px;
font-size: .9em;
a {
color: #aaa;
&:hover {
color: #777;
}
}
}
.table.table-striped {
width: 100%;
margin-top: 20px;
th, td {
border-bottom: 1px solid $light-gray;
padding: 8px;
}
tr:nth-child(even) {
background: #F6F6F6;
}
}
......
...@@ -11,25 +11,19 @@ ...@@ -11,25 +11,19 @@
{% block wiki_contents %} {% block wiki_contents %}
<div class="article-wrapper"> <div class="article-wrapper">
<article class="main-article"> <article class="main-article">
{% if selected_tab != "edit" %} {% if selected_tab != "edit" %}
<h1>{{ article.current_revision.title }}</h1> <h1>{{ article.current_revision.title }}</h1>
{% comment %}
This has been disabled until we can style it.
{% if urlpath %}
<a href="{% url 'wiki:dir' path=urlpath.path %}">Show all children</a>
{% endif %}
{% endcomment %}
{% endif %} {% endif %}
{% block wiki_contents_tab %} {% block wiki_contents_tab %}
{% wiki_render article %} {% wiki_render article %}
{% endblock %} {% endblock %}
</article> </article>
<div class="article-functions"> <div class="article-functions">
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
{% include "wiki/includes/article_menu.html" %} {% include "wiki/includes/article_menu.html" %}
</ul> </ul>
...@@ -37,6 +31,12 @@ ...@@ -37,6 +31,12 @@
<span class="label">{% trans "Last modified:" %}</span><br /> <span class="label">{% trans "Last modified:" %}</span><br />
<span class="date">{{ article.current_revision.modified }}</span> <span class="date">{{ article.current_revision.modified }}</span>
</div> </div>
{% if urlpath %}
<div class="see-children">
<a href="{% url 'wiki:dir' path=urlpath.path %}">See all children</a>
</div>
{% endif %}
</div> </div>
</div> </div>
......
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