Add logos on navigation bar with hyperlinks to NRIS docs and UiT webpage

uit-no · Jun 7, 2024 · a6ebd00 · a6ebd00
1 parent 82c5276
commit a6ebd00
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 42 deletions.
diff --git a/config.toml b/config.toml
@@ -40,6 +40,10 @@ logo_uit_seal_blue  = "img/UiT_seal_blue.png"
 logo_uit_2line_white = "img/UiT_2line_white.png"
 logo_uit_2line_blue  = "img/UiT_2line_blue.png"
 
-logo_nris_acronym = "img/NRIS_acronym.jpg"
+logo_nris_acronym_blue = "img/NRIS_acronym_blue.png"
+logo_nris_acronym_white = "img/NRIS_acronym_white.png"
+
+logo_nris_seal_blue = "img/NRIS_seal_blue.png"
+logo_nris_seal_white = "img/NRIS_seal_white.png"
 
 # twitter_image = "example.png"
diff --git a/sass/style.scss b/sass/style.scss
@@ -133,36 +133,24 @@ $heading-color: #404040;
 
 .logo-container {
   display: flex;
-  justify-content: space-between;
-}
-
-
-.logo-container-top-left img {
-  width: auto;
-  /* adjust as needed */
-  height: 75px;
-  /* maintain aspect ratio */
-}
-
-.logo-container-top-left {
-  display: flex;
-  justify-content: left;
-  /* center horizontally */
-  align-items: left;
-  /* center vertically */
-}
-
-.logo-container-top-right img {
-  width: auto;
-  /* adjust as needed */
-  height: 50px;
-  /* maintain aspect ratio */
-}
-
-.logo-container-top-right {
-  display: flex;
-  justify-content: right;
-  /* center horizontally */
-  align-items: right;
-  /* center vertically */
+  justify-content: flex-start;
+    align-items: center;
+}
+
+.logo-container .logo-uit {
+  width: 10vw;
+  min-width: 110px;
+  height: auto;
+  max-width: 220px;
+  object-fit: contain;
+  margin-right: 2vw;
+}
+
+.logo-container .logo-nris {
+  width: 8vw;
+  min-width: 88px;
+  height: auto;
+  max-width: 196px;
+  object-fit: contain;
+  margin-right: 2vw;
 }
diff --git a/static/img/NRIS_acronym.jpg b/static/img/NRIS_acronym.jpg
diff --git a/static/img/NRIS_acronym_blue.png b/static/img/NRIS_acronym_blue.png
diff --git a/static/img/NRIS_acronym_white.png b/static/img/NRIS_acronym_white.png
diff --git a/static/img/NRIS_seal_blue.png b/static/img/NRIS_seal_blue.png
diff --git a/static/img/NRIS_seal_white.png b/static/img/NRIS_seal_white.png
diff --git a/templates/base.html b/templates/base.html
@@ -18,8 +18,6 @@
 
   <body>
     <div class="uk-container uk-margin-large-bottom">
-      {% include "logos.html" %}
-
       {% include "navigation.html" %}
 
       <div class="markdown">

diff --git a/templates/logos.html b/templates/logos.html
@@ -1,9 +1,8 @@
 <div class="logo-container">
-    <div class="logo-container-top-left">
-        <img src="{{ get_url(path=config.extra.logo_uit_2line_blue) }}" alt="logo_uit_seal_black">
-    </div>
-
-    <div class="logo-container-top-right">
-        <img src="{{ get_url(path=config.extra.logo_nris_acronym) }}" alt="logo_nris_acronym">
-    </div>
+    <a href="https://uit.no/startsida" target="_blank">
+        <img class="logo-uit" src="{{ get_url(path=config.extra.logo_uit_2line_blue) }}" alt="logo_uit_2line_blue">
+    </a>
+    <a href="https://documentation.sigma2.no/" target="_blank">
+        <img class="logo-nris" src="{{ get_url(path=config.extra.logo_nris_acronym_blue) }}" alt="logo_nris_acronym_blue">
+    </a>
 </div>
diff --git a/templates/navigation.html b/templates/navigation.html
@@ -1,4 +1,5 @@
 <nav class="uk-navbar-container uk-navbar-transparent" uk-navbar>
+  {% include "logos.html" %}
   <div class="uk-navbar-right">
     <ul class="uk-navbar-nav uk-visible@s">
       {% for item in config.extra.navigation %}