Merge branch 'master' into license

ocadotechnology · Feb 15, 2024 · 16febfe · 16febfe
2 parents 89a6829 + 6b9cb79
commit 16febfe
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/portal/__init__.py b/portal/__init__.py
@@ -1 +1 @@
-__version__ = "6.41.0"
+__version__ = "6.41.1"
diff --git a/portal/static/portal/img/10_years_anniversary.png b/portal/static/portal/img/10_years_anniversary.png
diff --git a/portal/static/portal/sass/partials/_footer.scss b/portal/static/portal/sass/partials/_footer.scss
@@ -104,6 +104,13 @@
   .form--row__input {
     flex: 1;
   }
+
+  .ten-yr-badge {
+    display: block;
+    position: static;
+    width: 45%;
+    margin: 50px 0 0 auto;
+  }
 }
 
 @media (max-width: $tablet-small-max-width) {
@@ -127,11 +134,17 @@
     .social-media a {
       @include _margin(0px, 10px, 0px, 10px);
     }
+
+    .ten-yr-badge {
+      width: 60%;
+      margin: 15px auto 0 auto;
+    }
   }
 }
 
 @media (max-width: $tablet-small-max-width) and (min-width: $tablet-small-min-width) {
   .footer {
+
     .button,
     .external-links {
       margin: 0;
@@ -152,5 +165,10 @@
     .landscape-logo {
       max-width: 60%;
     }
+
+    .ten-yr-badge {
+      width: 20%;
+      margin: 0;
+    }
   }
-}
+}
diff --git a/portal/templates/portal/partials/footer.html b/portal/templates/portal/partials/footer.html
@@ -54,11 +54,13 @@
                         <a target="_blank" href="https://www.facebook.com/codeforlifeuk/"><span class="iconify" data-icon="mdi:facebook"></span></a>
                         <a target="_blank" href="https://twitter.com/codeforlifeuk"><span class="iconify" data-icon="ant-design:twitter-circle-filled"></span></a>
                     </div>
+                    <img class="ten-yr-badge visible-xs" title="10 years anniversary" alt="10 years anniversary" src="{% static 'portal/img/10_years_anniversary.png' %}">
                     <img class="landscape-logo visible-sm visible-xs" title="Code for Life" alt="Code for Life" src="{% static 'portal/img/logo_cfl_white_landscape.png' %}">
                     <a target="_blank" href="https://www.ocadogroup.com/our-responsible-business/corporate-responsibility/skills-for-the-future">
                         <img title="Ocado Group" alt="Ocado Group" src="{% static 'portal/img/logo_ocado_group_white.svg' %}">
                     </a>
                 </div>
+                <img class="ten-yr-badge hidden-xs" title="10 years anniversary" alt="10 years anniversary" src="{% static 'portal/img/10_years_anniversary.png' %}">
             </div>
         </div>
         <p class="copyright">&copy; Ocado Group {% now "Y" %}</p>