Standardize support for FA icons across the site

Prodigy-Hacking · Mar 22, 2020 · 8055822 · 8055822
1 parent 14d8603
commit 8055822
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 18 deletions.
diff --git a/_config.yml b/_config.yml
@@ -16,6 +16,8 @@ license:
 links:
   header:
     - title: GitHub
+      icon: github
+      brand: true
       url: https://github.com/allejo/jekyll-docs-theme
   homepage:
     - title: View on GitHub
@@ -24,8 +26,11 @@ links:
       url: https://github.com/allejo/jekyll-docs-theme
   footer:
     - title: GitHub
+      icon: github
+      brand: true
       url: https://github.com/allejo/jekyll-docs-theme
     - title: Issues
+      icon: bug
       url: https://github.com/allejo/jekyll-docs-theme/issues?state=open
 
 ui:

diff --git a/_includes/fa-icon.html b/_includes/fa-icon.html
@@ -0,0 +1,13 @@
+{% if include.icon %}
+    {% capture fa_prefix -%}
+        {%- if include.brand -%}
+            fab
+        {%- else -%}
+            fas
+        {%- endif -%}
+    {%- endcapture -%}
+    <i
+        class="{{ fa_prefix }} fa-{{ include.icon }} fa-fw {{ include.class }}"
+        aria-hidden="true"
+    ></i>
+{% endif %}
diff --git a/_includes/footer/content.html b/_includes/footer/content.html
@@ -81,7 +81,16 @@
                     <ul class="site-footer__links text-left list-inline mb-0">
                         {% for link in site.links.footer %}
                             <li class="list-inline-item">
-                                <a href="{{ link.url }}">{{ link.title }}</a>
+                                <a
+                                    href="{{ link.url }}"
+                                    class="site-footer__link"
+                                >
+                                    {% include fa-icon.html
+                                         icon=link.icon
+                                         brand=link.brand
+                                    %}
+                                    <span>{{ link.title }}</span>
+                                </a>
                             </li>
                         {% endfor %}
                     </ul>

diff --git a/_includes/masthead/button.html b/_includes/masthead/button.html
@@ -2,19 +2,10 @@
     href="{{ include.url }}"
     class="site-masthead__button"
 >
-    {% if include.icon %}
-        {% capture fa_prefix -%}
-            {%- if include.brand -%}
-                fab
-            {%- else -%}
-                fas
-            {%- endif -%}
-        {%- endcapture %}
-        <i
-            class="{{ fa_prefix }} fa-{{ include.icon }} fa-fw mr-1"
-            aria-hidden="true"
-        ></i>
-    {% endif %}
-
+    {% include fa-icon.html
+         icon=include.icon
+         brand=include.brand
+         class="mr-1"
+    %}
     {{ include.title }}
 </a>
diff --git a/_includes/masthead/buttons.html b/_includes/masthead/buttons.html
@@ -6,9 +6,9 @@
             {%- endcapture %}
 
             {% include masthead/button.html
-                   url=site.project.download_url
-                   icon="download"
-                   title=button_text
+                 url=site.project.download_url
+                 icon="download"
+                 title=button_text
             %}
         {% endif %}
 

diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -39,6 +39,7 @@
                             class="nav-link"
                             href="{{ p.url }}"
                         >
+                            {% include fa-icon.html icon=p.icon brand=p.brand %}
                             {{ p.title }}
                         </a>
                     </li>