header.html in solar-flair-0.3.0

- old
+ new
@@ -1,19 +1,21 @@
 <header  role="banner">
     {% assign pages = site.pages | sort: 'weight' %} 
     {% assign default_paths = pages | map: "path"  %}
     {% assign page_paths = site.header_pages | default: default_paths   %}
 
-    {% assign color = page.theme_style | default: site.theme_style   %}
-    {% assign favicon = site.data.theme[color].favicon    %}
+    {% assign theme_style = page.theme_style | default: site.theme_style   %}
+    {% assign favicon = site.data.theme[theme_style].favicon    %}
+    {% assign logo = site.data.theme[theme_style].logo    %}
+    {% assign navBG = site.data.theme[theme_style].navbar-bg    %}
+    {% assign navColor = site.data.theme[theme_style].navbar-color    %}
   
     {% if page_paths %}
-     
-      <nav id="mainNav" class="navbar navbar-expand-lg justify-content-between navbar-light fixed-top">
+      <nav id="mainNav" class="navbar  navbar-expand-lg justify-content-between fixed-top navbar-{{ navColor }} bg-{{ navBG }}">
         <a class="navbar-brand" href="{{ site.brand_url }}">
-          <img src="{{ favicon }}"  height="30" alt=""></a>
+          <img src="{{ logo }}"  height="30" alt=""></a>
           {% if site.title_1 && site.title_2 %}
-          <a class="nav-link sitename" href="/"><span class="bold {{ color }} ">{{ site.title_1 }}</span> <span class="grey">{{ site.title_2 }}</span> <span class="sr-only">(current)</span>
+          <a class="nav-link sitename" href="/"><span class="bold {{ theme_style }} ">{{ site.title_1 }}</span> <span class="grey">{{ site.title_2 }}</span> <span class="sr-only">(current)</span>
           {% else %}
           <a class="nav-link sitename" href="/"><span class="bold">{{ site.title }}</span> <span class="sr-only">(current)</span>
           {% endif %}
         </a>
         <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">