Merge pull request #23 from UM-LPM/dev

added FERI header
UM-LPM · Mar 26, 2024 · 28c4b52 · 28c4b52
2 parents a8efad8 + 1bea30c
commit 28c4b52
Show file tree

Hide file tree

Showing 20 changed files with 710 additions and 24 deletions.
diff --git a/_config.yml b/_config.yml
@@ -1,11 +1,11 @@
 # Site Settings
-name: Predlogi krajših izobraževanj
-title: Predlogi krajših izobraževanj
+name: Krajša izobraževanja UM FERI
+title: Krajša izobraževanja UM FERI
 description: Cilj spodnjega nabora vsebin je preveriti zainteresiranost za razvoj izbranih krajših izobraževanj Univerze v Mariboru.
 
 show_hero: true
 menu:
-  - title: Doma
+  - title: Domov
     url: /
   - title: O nas
     url: /o-nas

diff --git a/_includes/feri-header.html b/_includes/feri-header.html
@@ -0,0 +1,60 @@
+<header clas="feri-header"><a href="#content" class="skip-to-content">Preskoči na vsebino</a>
+    <div id="sec-nav-wrap"><a class="nav-btn fa fa-bars" id="sec-nav-open-btn" href="#sec-nav"><span
+                class='screen-reader-only'>Odpri navigacijo</span></a>
+        <nav id="sec-nav" aria-label="Secondary navigation">
+            <div class="block">
+                <ul class="meni-small">
+                    <li class="nav-description">MENI
+                    <li class="no-hide"><a href="/">DOMOV</a>
+                    <li class="no-hide"><a href="/o-nas">O NAS</a>
+                    <li class="no-hide"><a href="/kontakt">KONTAKT</a>
+                    <li class="no-hide"><a class="dosearch">IŠČI</a>    
+                </ul>
+                <ul>
+                    <li class="nav-description">HITRE POVEZAVE
+
+                    <li class="no-hide"><a href="https://feri.um.si/obvestila/">OBVESTILA</a>
+                    <li class="no-hide"><a href="https://aips.um.si/" aria-describedby="new-window-1">AIPS</a>
+                    <li class="no-hide"><a href="https://estudij.um.si/" aria-describedby="new-window-1">EŠTUDIJ</a>
+                    <li class="no-hide"><a href="https://feri.um.si/studij/urniki/">URNIKI</a>
+                    <li class="no-hide"><a href="https://it.um.si/studenti/" aria-describedby="new-window-1">IKT STORITVE</a>
+                    <li class="no-hide"><a href="https://ktfmb.um.si/" aria-describedby="new-window-1">KNJIŽNICA</a>
+                </ul>
+                <ul class="main-nav-small">
+                    <li class="nav-description">GLAVNI MENI
+                    <li class="hide-small"><a href="/o-nas/">O NAS</a>
+                    <li class="hide-small"><a href="/studij/">ŠTUDIJ</a>
+                    <li class="hide-small"><a href="/raziskovanje/">RAZISKOVANJE</a>
+                    <li class="hide-small"><a href="/akademija-feri/">AKADEMIJA FERI</a>
+                    <li class="hide-small"><a href="/aplikacije/kontakti/">KONTAKTI</a>
+                </ul><a class="close-btn fa fa-times-circle" id="sec-nav-close-btn" href="#top"><span
+                        class='screen-reader-only'>Zapri navigacijo</span></a>
+            </div>
+        </nav>
+    </div>
+    <div id="logos"></div>
+    <div id="header-logos"><a href="https://www.um.si/" title="Domača stran Univerze v Mariboru "><span
+                class='screen-reader-only'>Domača stran Univerze v Mariboru</span>
+            <div class="umlogo" aria-hidden="true"></div>
+        </a>
+        <div class="logo-divider" aria-hidden="true"></div><a href="https://feri.um.si" title="Domača stran FERI ">
+            <h1 class='screen-reader-only'>Domača stran FERI</h1>
+            <div class="ferilogo" aria-hidden="true"></div>
+        </a>
+    </div>
+    <div id="main-nav-wrap"><a class="nav-btn fa fa-bars" id="main-nav-open-btn" href="#main-nav"><span
+                class='screen-reader-only'>Primarna navigacija</span></a>
+        <nav id="main-nav" aria-label="Primary navigation">
+            <div class="block">
+                <ul>
+                    <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>
+                    <li><a href="https://feri.um.si/akademija-feri/">AKADEMIJA FERI</a>
+                    <li><a href="https://feri.um.si/aplikacije/kontakti/">KONTAKTI</a>
+                </ul><a class="close-btn fa fa-times-circle" id="main-nav-close-btn" href="#top"><span
+                        class='screen-reader-only'>Zapri primarno navigacijo</span></a>
+            </div>
+        </nav>
+    </div>
+</header>
diff --git a/_includes/header.html b/_includes/header.html
@@ -1,4 +1,4 @@
-<header class="bar-header">
+<div class="bar-header">
     <a id="menu" role="button">
         <svg id="open" class="icon-menu"><use xlink:href="#icon-menu"></use></svg>
     </a>
@@ -14,7 +14,7 @@ <h1 class="logo">
     <a id="search" class="dosearch" role="button">
         <svg class="icon-search"><use xlink:href="#icon-search"></use></svg>
     </a>
-</header>
+</div>
 
 <div id="mask" class="overlay"></div>
 

diff --git a/_includes/links.html b/_includes/links.html
@@ -1,7 +1,7 @@
-<ul>
+<ul class="menu">
   {% for item in site.menu %}
     {% if item.title and item.url %}
-      <li>
+      <li class="list-menu">
         <a href="{{ site.url }}{{ site.baseurl }}{{ item.url }}">{{ item.title }}</a>
       </li>
     {% endif %}

diff --git a/_layouts/course-data.html b/_layouts/course-data.html
@@ -14,7 +14,8 @@
       "description": "{{ course.description | strip_newlines | lstrip | replace: '"', '' }}",
       "image": "{{ course.image}}",
       "difficulty": "{{ course.difficulty }}",
-      "type": "{{ course.type }}"
+      "type": "{{ course.type }}",
+      "execution": "{{ course.execution }}"
     }{% unless forloop.last %},{% endunless %}
   {% endfor %}
 ]
diff --git a/_layouts/course.html b/_layouts/course.html
@@ -4,6 +4,7 @@
     <body class="has-push-menu">
         {% include minutes-to-read.html %}
         {% include svg-icons.html %}
+        {% include feri-header.html %}
         {% include header.html %}
 
         <section class="course {% if site.two_columns_layout %}two-columns{% else %}one-column{% endif %}">
@@ -140,7 +141,7 @@ <h1 class="course-title">{{ page.title }}</h1>
 
             {% if site.two_columns_layout %}
             <aside class="see-also">
-                <h3>Poglej tudi</h3>
+                <h3 style="margin-left: 30px;">Poglej tudi</h3>
                 {% assign related_courses_count = 0 %}
                 {% assign courses = site.courses | shuffle %}
                 {% for course in courses %}

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -7,6 +7,7 @@
     {% include head.html %}
     <body class="has-push-menu">
         {% include svg-icons.html %}
+        {% include feri-header.html %}
         {% include header.html %}
             <section class="content">
                 {{ content }}

diff --git a/_layouts/main.html b/_layouts/main.html
@@ -7,6 +7,7 @@
     {% include head.html %}
     <body class="main-page has-push-menu">
         {% include svg-icons.html %}
+        {% include feri-header.html %}
         {% include header.html %}
             <section class="content">
                 {{ content }}

diff --git a/_layouts/minimal.html b/_layouts/minimal.html
@@ -7,6 +7,7 @@
     {% include head.html %}
     <body class="has-push-menu">
         {% include svg-icons.html %}
+        {% include feri-header.html %}
         {% include header.html %}
         <section class="course">
             <article id="course" class="course-content fullwidth" role="main">

diff --git a/_sass/_course.scss b/_sass/_course.scss
@@ -1,6 +1,6 @@
 .course {
   position: relative;
-  top: rem(30px);
+  top: rem(10px);
 
   @include media(">=sm") {
     top: rem(50px);
@@ -18,6 +18,7 @@
     margin: 0 auto;
     padding: rem(40px) 0;
   }
+
 
   .course-content {
     padding-bottom: rem(10px);
@@ -126,6 +127,7 @@
     margin: 0 auto;
 
     @include media(">=sm") {
+      margin-bottom: rem(40px);
       font-size: rem(15px);
     }