Merge 746f91c into 300e650

nsupdate-info · May 2, 2019 · 138cf59 · 138cf59
2 parents 300e650 + 746f91c
commit 138cf59
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 8 deletions.
diff --git a/src/nsupdate/login/templates/login.html b/src/nsupdate/login/templates/login.html
@@ -1,11 +1,11 @@
 {% extends "base.html" %}
-{% load i18n %}{% load bootstrap %}
+{% load i18n static bootstrap %}
 {% block title %}{% trans "Log in" %}{% endblock %}
 
 {% block content %}
 <div class="row">
     <div class="col-md-6">
-        <h2>{% trans "Login with a local Account" %}</h2>
+        <h2><img src="{% static "img/logo.svg" %}" alt="nsupdate.info logo" height="35" width="35"> {% trans "Login with a local Account" %}</h2>
         <hr />
         {% if form.errors %}
         <p>{% trans "Your username and password didn't match. Please try again." %}</p>

diff --git a/src/nsupdate/main/templates/main/home.html b/src/nsupdate/main/templates/main/home.html
@@ -18,7 +18,7 @@ <h4>rDNS: <span id="ipv6_rdns" class="ipv6addr">{{ request.session.ipv6_rdns }}<
     {% include "main/includes/home_middle.html" %}
     <div class="row">
         <div class="col-sm-12" style="text-align: center">
-            <h1>{{ WWW_HOST }} &mdash; {% trans "the Dynamic DNS service you waited for." %}</h1>
+            <h1><img src="{% static "img/logo_black.svg" %}" alt="nsupdate.info logo" height="35" width="35"> {{ WWW_HOST }} &mdash; {% trans "the Dynamic DNS service you waited for." %}</h1>
         </div>
         <div class="col-sm-4" style="text-align: center">
             <h1><i class="fa fa-thumbs-up fa-3x"></i></h1>

diff --git a/src/nsupdate/static/css/nsupdate.css b/src/nsupdate/static/css/nsupdate.css
@@ -7,6 +7,14 @@ html, body {
   /* The html and body elements cannot have any padding or margin. */
 }
 
+.navbar-brand {
+  padding: 8px;
+}
+.navbar-brand>img {
+  height: 100%;
+  width: auto;
+}
+
 .wrap {
   min-height: 100%;
   /* Negative indent footer by its height */

diff --git a/src/nsupdate/static/img/favicon.ico b/src/nsupdate/static/img/favicon.ico
diff --git a/src/nsupdate/static/img/favicon.svg b/src/nsupdate/static/img/favicon.svg
diff --git a/src/nsupdate/static/img/favicon_32.png b/src/nsupdate/static/img/favicon_32.png
diff --git a/src/nsupdate/static/img/favicon_96.png b/src/nsupdate/static/img/favicon_96.png
diff --git a/src/nsupdate/static/img/logo.svg b/src/nsupdate/static/img/logo.svg
diff --git a/src/nsupdate/static/img/logo_black.svg b/src/nsupdate/static/img/logo_black.svg