Merge pull request #1559 from uccser/dtta/new-branding

Update DTTA page
uccser · Apr 4, 2024 · b54f8e5 · b54f8e5
2 parents 951542d + 9e32963
commit b54f8e5
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 15 deletions.
diff --git a/dthm4kaiako/static/img/logos/dtta-logo-black-bullet.jpg b/dthm4kaiako/static/img/logos/dtta-logo-black-bullet.jpg
diff --git a/dthm4kaiako/static/img/logos/dtta-logo-dark.svg b/dthm4kaiako/static/img/logos/dtta-logo-dark.svg
diff --git a/dthm4kaiako/static/img/logos/dtta-logo-padded.png b/dthm4kaiako/static/img/logos/dtta-logo-padded.png
diff --git a/dthm4kaiako/static/img/logos/dtta-logo-red-bullet.jpg b/dthm4kaiako/static/img/logos/dtta-logo-red-bullet.jpg
diff --git a/dthm4kaiako/static/img/logos/dtta-logo-white-back.jpg b/dthm4kaiako/static/img/logos/dtta-logo-white-back.jpg
diff --git a/dthm4kaiako/static/img/logos/dtta-logo-white-text-without-subtitle.png b/dthm4kaiako/static/img/logos/dtta-logo-white-text-without-subtitle.png
diff --git a/dthm4kaiako/static/img/logos/dtta-logo-white-text-without-subtitle.svg b/dthm4kaiako/static/img/logos/dtta-logo-white-text-without-subtitle.svg
diff --git a/dthm4kaiako/static/img/logos/dtta-logo.png b/dthm4kaiako/static/img/logos/dtta-logo.png
diff --git a/dthm4kaiako/static/img/logos/dtta-logo.svg b/dthm4kaiako/static/img/logos/dtta-logo.svg
diff --git a/dthm4kaiako/static/scss/_core-variables.scss b/dthm4kaiako/static/scss/_core-variables.scss
@@ -17,7 +17,7 @@ $events-brand-colour: #0976a9;
 
 // DTTA
 $dtta-brand-colour: #d31f25;
-$dtta-brand-colour-dark: #a21015;
+$dtta-brand-colour-dark: #3d3e3b;
 
 // Bootstrap
 // See: https://getbootstrap.com/docs/4.2/getting-started/theming/

diff --git a/dthm4kaiako/static/scss/website.scss b/dthm4kaiako/static/scss/website.scss
@@ -58,9 +58,19 @@ body {
   width: 12rem;
   vertical-align: 3px;
 }
-.btn-dtta {
+.btn-dtta-primary {
+  @extend .btn-primary;
+  background-color: #2c8887;
+  border-color: #2c8887;
+}
+.btn-dtta-secondary {
   @extend .btn-danger;
-  background-color: $dtta-brand-colour;
+  background-color: #a0309c;
+  border-color: #a0309c;
+}
+.container-dtta {
+  background-color: #e6e6e6;
+  color: #353535;
 }
 
 // Create badge CSS rules off colour names

diff --git a/dthm4kaiako/templates/base-branded.html b/dthm4kaiako/templates/base-branded.html
@@ -100,7 +100,7 @@
       </div>
       <div class="text-center col-12 col-sm-6 col-md-4{% block logo_reorder %}{% endblock logo_reorder %}">
         <a href="{% url 'dtta:home' %}">
-          <img class="img-fluid" src="{% static 'img/logos/dtta-logo-padded.png' %}">
+          <img class="img-fluid" src="{% static 'img/logos/dtta-logo.svg' %}">
         </a>
       </div>
       <div class="text-center col-12 col-sm-6 col-md-4">

diff --git a/dthm4kaiako/templates/base-core.html b/dthm4kaiako/templates/base-core.html
@@ -35,7 +35,7 @@
         <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
       <![endif]-->
   </head>
-  {% block body_element %}<body>{% endblock body_element %}
+  {% block body_element %}<body {% if request.resolver_match.app_name == 'dtta' %}class="container-dtta"{% endif %}>{% endblock body_element %}
     {% block body %}{% endblock body %}
 
     {% block modal %}{% endblock modal %}

diff --git a/dthm4kaiako/templates/dtta/base.html b/dthm4kaiako/templates/dtta/base.html
@@ -11,7 +11,7 @@
         </button>
 
         <a class="navbar-brand" href="{% url 'dtta:home' %}">
-          <img class="d-inline-block align-top navbar-logo" src="{% static 'img/logos/dtta-logo-white-text-without-subtitle.png' %}">
+          <img class="d-inline-block align-top navbar-logo" src="{% static 'img/logos/dtta-logo-white-text-without-subtitle.svg' %}">
         </a>
 
         <div class="collapse navbar-collapse" id="navbarSecondaryContent">
@@ -22,9 +22,10 @@
             <li class="nav-item">
               <a class="nav-link" href="{% url 'dtta:membership' %}">Membership</a>
             </li>
-            <li class="nav-item">
+            <!--  Uncomment to show news.
+              <li class="nav-item">
               <a class="nav-link" href="{% url 'dtta:news_article_list' %}">News</a>
-            </li>
+            </li> -->
             <li class="nav-item dropdown">
               <a class="nav-link dropdown-toggle" href="#" id="dttaCurriculumLinks" role="button" data-toggle="dropdown"
                 aria-haspopup="true" aria-expanded="false">

diff --git a/dthm4kaiako/templates/dtta/home.html b/dthm4kaiako/templates/dtta/home.html
@@ -3,7 +3,7 @@
 {% load static humanize %}
 
 {% block page_heading %}
-    <img class="logo-header img-fluid mx-auto d-block m-3" src="{% static 'img/logos/dtta-logo.png' %}">
+    <img class="logo-header img-fluid mx-auto d-block p-3" src="{% static 'img/logos/dtta-logo.svg' %}">
 {% endblock page_heading %}
 
 {% block content %}
@@ -14,16 +14,17 @@
 
     <div class="row">
         <div class="col-12 col-md-6 my-4">
-            <a href="{% url 'dtta:about' %}" class="btn btn-block btn-lg btn-dtta">
+            <a href="{% url 'dtta:about' %}" class="btn btn-block btn-lg btn-dtta-primary">
                 Find out more about DTTA
             </a>
         </div>
         <div class="col-12 col-md-6 my-4">
-            <a href="{% url 'dtta:membership' %}" class="btn btn-block btn-lg btn-dtta">
+            <a href="{% url 'dtta:membership' %}" class="btn btn-block btn-lg btn-dtta-secondary">
                 Read about joining DTTA
             </a>
         </div>
-        <div class="col-12 col-md-6 my-4">
+        <!-- Uncomment to show news.
+            <div class="col-12 col-md-6 my-4">
             <h3>Latest news</h3>
             {% for news_article in latest_news_articles %}
                 <div class="row mb-2 no-gutters">
@@ -37,8 +38,8 @@ <h3>Latest news</h3>
                     </div>
                 </div>
             {% endfor %}
-            <a href="{% url 'dtta:news_article_list' %}" class="btn btn-dtta my-3">View all news articles</a>
-        </div>
+            <a href="{% url 'dtta:news_article_list' %}" class="btn btn-dtta-primary my-3">View all news articles</a>
+        </div> -->
         <div class="col-12 col-md-6 my-4">
             <h3>Related links</h3>
             <ul>

diff --git a/dthm4kaiako/templates/general/home.html b/dthm4kaiako/templates/general/home.html
@@ -46,7 +46,7 @@
                         <img src="{% static 'img/logos/uc-computer-science-education-logo-padded.png' %}">
                     </a>
                     <a href="{% url 'dtta:home' %}">
-                        <img src="{% static 'img/logos/dtta-logo-padded.png' %}">
+                        <img src="{% static 'img/logos/dtta-logo.svg' %}">
                     </a>
                     <a href="https://www.facebook.com/aateasolutions/">
                         <img src="{% static 'img/logos/aatea-logo-padded.png' %}">