_includes/header.html in solar-flair-0.1.10 vs _includes/header.html in solar-flair-0.2.0

- old
+ new

@@ -1,16 +1,18 @@ <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.color | default: site.theme_color %} - + + {% assign color = page.theme_style | default: site.theme_style %} + {% assign favicon = site.data.theme[color].favicon %} + {% if page_paths %} <nav id="mainNav" class="navbar navbar-expand-lg justify-content-between navbar-light fixed-top"> <a class="navbar-brand" href="{{ site.brand_url }}"> - <img src="/assets/solar_assets/favicons/{{ color }}/favicon.png" height="30" alt=""></a> + <img src="{{ favicon }}" 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> {% else %} <a class="nav-link sitename" href="/"><span class="bold">{{ site.title }}</span> <span class="sr-only">(current)</span> {% endif %} @@ -20,10 +22,10 @@ </button> <div class="collapse navbar-collapse " id="navbar"> <ul class="navbar-nav ml-auto"> - + {% for path in page_paths %} {% assign my_page = site.pages | where: "path", path | first %} {% if my_page.title %} {% if my_page.menu == 'main' %} <li class="nav-item"></li>