Merge pull request #44 from UM-LPM/main

adjusted padding-bottom and font in feri-header
UM-LPM · Aug 12, 2024 · 65a871a · 65a871a
2 parents e826552 + de253d7
commit 65a871a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/_includes/feri-header.html b/_includes/feri-header.html
@@ -46,7 +46,7 @@ <h1 class='screen-reader-only'>Domača stran FERI</h1>
                 class='screen-reader-only'>Primarna navigacija</span></a>
         <nav id="main-nav" aria-label="Primary navigation">
             <div class="block">
-                <ul>
+                <ul class="main-nav-big">
                     <li><a href="https://feri.um.si/o-nas/">O NAS</a>
                     <li><a href="https://feri.um.si/studij/">ŠTUDIJ</a>
                     <li><a href="https://feri.um.si/raziskovanje/">RAZISKOVANJE</a>

diff --git a/_sass/_feri-header.scss b/_sass/_feri-header.scss
@@ -1,3 +1,27 @@
+@font-face {
+    font-family: 'Open Sans';
+    font-weight: 300;
+    font-style: normal;
+    src: local('Open Sans Light'), local('OpenSans-Light'), url('https://feri.um.si/site/templates/fonts/OpenSans-Light.woff') format('woff'), url('/site/templates/fonts/OpenSans-Light.ttf') format('truetype');
+    font-display:swap
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-weight: 400;
+    font-style: normal;
+    src: local('Open Sans'), local('OpenSans'), url('https://feri.um.si/site/templates/fonts/OpenSans-Regular.woff') format('woff'), url('/site/templates/fonts/OpenSans-Regular.ttf') format('truetype');
+    font-display:swap
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    font-weight: 600;
+    font-style: normal;
+    src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url('https://feri.um.si/site/templates/fonts/OpenSans-Semibold.woff') format('woff'), url('/site/templates/fonts/OpenSans-Semibold.ttf') format('truetype');
+    font-display:swap
+}
+
 .meni-small {
     display: none !important
 }
@@ -250,7 +274,7 @@ header, #content{
     text-decoration: none;
     padding: 0 .722em;
     display:block;
-    font-family: Sana;
+    font-family: 'Open Sans',sans-serif
 }
 
 #main-nav li.active a {
@@ -282,7 +306,7 @@ header, #content{
     text-decoration: none;
     padding: 0 1em;
     display:block;
-    font-family: Sana
+    font-family: 'Open Sans',sans-serif
 }
 
 #theme-selector {
@@ -291,6 +315,10 @@ header, #content{
     cursor:pointer
 }
 
+.main-nav-big {
+    padding-bottom: rem(30px) !important;
+}
+
 #sec-nav li a:focus, #sec-nav li a:hover, #theme-selector:focus, #theme-selector:hover {
     color:#ffc70f
 }
@@ -330,7 +358,7 @@ header, #content{
     .side-nav li a {
         font-size: 1em;
         padding:.5em 1em;
-        font-family: Sana
+        font-family: 'Open Sans',sans-serif
     }
 
     #header-logos {
@@ -381,6 +409,10 @@ header, #content{
         margin:0 auto
     }
 
+    .main-nav-big {
+        padding-bottom: rem(30px) !important;
+    }
+
     #header-logos {
         float: none;
         position: static;