_includes/header.html in jenstep_theme-0.1.4 vs _includes/header.html in jenstep_theme-0.1.5

@@ -1,11 +1,14 @@
 <header class="site-header" role="banner">
 
   <div class="wrapper">
     {%- assign default_paths = site.pages | sort:"order" | map: "path" -%}
     {%- assign page_paths = site.header_pages | default: default_paths -%}
-    <a class="site-title" rel="author" href="{{ '/' | relative_url }}">{{ site.title | escape }}</a>
+    <a class="site-title" rel="author" href="{{ '/' | relative_url }}">
+      <img src="/assets/favicon.png" width="42px" height="42px">
+      {{ site.title | escape }}
+    </a>
 
     {%- if page_paths -%}
       <nav class="site-nav">
         <input type="checkbox" id="nav-trigger" class="nav-trigger" />
         <label for="nav-trigger">
@@ -20,19 +23,20 @@
           <ul class="topnav">
             {% assign links = site.data.navigation %}
             {% for link in links %}
               {% if link.sublinks %}
                 <li class="dropdown">
-                  <a href="{{ site.url }}{{ site.baseurl }}{{ link.url }}">{{ link.title }}</a>
+                  <a href="{{ site.url }}{{ site.baseurl }}{{ link.url }}"{% if page.url == link.url %}class="active"{% endif %}>{{ link.title }}</a>
                   <div class="dropdown-content">
                     {% for sublink in link.sublinks %}
-                      <a href="{{ site.url }}{{ site.baseurl }}{{ sublink.url }}">{{ sublink.title }}</a>
+                      <a href="{{ site.url }}{{ site.baseurl }}{{ sublink.url }}"{% if page.url == link.sublink.url %}class="active"{% endif %}>{{ sublink.title }}</a>
                     {% endfor %}
                   </div>
                 </li>
               {% else %}
                 <li>
-                  <a href="{{ site.url }}{{ site.baseurl }}{{ link.url }}">{{ link.title }}</a>
+                  <a href="{{ site.url }}{{ site.baseurl }}{{ link.url }}" {% if page.url == link.url %}class="active"{% endif %}>{{ link.title }}</a>
+                </li>
               {% endif %}
             {% endfor %}
           </ul>
         </div>
       </nav>