From 73bc9aac05bd75ecffb2693ff41daface3ec0c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABva=20Brunelles?= <maeva.brunelles@ovhcloud.com>
Date: Wed, 21 Apr 2021 22:51:01 +0200
Subject: [PATCH 01/10] Add support for SEO Pelican plugin

---
 README.md                             |  1 +
 templates/base.html                   | 27 +++++++++-------
 templates/partial/jsonld_article.html | 46 ++++++++++++++-------------
 templates/partial/og.html             | 28 ++++++++--------
 templates/partial/og_article.html     | 46 ++++++++++++++-------------
 5 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/README.md b/README.md
index 1e73af9..5e740f4 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ The minimalist [Pelican](http://blog.getpelican.com/) theme.
 - [Representative image](https://github.com/getpelican/pelican-plugins/tree/master/representative_image)
 - [Neighbors](https://github.com/getpelican/pelican-plugins/tree/master/neighbors)
 - [Tipue Search](https://github.com/getpelican/pelican-plugins/blob/master/tipue_search/)
+- [SEO](https://github.com/pelican-plugins/seo)
 
 ## Install
 
diff --git a/templates/base.html b/templates/base.html
index 0da863e..ca0cadf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -114,19 +114,22 @@
     <meta name="msapplication-TileColor" content="{{ BROWSER_COLOR }}">
   {% endif %}
 
-  {% if REL_CANONICAL %}
-    {% if page %}
-      <link rel="canonical" href="{{ SITEURL }}/{{ page.url }}">
-    {% elif article %}
-      <link rel="canonical" href="{{ SITEURL }}/{{ article.url }}">
-    {% elif page_name == 'index' and not articles_previous_page %}
-      <link rel="canonical" href="{{ SITEURL }}">
-    {% elif author or category or tag or page_name == 'index' %}
-      <link rel="canonical" href="{{ SITEURL }}/{{ articles_page.url }}">
-    {% else %}
-      <link rel="canonical" href="{{ SITEURL }}/{{ output_file }}">
+  {% if not PLUGINS or 'seo' not in PLUGINS %}
+    {% if REL_CANONICAL %}
+      {% if page %}
+        <link rel="canonical" href="{{ SITEURL }}/{{ page.url }}">
+      {% elif article %}
+        <link rel="canonical" href="{{ SITEURL }}/{{ article.url }}">
+      {% elif page_name == 'index' and not articles_previous_page %}
+        <link rel="canonical" href="{{ SITEURL }}">
+      {% elif author or category or tag or page_name == 'index' %}
+        <link rel="canonical" href="{{ SITEURL }}/{{ articles_page.url }}">
+      {% else %}
+        <link rel="canonical" href="{{ SITEURL }}/{{ output_file }}">
+      {% endif %}
     {% endif %}
-  {% endif %}
+  {% endif %} 
+
   {% block meta %}
     <meta name="author" content="{{ AUTHOR }}" />
     <meta name="description" content="{{ SITEDESCRIPTION }}" />
diff --git a/templates/partial/jsonld_article.html b/templates/partial/jsonld_article.html
index f0cd70e..abcc32b 100644
--- a/templates/partial/jsonld_article.html
+++ b/templates/partial/jsonld_article.html
@@ -1,23 +1,25 @@
-{% if SITELOGO %}
-  {% set default_cover = SITELOGO %}
-{% else %}
-  {% set default_cover = '{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/profile.png' %}
+{% if not PLUGINS or 'seo' not in PLUGINS %}
+  {% if SITELOGO %}
+    {% set default_cover = SITELOGO %}
+  {% else %}
+    {% set default_cover = '{{ SITEURL }}/{{ THEME_STATIC_DIR }}/img/profile.png' %}
+  {% endif %}
+  <script type="application/ld+json">
+  {
+    "@context": "http://schema.org",
+    "@type": "BlogPosting",
+    "name": "{{ article.title|striptags }}",
+    "headline": "{{ article.title|striptags }}",
+    "datePublished": "{{ article.date }}",
+    "dateModified": "{{ article.modified }}",
+    "author": {
+      "@type": "Person",
+      "name": "{{ article.author.name }}",
+      "url": "{{ SITEURL }}/{{ article.author.url }}"
+    },
+    "image": "{{ article.metadata.get('cover', default_cover) }}",
+    "url": "{{ SITEURL }}/{{ article.url }}",
+    "description": "{{ article.summary|striptags }}"
+  }
+  </script>
 {% endif %}
-<script type="application/ld+json">
-{
-  "@context": "http://schema.org",
-  "@type": "BlogPosting",
-  "name": "{{ article.title|striptags }}",
-  "headline": "{{ article.title|striptags }}",
-  "datePublished": "{{ article.date }}",
-  "dateModified": "{{ article.modified }}",
-  "author": {
-    "@type": "Person",
-    "name": "{{ article.author.name }}",
-    "url": "{{ SITEURL }}/{{ article.author.url }}"
-  },
-  "image": "{{ article.metadata.get('cover', default_cover) }}",
-  "url": "{{ SITEURL }}/{{ article.url }}",
-  "description": "{{ article.summary|striptags }}"
-}
-</script>
diff --git a/templates/partial/og.html b/templates/partial/og.html
index 41e0c8c..7195851 100644
--- a/templates/partial/og.html
+++ b/templates/partial/og.html
@@ -1,14 +1,16 @@
-{% if OG_LOCALE %}
-  {% set default_locale = OG_LOCALE %}
-{% else %}
-  {% set default_locale = 'en_US' %}
-{% endif %}
-<meta property="og:site_name" content="{{ SITENAME }}"/>
-<meta property="og:type" content="blog"/>
-<meta property="og:title" content="{{ SITENAME }}"/>
-<meta property="og:description" content="{{ SITEDESCRIPTION }}"/>
-<meta property="og:locale" content="{{ default_locale }}"/>
-<meta property="og:url" content="{{ SITEURL }}"/>
-{% if SITELOGO %}
-<meta property="og:image" content="{{ SITELOGO }}">
+{% if not PLUGINS or 'seo' not in PLUGINS %}
+  {% if OG_LOCALE %}
+    {% set default_locale = OG_LOCALE %}
+  {% else %}
+    {% set default_locale = 'en_US' %}
+  {% endif %}
+  <meta property="og:site_name" content="{{ SITENAME }}"/>
+  <meta property="og:type" content="blog"/>
+  <meta property="og:title" content="{{ SITENAME }}"/>
+  <meta property="og:description" content="{{ SITEDESCRIPTION }}"/>
+  <meta property="og:locale" content="{{ default_locale }}"/>
+  <meta property="og:url" content="{{ SITEURL }}"/>
+  {% if SITELOGO %}
+  <meta property="og:image" content="{{ SITELOGO }}">
+  {% endif %}
 {% endif %}
diff --git a/templates/partial/og_article.html b/templates/partial/og_article.html
index 31f70b0..9a929bf 100644
--- a/templates/partial/og_article.html
+++ b/templates/partial/og_article.html
@@ -1,23 +1,25 @@
-{% if OG_LOCALE %}
-  {% set default_locale = OG_LOCALE %}
-{% else %}
-  {% set default_locale = 'en_US' %}
-{% endif %}
-<meta property="og:site_name" content="{{ SITENAME }}"/>
-<meta property="og:title" content="{{ article.title|striptags|escape }}"/>
-<meta property="og:description" content="{{ article.summary|striptags|escape }}"/>
-<meta property="og:locale" content="{{ article.metadata.get('og_locale', default_locale) }}"/>
-<meta property="og:url" content="{{ SITEURL }}/{{ article.url }}"/>
-<meta property="og:type" content="article"/>
-<meta property="article:published_time" content="{{ article.date }}"/>
-<meta property="article:modified_time" content="{{ article.modified }}"/>
-<meta property="article:author" content="{{ SITEURL }}/{{ article.author.url }}">
-<meta property="article:section" content="{{ article.category.name }}"/>
-{% for tag in article.tags %}
-<meta property="article:tag" content="{{ tag.name|escape }}"/>
-{% endfor %}
-{% if 'cover' in article.metadata %}
-<meta property="og:image" content="{{ SITEURL }}/{{ article.metadata['cover'] }}">
-{% else %}
-<meta property="og:image" content="{{ SITELOGO }}">
+{% if not PLUGINS or 'seo' not in PLUGINS %}
+  {% if OG_LOCALE %}
+    {% set default_locale = OG_LOCALE %}
+  {% else %}
+    {% set default_locale = 'en_US' %}
+  {% endif %}
+  <meta property="og:site_name" content="{{ SITENAME }}"/>
+  <meta property="og:title" content="{{ article.title|striptags|escape }}"/>
+  <meta property="og:description" content="{{ article.summary|striptags|escape }}"/>
+  <meta property="og:locale" content="{{ article.metadata.get('og_locale', default_locale) }}"/>
+  <meta property="og:url" content="{{ SITEURL }}/{{ article.url }}"/>
+  <meta property="og:type" content="article"/>
+  <meta property="article:published_time" content="{{ article.date }}"/>
+  <meta property="article:modified_time" content="{{ article.modified }}"/>
+  <meta property="article:author" content="{{ SITEURL }}/{{ article.author.url }}">
+  <meta property="article:section" content="{{ article.category.name }}"/>
+  {% for tag in article.tags %}
+  <meta property="article:tag" content="{{ tag.name|escape }}"/>
+  {% endfor %}
+  {% if 'cover' in article.metadata %}
+  <meta property="og:image" content="{{ SITEURL }}/{{ article.metadata['cover'] }}">
+  {% else %}
+  <meta property="og:image" content="{{ SITELOGO }}">
+  {% endif %}
 {% endif %}

From ab34ff9fe34124f3526afafb31d1ac98709c19a1 Mon Sep 17 00:00:00 2001
From: fy <fy0748@gmail.com>
Date: Sun, 13 Jun 2021 16:49:15 +0800
Subject: [PATCH 02/10] add trailing slash for SITEURL.

Reason:
https://github.com/getpelican/pelican/issues/1156
https://github.com/arulrajnet/attila/pull/4
---
 templates/base.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 0da863e..112b052 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -120,7 +120,7 @@
     {% elif article %}
       <link rel="canonical" href="{{ SITEURL }}/{{ article.url }}">
     {% elif page_name == 'index' and not articles_previous_page %}
-      <link rel="canonical" href="{{ SITEURL }}">
+      <link rel="canonical" href="{{ SITEURL }}/">
     {% elif author or category or tag or page_name == 'index' %}
       <link rel="canonical" href="{{ SITEURL }}/{{ articles_page.url }}">
     {% else %}
@@ -157,7 +157,7 @@
   {% endif %}
   <aside>
     <div>
-      <a href="{{ SITEURL }}">
+      <a href="{{ SITEURL }}/">
         {% if SITELOGO %}
         <img src="{{ SITELOGO }}" alt="{{ SITETITLE }}" title="{{ SITETITLE }}">
         {% else %}
@@ -166,7 +166,7 @@
       </a>
 
       <h1>
-        <a href="{{ SITEURL }}">{{ SITETITLE }}</a>
+        <a href="{{ SITEURL }}/">{{ SITETITLE }}</a>
       </h1>
 
       {% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}
@@ -249,7 +249,7 @@
 
     {% if MAIN_MENU %}
     <nav>
-      <a href="{{ SITEURL }}">{{ _('Home') }}</a>
+      <a href="{{ SITEURL }}/">{{ _('Home') }}</a>
 
       {% for title, link in MENUITEMS %}
       <a href="{{ link }}">{{ _(title) }}</a>

From e04a96108b78b014a085c6883d55a21a8dcd1a84 Mon Sep 17 00:00:00 2001
From: Alexandre Vicenzi <vicenzi.alexandre@gmail.com>
Date: Thu, 17 Jun 2021 01:13:52 +0200
Subject: [PATCH 03/10] Drop JINJA_EXTENSIONS

Fix #268
---
 templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/base.html b/templates/base.html
index 0da863e..6632f79 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,4 +1,4 @@
-{% if 'jinja2.ext.i18n' not in JINJA_ENVIRONMENT.extensions and 'jinja2.ext.i18n' not in JINJA_EXTENSIONS %}
+{% if 'jinja2.ext.i18n' not in JINJA_ENVIRONMENT.extensions %}
   {%- macro _(msg) -%}
     {{ msg % kwargs }}
   {%- endmacro -%}

From 8ed7c504928925d04b99c49660842f86ed6f1764 Mon Sep 17 00:00:00 2001
From: Richard Bos <ml@radoeka.nl>
Date: Mon, 26 Jul 2021 16:49:46 +0200
Subject: [PATCH 04/10] Article summary improvement

Article summary improvement, in case the summary consist of only 1 line.
This patch takes care that the button "Continue Reading" is shown under the article, instead of against the article.
It will be located at the same location compared to multi-line summaries.
---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index b38808b..5d50f41 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -38,7 +38,7 @@
       {% if  article.featured_image %}
         <img src="{{ article.featured_image }}">
       {% endif %}
-      {{ article.summary }}
+      <p>{{ article.summary }}</p>
       {% if article.content != article.summary %}
         <br>
         <a class="btn"

From 81dbd791ccb4f79c83204a0b33ce1e311215a600 Mon Sep 17 00:00:00 2001
From: Richard Bos <ml@radoeka.nl>
Date: Mon, 26 Jul 2021 16:55:32 +0200
Subject: [PATCH 05/10] tipue_search search improvement

Support Flex search, that is located in a sub directory, like https://FQDN/blog.
---
 templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/base.html b/templates/base.html
index 29ebfbe..a1607c1 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -175,7 +175,7 @@
       {% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}
 
       {% if PLUGINS and 'tipue_search' in PLUGINS %}
-        <form class="navbar-search" action="/search.html" role="search">
+        <form class="navbar-search" action="{{ SITEURL }}/search.html" role="search">
           <input type="text" name="q" id="tipue_search_input" placeholder="{{ _('Search...') }}">
         </form>
       {% endif %}

From 5ad43b31a4b2ce5359dd9805c9de1819f57caa79 Mon Sep 17 00:00:00 2001
From: Richard Bos <ml@radoeka.nl>
Date: Mon, 26 Jul 2021 17:02:02 +0200
Subject: [PATCH 06/10] Make the CUSTOM_CSS html code consistent

Make the CUSTOM_CSS html code consistent and with that the same as the <link> html lines.
---
 templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/base.html b/templates/base.html
index 29ebfbe..060d008 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -78,7 +78,7 @@
   <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/font-awesome/css/solid.css">
 
   {% if CUSTOM_CSS %}
-    <link href="{{ SITEURL }}/{{ CUSTOM_CSS }}" rel="stylesheet">
+    <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ CUSTOM_CSS }}">
   {% endif %}
 
   {% if FEED_ALL_ATOM %}

From 9aeade2d230a02805439d67afaf1ab950fe1d589 Mon Sep 17 00:00:00 2001
From: Richard Bos <ml@radoeka.nl>
Date: Mon, 26 Jul 2021 21:58:29 +0200
Subject: [PATCH 07/10] Index summary improvement

Article summary improvement, in case the summary consist of only 1 line.
This patch takes care that the button "Continue Reading" is shown under the article, instead of against the article.
It will be located at the same location compared to multi-line summaries.
---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index 5d50f41..5a07642 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -38,7 +38,7 @@
       {% if  article.featured_image %}
         <img src="{{ article.featured_image }}">
       {% endif %}
-      <p>{{ article.summary }}</p>
+      <div>{{ article.summary }}</div>
       {% if article.content != article.summary %}
         <br>
         <a class="btn"

From 5bfd3d04f700eea5616940cdec1aa3c56495da63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Magimel?= <magimel.francois@gmail.com>
Date: Sat, 2 Oct 2021 19:00:13 +0200
Subject: [PATCH 08/10] Changelog: add version 2.3.0

An article is available on the blog:
https://flex.alxd.me/flex-pelican-theme-update-2-3.html.
---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa09e15..403b4e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 2.3.0
+
+- Support dark theme [#213](https://github.com/alexandrevicenzi/Flex/pull/213)
+- Support Isso comments [#200](https://github.com/alexandrevicenzi/Flex/pull/200)
+- Support Pelican 4.5 [#248](https://github.com/alexandrevicenzi/Flex/pull/248)
+- Support Tipue search [#193](https://github.com/alexandrevicenzi/Flex/pull/193)
+- Upgrade Font-Awesome to 5 [#156](https://github.com/alexandrevicenzi/Flex/pull/156)
+- Add social icons (keybase, twitch, mastodon, diaspora, flickr, last.fm
+- Fix layouts
+- Update translations (zh)
+
+This version includes cs, de, en, es, es_ES, et, fa_IR, fr, hu_HU, id, it, nl_NL, pl_PL, pt, pt_BR, pt_PT, ro_RO, ru, tr_TR, zh_CN translations.
+
 ## 2.2.0
 
 - Update Pygments - New themes available!

From ee45e48477d0224e7f424477120bbe5605a375d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Magimel?= <magimel.francois@gmail.com>
Date: Sat, 2 Oct 2021 19:00:37 +0200
Subject: [PATCH 09/10] Changelog: add version 2.4.0

An article is available on the blog:
https://flex.alxd.me/flex-pelican-theme-update-2-4.html.
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 403b4e1..7b24d4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.4.0
+
+- Update translations (Italian, Spanish, Portuguese, German, Turkish)
+- Include settings for canonical URLS [#238](https://github.com/alexandrevicenzi/Flex/issues/238)
+- Remove pelican plugins dependency [#255](https://github.com/alexandrevicenzi/Flex/issues/255)
+
+This version includes cs, de, en, es, es_ES, et, fa_IR, fr, hu_HU, id, it, nl_NL, pl_PL, pt, pt_BR, pt_PT, ro_RO, ru, tr_TR, zh_CN translations.
+
 ## 2.3.0
 
 - Support dark theme [#213](https://github.com/alexandrevicenzi/Flex/pull/213)

From 53fc53b8b9e1c6070f644db4b3b97fe33b735123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elias=20Kirchg=C3=A4ssner?= <dev@lioman.de>
Date: Fri, 25 Feb 2022 09:20:21 +0100
Subject: [PATCH 10/10] #293: respect use_google_fonts in tipue search

tipue search has included the font import
without respecting the settings.
---
 static/tipuesearch/tipuesearch.min.css | 2 +-
 templates/base.html                    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/static/tipuesearch/tipuesearch.min.css b/static/tipuesearch/tipuesearch.min.css
index b410854..fc154ea 100644
--- a/static/tipuesearch/tipuesearch.min.css
+++ b/static/tipuesearch/tipuesearch.min.css
@@ -1 +1 @@
-@import url(https://fonts.googleapis.com/css?family=Merriweather:300,400|Open+Sans|Source+Code+Pro);#tipue_search_input{font-family:Source Sans Pro,Roboto,Open Sans,Liberation Sans,DejaVu Sans,Verdana,Helvetica,Arial,sans-serif;color:#333;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-color:#f3f3f3;border:none;padding:9px 0 10px 18px;border-radius:3px;-moz-appearance:none;-webkit-appearance:none;box-sizing:border-box;box-shadow:none;outline:0;margin:0}#tipue_search_input:-webkit-autofill,#tipue_search_input:-webkit-autofill:focus,#tipue_search_input:-webkit-autofill:hover{-webkit-box-shadow:0 0 0 1000px #f3f3f3 inset}.tipue_search_button{position:relative;float:left;width:49px;height:56px;margin-left:-3px;background-color:#f3f3f3;border:none;border-top-right-radius:3px;border-bottom-right-radius:3px;box-sizing:border-box;cursor:pointer;outline:0}.tipue_search_icon{float:left;font:24px/1 'Open Sans',sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#333;transform:rotate(-45deg);-moz-appearance:none;-webkit-appearance:none;box-sizing:border-box;box-shadow:none;outline:0;margin:-1px 0 0 16px}.tipue_search_group:after{content:"";display:table;clear:both}#tipue_search_content{max-width:100%;margin:0}.tipue_search_content_title{font-family:Source Sans Pro,Roboto,Open Sans,Liberation Sans,DejaVu Sans,Verdana,Helvetica,Arial,sans-serif;font-weight:300;line-height:1.1;font-size:2em}.tipue_search_content_title a{color:#d9411e;text-decoration:none}.tipue_search_content_title a:hover{color:#ff5a09}.tipue_search_result{margin:0 8% 2%;line-height:inherit}#tipue_search_results_count,.tipue_search_content_debug{font-family:Source Sans Pro,Roboto,Open Sans,Liberation Sans,DejaVu Sans,Verdana,Helvetica,Arial,sans-serif;text-transform:uppercase;color:#999;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#tipue_search_results_count{padding-top:9px}#tipue_search_error,#tipue_search_replace,.tipue_search_content_url,.tipue_search_note,.tipue_search_related{font-family:Source Sans Pro,Roboto,Open Sans,Liberation Sans,DejaVu Sans,Verdana,Helvetica,Arial,sans-serif;color:#666;padding-top:7px;word-wrap:break-word;hyphens:auto}#tipue_search_replace a,#tipue_search_replace a:hover,.tipue_search_content_url a,.tipue_search_note a,.tipue_search_related a{color:#339e41;text-decoration:none}.tipue_search_content_url a:hover,.tipue_search_note a:hover,.tipue_search_related a:hover{color:#666}#tipue_search_replace,.tipue_search_related{margin-top:7px}#tipue_search_error{color:#333;margin-top:17px}.tipue_search_content_text{margin:0;padding:0;background-color:#fff;color:#242121;font-family:Source Sans Pro,Roboto,Open Sans,Liberation Sans,DejaVu Sans,Verdana,Helvetica,Arial,sans-serif;font-size:1.02em;line-height:1.2em}.tipue_search_content_bold{font-weight:bold;color:#333}.tipue_search_content_debug{margin:7px 0 2px 0}.tipue_search_image{padding:17px 0 6px 0}.tipue_search_img{width:100%;max-width:330px;height:auto;transition:.5s;border-radius:2px}.tipue_search_img:hover{opacity:.9}#tipue_search_zoom_text{font:12px/1.7 'Source Code Pro',monospace;color:#ccc;text-transform:uppercase;letter-spacing:1px;padding-top:9px}#tipue_search_zoom_text a{color:#ccc;text-decoration:none;border-bottom:2px solid #f7f7f7}#tipue_search_zoom_text a:hover{border:0}.tipue_search_image_zoom{cursor:pointer}#tipue_search_image_modal{display:none;position:fixed;z-index:1000;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgba(0,0,0,.9)}.tipue_search_image_close{position:absolute;top:0;right:0;font:22px/1 'Source Code Pro',monospace;color:#ccc;padding:25px 30px;cursor:pointer}.tipue_search_image_block{margin:0 auto;max-width:900px;padding:73px 30px 30px 30px;box-sizing:border-box;color:#fff}#tipue_search_zoom_img{max-width:100%;height:auto}#tipue_search_zoom_text,.tipue_search_zoom_options{padding-top:9px}#tipue_search_foot{margin:51px 0 21px 0}#tipue_search_foot_boxes{font:14px 'Source Code Pro',sans-serif;text-transform:uppercase;color:#333;padding:0;margin:0;cursor:pointer}#tipue_search_foot_boxes li{display:inline;list-style:none;margin:0;padding:0}#tipue_search_foot_boxes li a{background-color:#f7f7f7;color:#666;padding:10px 17px 11px 17px;border-radius:3px;margin-right:7px;text-decoration:none;text-align:center;transition:.3s}#tipue_search_foot_boxes li.current{background:#252525;color:#ccc;padding:10px 17px 11px 17px;border-radius:3px;margin-right:7px;text-align:center}#tipue_search_foot_boxes li a:hover{background:#252525;color:#ccc}
\ No newline at end of file
+#tipue_search_input{font-family:Source Sans Pro,Roboto,Open Sans,Liberation Sans,DejaVu Sans,Verdana,Helvetica,Arial,sans-serif;color:#333;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;background-color:#f3f3f3;border:none;padding:9px 0 10px 18px;border-radius:3px;-moz-appearance:none;-webkit-appearance:none;box-sizing:border-box;box-shadow:none;outline:0;margin:0}#tipue_search_input:-webkit-autofill,#tipue_search_input:-webkit-autofill:focus,#tipue_search_input:-webkit-autofill:hover{-webkit-box-shadow:0 0 0 1000px #f3f3f3 inset}.tipue_search_button{position:relative;float:left;width:49px;height:56px;margin-left:-3px;background-color:#f3f3f3;border:none;border-top-right-radius:3px;border-bottom-right-radius:3px;box-sizing:border-box;cursor:pointer;outline:0}.tipue_search_icon{float:left;font:24px/1 'Open Sans',sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#333;transform:rotate(-45deg);-moz-appearance:none;-webkit-appearance:none;box-sizing:border-box;box-shadow:none;outline:0;margin:-1px 0 0 16px}.tipue_search_group:after{content:"";display:table;clear:both}#tipue_search_content{max-width:100%;margin:0}.tipue_search_content_title{font-family:Source Sans Pro,Roboto,Open Sans,Liberation Sans,DejaVu Sans,Verdana,Helvetica,Arial,sans-serif;font-weight:300;line-height:1.1;font-size:2em}.tipue_search_content_title a{color:#d9411e;text-decoration:none}.tipue_search_content_title a:hover{color:#ff5a09}.tipue_search_result{margin:0 8% 2%;line-height:inherit}#tipue_search_results_count,.tipue_search_content_debug{font-family:Source Sans Pro,Roboto,Open Sans,Liberation Sans,DejaVu Sans,Verdana,Helvetica,Arial,sans-serif;text-transform:uppercase;color:#999;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#tipue_search_results_count{padding-top:9px}#tipue_search_error,#tipue_search_replace,.tipue_search_content_url,.tipue_search_note,.tipue_search_related{font-family:Source Sans Pro,Roboto,Open Sans,Liberation Sans,DejaVu Sans,Verdana,Helvetica,Arial,sans-serif;color:#666;padding-top:7px;word-wrap:break-word;hyphens:auto}#tipue_search_replace a,#tipue_search_replace a:hover,.tipue_search_content_url a,.tipue_search_note a,.tipue_search_related a{color:#339e41;text-decoration:none}.tipue_search_content_url a:hover,.tipue_search_note a:hover,.tipue_search_related a:hover{color:#666}#tipue_search_replace,.tipue_search_related{margin-top:7px}#tipue_search_error{color:#333;margin-top:17px}.tipue_search_content_text{margin:0;padding:0;background-color:#fff;color:#242121;font-family:Source Sans Pro,Roboto,Open Sans,Liberation Sans,DejaVu Sans,Verdana,Helvetica,Arial,sans-serif;font-size:1.02em;line-height:1.2em}.tipue_search_content_bold{font-weight:bold;color:#333}.tipue_search_content_debug{margin:7px 0 2px 0}.tipue_search_image{padding:17px 0 6px 0}.tipue_search_img{width:100%;max-width:330px;height:auto;transition:.5s;border-radius:2px}.tipue_search_img:hover{opacity:.9}#tipue_search_zoom_text{font:12px/1.7 'Source Code Pro',monospace;color:#ccc;text-transform:uppercase;letter-spacing:1px;padding-top:9px}#tipue_search_zoom_text a{color:#ccc;text-decoration:none;border-bottom:2px solid #f7f7f7}#tipue_search_zoom_text a:hover{border:0}.tipue_search_image_zoom{cursor:pointer}#tipue_search_image_modal{display:none;position:fixed;z-index:1000;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgba(0,0,0,.9)}.tipue_search_image_close{position:absolute;top:0;right:0;font:22px/1 'Source Code Pro',monospace;color:#ccc;padding:25px 30px;cursor:pointer}.tipue_search_image_block{margin:0 auto;max-width:900px;padding:73px 30px 30px 30px;box-sizing:border-box;color:#fff}#tipue_search_zoom_img{max-width:100%;height:auto}#tipue_search_zoom_text,.tipue_search_zoom_options{padding-top:9px}#tipue_search_foot{margin:51px 0 21px 0}#tipue_search_foot_boxes{font:14px 'Source Code Pro',sans-serif;text-transform:uppercase;color:#333;padding:0;margin:0;cursor:pointer}#tipue_search_foot_boxes li{display:inline;list-style:none;margin:0;padding:0}#tipue_search_foot_boxes li a{background-color:#f7f7f7;color:#666;padding:10px 17px 11px 17px;border-radius:3px;margin-right:7px;text-decoration:none;text-align:center;transition:.3s}#tipue_search_foot_boxes li.current{background:#252525;color:#ccc;padding:10px 17px 11px 17px;border-radius:3px;margin-right:7px;text-align:center}#tipue_search_foot_boxes li a:hover{background:#252525;color:#ccc}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index fca8d45..3f3c651 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -70,6 +70,9 @@
   {% endif %}
 
   {% if PLUGINS and 'tipue_search' in PLUGINS %}
+      {% if USE_GOOGLE_FONTS != False %}
+      <link href="https://fonts.googleapis.com/css?family=Merriweather:300,400|Open+Sans" rel="stylesheet">
+      {% endif %}
     <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/tipuesearch/tipuesearch.min.css" />
   {% endif %}