diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss index e122a6f871..6ddfe0caef 100644 --- a/lms/static/sass/course/wiki/_wiki.scss +++ b/lms/static/sass/course/wiki/_wiki.scss @@ -201,10 +201,10 @@ section.wiki { } .toc { - border: 1px solid #ccc; background-color: $sidebar-color; - padding: 20px; + padding: 9px; margin: 10px 0; + @include border-radius(5px); ul { margin: 0; @@ -227,7 +227,7 @@ section.wiki { padding: 40px 40px; @include box-sizing(border-box); - .timestamp { + .timestamp{ margin-top: 15px; padding: 15px 0 0 10px; border-top: 1px solid $light-gray; @@ -241,6 +241,26 @@ section.wiki { .date { 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 { 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; + } + } + diff --git a/lms/templates/wiki/article.html b/lms/templates/wiki/article.html index 96e43d25ec..5b12942af5 100644 --- a/lms/templates/wiki/article.html +++ b/lms/templates/wiki/article.html @@ -11,25 +11,19 @@ {% block wiki_contents %}
- +
{% if selected_tab != "edit" %}

{{ article.current_revision.title }}

- - {% comment %} - This has been disabled until we can style it. - {% if urlpath %} - Show all children - {% endif %} - {% endcomment %} + {% endif %} - + {% block wiki_contents_tab %} {% wiki_render article %} - {% endblock %} + {% endblock %}
-
+
@@ -37,6 +31,12 @@ {% trans "Last modified:" %}
{{ article.current_revision.modified }}
+ + {% if urlpath %} + + {% endif %}