Merge branch 'release/0.17.1'

uccser · Sep 29, 2019 · e645cfe · e645cfe
2 parents 7d38175 + 41306e9
commit e645cfe
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.17.1
+
+- Minor changes to TENZ puzzle page.
+
 ## 0.17.0
 
 - Add secret pages application.

diff --git a/dthm4kaiako/config/__init__.py b/dthm4kaiako/config/__init__.py
@@ -1,6 +1,6 @@
 """Configuration for Django system."""
 
-__version__ = "0.17.0"
+__version__ = "0.17.1"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

diff --git a/dthm4kaiako/static/scss/secret_pages/tenz-ct-puzzle.scss b/dthm4kaiako/static/scss/secret_pages/tenz-ct-puzzle.scss
@@ -26,6 +26,10 @@ body {
     width: 50%;
     border-top: 2px solid #df4c32;
 }
+#well-done {
+    font-size: 3rem;
+    font-family: 'Courgette', cursive;
+}
 #karakia {
     font-size: 1.5rem;
     font-family: 'Courgette', cursive;
@@ -44,8 +48,11 @@ body {
 img {
     user-select: none;
 }
-#main-flax {
+#main-flax-container {
     z-index: 50;
+    height: 100%;
+}
+#main-flax {
     max-height: 100%;
     position: relative;
     bottom: -2px;
@@ -57,14 +64,18 @@ img {
 }
 @include media-breakpoint-up(md) {
     #main-flax {
+        height: 100vh;
+        max-height: 100%;
+    }
+    #main-flax-container {
         position: absolute;
-        left: -50%;
-        bottom: -10%;
+        transform: translateX(-50%);
+        bottom: -8%;
     }
 }
 @keyframes skewFlax {
   0% {
-    transform: skewX(0.5deg);
+    transform: skewX(1deg);
   }
   100% {
     transform: skewX(-0.5deg);

diff --git a/dthm4kaiako/templates/secret_pages/tenz-ct-puzzle.html b/dthm4kaiako/templates/secret_pages/tenz-ct-puzzle.html
@@ -18,6 +18,7 @@
         <div class="container">
             <div class="row justify-content-end justify-content-lg-center">
                 <div class="col-12 col-md-8 col-lg-7">
+                    <h1 id="well-done" class="my-5 text-center">Well done!</h1>
                     <div id="karakia" class="box">
                         <div id="karakia-mi">
                             Hutia te rito o te harakeke,<br>
@@ -39,7 +40,9 @@
                 </div>
             </div>
         </div>
-        <img id="main-flax" src="{% static 'img/secret_pages/tenz-ct-puzzle/flax-with-bird.svg' %}" class="img-fluid mx-auto d-block">
+        <div id="main-flax-container">
+            <img id="main-flax" src="{% static 'img/secret_pages/tenz-ct-puzzle/flax-with-bird.svg' %}" class="img-fluid mx-auto d-block">
+        </div>
         <img id="hills" src="{% static 'img/secret_pages/tenz-ct-puzzle/hills-with-flax.svg' %}" class="img-fluid d-none d-md-block">
     </div>
     <div id="ground" class="background">
@@ -63,21 +66,26 @@
                 <div class="col-12">
                     <div class="box">
                         <div class="row justify-content-center align-items-center">
-                            <div class="col-12 col-sm-6 col-md-4 mb-5">
+                            <div class="col-12 col-sm-6 mb-5">
                                 <a href="https://www.canterbury.ac.nz/engineering/schools/csse/research/cse/">
                                     <img class="img-fluid" src="{% static 'img/logos/uc-computer-science-education-logo.png' %}">
                                 </a>
                             </div>
-                            <div class="col-12 col-sm-6 col-md-4 mb-5">
+                            <div class="col-12 col-sm-6 mb-5">
                                 <a href="https://tenz.org.nz/">
                                     <img class="img-fluid" src="{% static 'img/logos/tenz-logo.svg' %}">
                                 </a>
                             </div>
-                            <div class="col-12 col-sm-6 col-md-4 mb-5">
+                            <div class="col-12 col-sm-6 mb-5">
                                 <a href="https://kiatakatu.ac.nz/">
                                     <img class="img-fluid" src="{% static 'img/logos/ktam-logo.svg' %}">
                                 </a>
                             </div>
+                            <div class="col-12 col-sm-6 mb-5">
+                                <a href="https://www.dthm4kaiako.ac.nz/">
+                                    {% include 'svg/logo.html' %}
+                                </a>
+                            </div>
                             <div id="copyright" class="col-12">
                                 <small>
                                     "<a href="https://www.flickr.com/photos/sidm/6681523917">Bellbird</a>" by <a href="https://www.flickr.com/photos/sidm/">Sid Mosdell</a> is licensed under <a href="https://creativecommons.org/licenses/by/2.0/">CC BY 2.0</a>, and was used as source for creating vector image of the bellbird.