Skip to content

Commit 6d33ecd

Browse files
PhlowPhlow
authored
Merge pull request Phlow#122 from jhabdas/gh-pages
Add optional global nav class-driven font iconography
2 parents c0af2bb + 84d29de commit 6d33ecd

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

‎_includes/_navigation.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class="icon-tree"> {{ site.title }}</a></h1>
66
</li>
77
<!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
8-
<li class="toggle-topbar menu-icon"><a href="#"><span>Navigation</span></a></li>
8+
<li class="toggle-topbar menu-icon"><a href="#"><span>Nav</span></a></li>
99
</ul>
1010
<section class="top-bar-section">
1111
{% comment %}
@@ -34,14 +34,14 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
3434
{% comment %} If right side WITHOUT dropdown menu do {% endcomment %}
3535
{% if link.dropdown == nil %}
3636
<li class="divider"></li>
37-
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
37+
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
3838

3939
{% comment %} If right side WITH dropdown menu do {% endcomment %}
4040
{% else %}
4141

4242
<li class="divider"></li>
4343
<li class="has-dropdown{% if link.url == page.url %} active{% endif %}">
44-
<a href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
44+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
4545

4646
<ul class="dropdown">
4747
{% for dropdown_link in link.dropdown %}
@@ -52,7 +52,7 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
5252
{% assign domain = site.url %}
5353
{% endif %}
5454

55-
<li><a href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
55+
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
5656
{% endfor %}
5757
</ul>
5858

@@ -88,14 +88,14 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
8888

8989
{% comment %} If left side WITHOUT dropdown menu do {% endcomment %}
9090
{% if link.dropdown == nil %}
91-
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
91+
<li{% if link.url == page.url %} class="active"{% elsif page.homepage == true and link.url == '/' %} class="active"{% endif %}><a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a></li>
9292
<li class="divider"></li>
9393

9494
{% comment %} If left side WITH dropdown menu do {% endcomment %}
9595
{% else %}
9696

9797
<li class="has-dropdown{% if link.url == page.url %} active{% endif %}">
98-
<a href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
98+
<a {% if link.class %}class="{{link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title | escape }}</a>
9999

100100
<ul class="dropdown">
101101
{% for dropdown_link in link.dropdown %}
@@ -106,7 +106,7 @@ <h1 class="show-for-small-only"><a href="{{ site.url }}{{ site.baseurl }}" class
106106
{% assign domain = site.url %}
107107
{% endif %}
108108

109-
<li><a href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
109+
<li><a {% if dropdown_link.class %}class="{{dropdown_link.class}}"{% endif %} href="{{ domain }}{{ site.baseurl }}{{ dropdown_link.url }}"{% if dropdown_link.url contains 'http' %} target="_blank"{% endif %}>{{ dropdown_link.title | escape }}</a></li>
110110
{% endfor %}
111111
</ul>
112112

‎_sass/_07_layout.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ body.video cite { color: #fff; }
4848
#navigation {
4949
-webkit-box-shadow: 0 2px 2px 0 rgba(0,0,0,.2);
5050
box-shadow: 0 2px 3px 0 rgba(0,0,0,.2);
51+
52+
[class^='icon-']:before, [class*=' icon-']:before {
53+
margin-right: rem-calc(8);
54+
}
5155
}
5256

5357

0 commit comments

Comments
 (0)