From 1b288c5b5b8bdac32c96210da65471cc2f6fe33d Mon Sep 17 00:00:00 2001
From: Randall Wood <297232+rhwood@users.noreply.github.com>
Date: Sat, 2 Jan 2021 11:58:35 -0500
Subject: [PATCH 1/3] feat: Allow search icon in masthead to be set to a Font
Awesome icon.
---
_config.yml | 1 +
_includes/masthead.html | 4 ++++
docs/_config.yml | 1 +
docs/_docs/05-configuration.md | 4 ++++
4 files changed, 10 insertions(+)
diff --git a/_config.yml b/_config.yml
index 92e645cc2546..410b5d267665 100644
--- a/_config.yml
+++ b/_config.yml
@@ -54,6 +54,7 @@ atom_feed:
search : # true, false (default)
search_full_content : # true, false (default)
search_provider : # lunr (default), algolia, google
+search_icon : # builtin (default), Font Awesome class combination ("fas fa-search" recommended)
algolia:
application_id : # YOUR_APPLICATION_ID
index_name : # YOUR_INDEX_NAME
diff --git a/_includes/masthead.html b/_includes/masthead.html
index 47cce0a3545e..e5812ac4257e 100644
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -21,9 +21,13 @@
{% if site.search == true %}
<button class="search__toggle" type="button">
<span class="visually-hidden">{{ site.data.ui-text[site.locale].search_label | default: "Toggle search" }}</span>
+ {% if site.search_icon and site.search_icon != 'builtin' %}
+ <i class="{{ site.search_icon }}"></i>
+ {% else %}
<svg class="icon" width="16" height="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15.99 16">
<path d="M15.5,13.12L13.19,10.8a1.69,1.69,0,0,0-1.28-.55l-0.06-.06A6.5,6.5,0,0,0,5.77,0,6.5,6.5,0,0,0,2.46,11.59a6.47,6.47,0,0,0,7.74.26l0.05,0.05a1.65,1.65,0,0,0,.5,1.24l2.38,2.38A1.68,1.68,0,0,0,15.5,13.12ZM6.4,2A4.41,4.41,0,1,1,2,6.4,4.43,4.43,0,0,1,6.4,2Z" transform="translate(-.01)"></path>
</svg>
+ {% endif %}
</button>
{% endif %}
<button class="greedy-nav__toggle hidden" type="button">
diff --git a/docs/_config.yml b/docs/_config.yml
index 763e37f0b5e6..7059061c025d 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -48,6 +48,7 @@ atom_feed:
search : true # true, false (default)
search_full_content : true # true, false (default)
search_provider : algolia # lunr (default), algolia
+search_icon : # builtin (default), Font Awesome class combination ("fas fa-search" recommended)
algolia:
application_id : QB6HVGBSBA # YOUR_APPLICATION_ID
index_name : minimal_mistakes # YOUR_INDEX_NAME
diff --git a/docs/_docs/05-configuration.md b/docs/_docs/05-configuration.md
index 11c22a649ba4..0c0e0bc981d7 100644
--- a/docs/_docs/05-configuration.md
+++ b/docs/_docs/05-configuration.md
@@ -649,6 +649,10 @@ Add a Google search box to your site.
**Note:** If your site is new and hasn't been indexed by Google yet, search will be incomplete and won't provide accurate results.
{: .notice--info}
+#### Search Icon
+
+To change the search icon to a Font Awesome icon, add `search_icon: "fas fa-search"` (or other Font Awesome classes) to your `_config.yml`.
+
### SEO, social sharing, and analytics settings
All optional, but a good idea to take the time setting up to improve SEO and links shared from the site.
From 7dc78fc226b97ca49236f790525d86caf5d108f4 Mon Sep 17 00:00:00 2001
From: Randall Wood <297232+rhwood@users.noreply.github.com>
Date: Sun, 17 Jan 2021 12:36:15 -0500
Subject: [PATCH 2/3] fix indentations
---
_includes/masthead.html | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/_includes/masthead.html b/_includes/masthead.html
index e5812ac4257e..e7e8924520d7 100644
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -22,11 +22,11 @@
<button class="search__toggle" type="button">
<span class="visually-hidden">{{ site.data.ui-text[site.locale].search_label | default: "Toggle search" }}</span>
{% if site.search_icon and site.search_icon != 'builtin' %}
- <i class="{{ site.search_icon }}"></i>
+ <i class="{{ site.search_icon }}"></i>
{% else %}
- <svg class="icon" width="16" height="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15.99 16">
- <path d="M15.5,13.12L13.19,10.8a1.69,1.69,0,0,0-1.28-.55l-0.06-.06A6.5,6.5,0,0,0,5.77,0,6.5,6.5,0,0,0,2.46,11.59a6.47,6.47,0,0,0,7.74.26l0.05,0.05a1.65,1.65,0,0,0,.5,1.24l2.38,2.38A1.68,1.68,0,0,0,15.5,13.12ZM6.4,2A4.41,4.41,0,1,1,2,6.4,4.43,4.43,0,0,1,6.4,2Z" transform="translate(-.01)"></path>
- </svg>
+ <svg class="icon" width="16" height="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15.99 16">
+ <path d="M15.5,13.12L13.19,10.8a1.69,1.69,0,0,0-1.28-.55l-0.06-.06A6.5,6.5,0,0,0,5.77,0,6.5,6.5,0,0,0,2.46,11.59a6.47,6.47,0,0,0,7.74.26l0.05,0.05a1.65,1.65,0,0,0,.5,1.24l2.38,2.38A1.68,1.68,0,0,0,15.5,13.12ZM6.4,2A4.41,4.41,0,1,1,2,6.4,4.43,4.43,0,0,1,6.4,2Z" transform="translate(-.01)"></path>
+ </svg>
{% endif %}
</button>
{% endif %}
From 123719a259af8992a96a9b96ff22e0075877f01f Mon Sep 17 00:00:00 2001
From: Randall Wood <297232+rhwood@users.noreply.github.com>
Date: Fri, 14 May 2021 07:44:24 -0400
Subject: [PATCH 3/3] Users wishing to avoid FontAwesome should override
_includes/masthead.html
---
_config.yml | 1 -
_includes/masthead.html | 8 +-------
docs/_config.yml | 1 -
docs/_docs/05-configuration.md | 4 ----
4 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/_config.yml b/_config.yml
index 410b5d267665..92e645cc2546 100644
--- a/_config.yml
+++ b/_config.yml
@@ -54,7 +54,6 @@ atom_feed:
search : # true, false (default)
search_full_content : # true, false (default)
search_provider : # lunr (default), algolia, google
-search_icon : # builtin (default), Font Awesome class combination ("fas fa-search" recommended)
algolia:
application_id : # YOUR_APPLICATION_ID
index_name : # YOUR_INDEX_NAME
diff --git a/_includes/masthead.html b/_includes/masthead.html
index e7e8924520d7..09aa4d193029 100644
--- a/_includes/masthead.html
+++ b/_includes/masthead.html
@@ -21,13 +21,7 @@
{% if site.search == true %}
<button class="search__toggle" type="button">
<span class="visually-hidden">{{ site.data.ui-text[site.locale].search_label | default: "Toggle search" }}</span>
- {% if site.search_icon and site.search_icon != 'builtin' %}
- <i class="{{ site.search_icon }}"></i>
- {% else %}
- <svg class="icon" width="16" height="16" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15.99 16">
- <path d="M15.5,13.12L13.19,10.8a1.69,1.69,0,0,0-1.28-.55l-0.06-.06A6.5,6.5,0,0,0,5.77,0,6.5,6.5,0,0,0,2.46,11.59a6.47,6.47,0,0,0,7.74.26l0.05,0.05a1.65,1.65,0,0,0,.5,1.24l2.38,2.38A1.68,1.68,0,0,0,15.5,13.12ZM6.4,2A4.41,4.41,0,1,1,2,6.4,4.43,4.43,0,0,1,6.4,2Z" transform="translate(-.01)"></path>
- </svg>
- {% endif %}
+ <i class="fas fa-search"></i>
</button>
{% endif %}
<button class="greedy-nav__toggle hidden" type="button">
diff --git a/docs/_config.yml b/docs/_config.yml
index 7059061c025d..763e37f0b5e6 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -48,7 +48,6 @@ atom_feed:
search : true # true, false (default)
search_full_content : true # true, false (default)
search_provider : algolia # lunr (default), algolia
-search_icon : # builtin (default), Font Awesome class combination ("fas fa-search" recommended)
algolia:
application_id : QB6HVGBSBA # YOUR_APPLICATION_ID
index_name : minimal_mistakes # YOUR_INDEX_NAME
diff --git a/docs/_docs/05-configuration.md b/docs/_docs/05-configuration.md
index 0c0e0bc981d7..11c22a649ba4 100644
--- a/docs/_docs/05-configuration.md
+++ b/docs/_docs/05-configuration.md
@@ -649,10 +649,6 @@ Add a Google search box to your site.
**Note:** If your site is new and hasn't been indexed by Google yet, search will be incomplete and won't provide accurate results.
{: .notice--info}
-#### Search Icon
-
-To change the search icon to a Font Awesome icon, add `search_icon: "fas fa-search"` (or other Font Awesome classes) to your `_config.yml`.
-
### SEO, social sharing, and analytics settings
All optional, but a good idea to take the time setting up to improve SEO and links shared from the site.