diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/main/info/resources.html | 23 | ||||
| -rw-r--r-- | templates/wiki/base.html | 15 | ||||
| -rw-r--r-- | templates/wiki/page_in_use.html | 1 | ||||
| -rw-r--r-- | templates/wiki/revision_list.html | 2 |
4 files changed, 27 insertions, 14 deletions
diff --git a/templates/main/info/resources.html b/templates/main/info/resources.html index c947d4ed..ae416d33 100644 --- a/templates/main/info/resources.html +++ b/templates/main/info/resources.html @@ -28,15 +28,22 @@ a resource or not. You can also hover them for more information on the payment (or tap them on mobile). </p> - <p class="uk-text-center"> - <img src="{{ static_file("images/payment_icons/green.svg") }}" style="height: 2rem;" uk-tooltip="Free" /> - Free - <img src="{{ static_file("images/payment_icons/yellow.svg") }}" style="height: 2rem;" uk-tooltip="Payment Optional" /> - Payment Optional - <img src="{{ static_file("images/payment_icons/red.svg") }}" style="height: 2rem;" uk-tooltip="Paid" /> - Paid - </p> + <div class="uk-text-center uk-flex uk-flex-center"> + <div class="payment-icon"> + <img src="{{ static_file("images/payment_icons/green.svg") }}" uk-tooltip="Free" /> + <span>Free</span> + </div> + <div class="payment-icon"> + <img src="{{ static_file("images/payment_icons/yellow.svg") }}" uk-tooltip="Payment Optional" /> + <span>Payment optional</span> + </div> + + <div class="payment-icon"> + <img src="{{ static_file("images/payment_icons/red.svg") }}" uk-tooltip="Paid" /> + <span>Paid</span> + </div> + </div> {% if categories is none %} <div class="uk-alert-danger" uk-alert> <p> diff --git a/templates/wiki/base.html b/templates/wiki/base.html index 87686a83..c6f8deca 100644 --- a/templates/wiki/base.html +++ b/templates/wiki/base.html @@ -32,22 +32,26 @@ {% include "main/navigation.html" %} <div class="uk-flex uk-flex-row uk-flex-1"> <div class="uk-card uk-card-body uk-flex-left uk-flex uk-card-primary"> - <ul class="uk-nav-default uk-nav-parent-icon" uk-nav> + <ul class="uk-nav-default uk-nav-parent-icon" uk-nav id="wiki-nav"> {% if data is defined %} {% if "headers" in data and data.headers %} <li class="uk-nav-header">Contents</li> {% for header in data.headers %} {% if "sub_headers" in header %} <li class="uk-parent"> - <a href="{{ header.id }}">{{ header.title }}</a> + <a href="{{ header.id }}"> + {{ header.title | safe }} + </a> <ul class="uk-nav-sub"> {% for sub in header.sub_headers %} - <li><a href="{{ sub.id }}"><i class="uk-icon fas fa-diamond fa-fw" style="font-size: 0.5rem; vertical-align: 1px"></i> {{ sub.title }}</a></li> + <li><a href="{{ sub.id }}"> + {{ sub.title | safe }} + </a></li> {% endfor %} </ul> </li> {% else %} - <li><a href="{{ header.id }}">{{ header.title }}</a></li> + <li><a href="{{ header.id }}">{{ header.title | safe }}</a></li> {% endif %} {% endfor %} <li class="uk-nav-divider"></li> @@ -62,6 +66,9 @@ <li><a href="{{ url_for("wiki.page", page="contributing") }}"> <i class="uk-icon fas fa-fw fa-code-branch"></i> Contributing </a></li> + <li><a href="{{ url_for("wiki.page", page="minecraft") }}"> + <i class="uk-icon fas fa-fw fa-cube"></i> Minecraft + </a></li> {# <li class="uk-active"><a href="#">active</a></li>#} {# <li class="uk-parent">#} {# <a href="#">Contributing</a>#} diff --git a/templates/wiki/page_in_use.html b/templates/wiki/page_in_use.html index 4110ee17..1707845c 100644 --- a/templates/wiki/page_in_use.html +++ b/templates/wiki/page_in_use.html @@ -5,7 +5,6 @@ {% block content %} <div class="uk-container uk-container-small"> <div uk-alert class="uk-alert-warning"> - <a class="uk-alert-close" uk-close></a> <h3>The page you requested is currently being edited</h3> <p>Please try again in a little bit when the lock has expired.</p> </div> diff --git a/templates/wiki/revision_list.html b/templates/wiki/revision_list.html index 6eb5b6a8..a1936c32 100644 --- a/templates/wiki/revision_list.html +++ b/templates/wiki/revision_list.html @@ -30,7 +30,7 @@ <a href="#" id="compare-submit" class="uk-button uk-button-primary">Compare selections</a> </div> <script> - let revisions = {{ revisions | tojson }} + let revisions = {{ revisions | tojson }}; </script> <script src="{{ static_file("js/revision_diff.js") }}"></script> {% endblock %} |