new header and footer

_includes/head.html

@@ -15,24 +15,6 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <!-- Title and meta description
         ================================================== -->
-
-	<link rel="stylesheet"
-        href="https://fonts.googleapis.com/css?family=Lato:300,400,700,900"
-        type="text/css">
-        <link rel="stylesheet" href="https://use.typekit.net/ewh2tqd.css">
-
-        <style>
-         @font-face {
-            font-family: "hagstofa7";
-            src:url("//hagstofas3bucket.hagstofa.is/haxdev/static/fonts/hagstofa7.eot");
-            src:url("//hagstofas3bucket.hagstofa.is/haxdev/static/fonts/hagstofa7.eot%3F%23iefix") format("embedded-opentype"),
-            url("//hagstofas3bucket.hagstofa.is/haxdev/static/fonts/hagstofa7.woff") format("woff"),
-            url("//hagstofas3bucket.hagstofa.is/haxdev/static/fonts/hagstofa7.ttf") format("truetype"),
-            url("//hagstofas3bucket.hagstofa.is/haxdev/static/fonts/hagstofa7.svg%23hagstofa7") format("svg");
-            font-weight: normal;
-            font-style: normal;
-        }
-        </style>
 
         {% include title-tag.html %}
 
@@ -47,9 +29,6 @@
         {% include components/favicons.html %}
 
         {% assign cache_bust = site.time | date: "%Y%m%d%H%M%S" %}
-        <link rel="stylesheet"
-	href="https://fonts.googleapis.com/css?family=Lato:300,400,700,900"
-	type="text/css">
         <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
         <link res="stylesheet" href="https://cdn.datatables.net/1.11.5/css/dataTables.bootstrap5.min.css">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css" integrity="sha512-5A8nwdMOWrSz20fDsjczgUidUBR8liPYU+WymTZP1lmY9G6Oc7HlZv156XqnsgNUzTyMefFTcsFH/tnJE/+xBg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
@@ -58,6 +37,7 @@
         <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
           integrity="sha512-puBpdR0798OZvTTbP4A8Ix/l+A4dHDD0DGqYW6RQ+9jxkRFclaxxQb/SJAWZfWAkuyeQUytO7+7N4QKrDh+drA=="
           crossorigin=""/>
+        <link rel="stylesheet" href="https://use.typekit.net/ewh2tqd.css">
         <link rel="stylesheet" href="https://cdn.rawgit.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.control.min.css"  crossorigin=""/>
         <link rel="stylesheet" href='https://api.mapbox.com/mapbox.js/plugins/leaflet-fullscreen/v1.0.1/leaflet.fullscreen.css'  crossorigin=""/>
         <link rel="stylesheet" href="https://bowercdn.net/c/leaflet.zoomhome-latest/dist/leaflet.zoomhome.css"  crossorigin=""/>

_includes/header.html

@@ -2,6 +2,7 @@
 <a class="sr-only-focusable" id="skiplink" href="#main-content" tabindex="0">{{ page.t.header.skip_link }}</a>
 {% include components/header/internet-explorer-message.html %}
 
+
 {%- if page.language == "en" -%}
 
 {% include header-en.html %}
@@ -11,3 +12,22 @@
 {% include header-is.html %}
 
 {%- endif -%}
+
+<div class="container">
+    <nav class="navbar navbar-expand-lg navbar-light flex-wrap align-items-start">
+        {% include components/header/logo.html %}
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ page.t.header.show_menu }}">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="d-flex flex-wrap w-100 justify-content-between">
+            <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                {% include navigation.html dropdowns=true %}
+            </div>
+            <div class="header-search-bar">
+                {% include search.html %}
+            </div>
+        </div>
+    </nav>
+</div>
+</header>
+{% include components/page-top.html %}