Merge branch 'TMS-1045' into stage

devgeniem · Jun 14, 2024 · 12d2f11 · 12d2f11
2 parents f671ce8 + 80cfe6c
commit 12d2f11
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 4 deletions.
diff --git a/assets/images/index.js b/assets/images/index.js
@@ -1,3 +1,4 @@
 import './tampere-filharmonia-pysty.svg';
 import './tampere-pysty.svg';
+import './tampere-vaakuna-color.svg';
 import './favicon.png';
diff --git a/assets/images/tampere-vaakuna-color.svg b/assets/images/tampere-vaakuna-color.svg
diff --git a/assets/styles/overrides/_colors.scss b/assets/styles/overrides/_colors.scss
@@ -34,8 +34,10 @@
     }
 }
 
-.has-colors-white,
-.has-background-secondary,
-.has-colors-secondary {
-    border: 1px solid $secondary-invert;
+main {
+    .has-colors-white,
+    .has-background-secondary,
+    .has-colors-secondary {
+        border: 1px solid $secondary-invert;
+    }
 }
diff --git a/assets/styles/overrides/_footer.scss b/assets/styles/overrides/_footer.scss
@@ -16,6 +16,16 @@
     }
 
     &__tampere-vaakuna {
+        height: 40px;
+        background-image: url('images/tampere-vaakuna-color.svg');
+        background-position: center;
+        background-repeat: no-repeat;
+        background-size: contain;
+
+        svg {
+            display: none;
+        }
+
         &:focus {
             outline-color: $black;
         }