Extend Search, Minify New Icons, Whitespace Cleanup

2 files changed, 20 insertions, 18 deletions

diff --git a/templates/base.html b/templates/base.html
index 3b0ee85..db3a71c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -41,8 +41,11 @@
       </div>
       {%- if config.build_search_index %}
       <div>
-        <form>
-          <input id="userinput" type="search" placeholder="Search" autocomplete="off">
+        <form onsubmit="return goSearch()">
+          <div class="searchd">
+            <input id="userinput" type="search" placeholder="Search" autocomplete="off">
+            <button type="submit" title="Search"><i class="svgs search"></i></button>
+          </div>
           <div><div id="suggestions"></div></div>
         </form>
       </div>
@@ -79,15 +82,14 @@
         <a href="{{ get_url(path=i.url, trailing_slash=i.slash) }}">{{ i.name }}</a> &nbsp;
         {%- endfor %}
       </p>
-      <p>{% for i in config.extra.menu_footer %}<a href="{{ get_url(path=i.url, trailing_slash=i.slash) }}">{{ i.name }}</a> &nbsp; {% endfor %}</p>
-      {# Optional footer credit #}
-      {% if config.extra.footer_credit | default(value=true) %}
-        {% if config.extra.footer_credit_override %}
-          {{ config.extra.footer_credit_override | safe }}
-        {% else %}
-          <p>Powered by <a href="https://www.getzola.org/">Zola</a> and <a href="https://github.com/jieiku/abridge/">Abridge</a></p>
-        {% endif %}
-      {% endif %}
+
+      {%- if config.extra.footer_credit | default(value=true) %}
+      {%- if config.extra.footer_credit_override %}
+      {{ config.extra.footer_credit_override | safe }}
+      {%- else %}    
+      <p>Powered by <a href="https://www.getzola.org/">Zola</a> and <a href="https://github.com/jieiku/abridge/">Abridge</a></p>
+      {%- endif %}
+      {%- endif %}
     </center>
   </footer>
 {%- endblock footer %}
diff --git a/templates/macros/social.html b/templates/macros/social.html
index ecdfef5..05eeb82 100644
--- a/templates/macros/social.html
+++ b/templates/macros/social.html
@@ -11,20 +11,18 @@
           <a href="https://{{ social_config.element }}/" target="_blank"><span class="svg element" title="Element"></span></a>{% endif %}
           {%- if social_config.matrix %}
           <a href="https://{{ social_config.matrix }}/" target="_blank"><span class="svg matrix" title="Matrix"></span></a>{% endif %}
-          {%- if social_config.buymeacoffee %}
-          <a href="https://www.buymeacoffee.com/{{ social_config.buymeacoffee }}" target="_blank"><span class="svg buymeacoffee" title="Buy Me A Coffee"></span></a>{% endif %}
           {%- if social_config.twitter %}
           <a href="https://twitter.com/{{ social_config.twitter }}/" target="_blank"><span class="svg twitter" title="Twitter"></span></a>{% endif %}
           {%- if social_config.facebook %}
           <a href="https://www.facebook.com/{{ social_config.facebook }}/" target="_blank"><span class="svg facebook" title="Facebook"></span></a>{% endif %}
           {%- if social_config.linkedin %}
           <a href="https://www.linkedin.com/in/{{ social_config.linkedin }}/" target="_blank"><span class="svg linkedin" title="LinkedIn"></span></a>{% endif %}
+          {%- if social_config.researchgate %}
+          <a href="https://www.researchgate.net/profile/{{ social_config.researchgate }}/" target="_blank"><span class="svg researchgate" title="ResearchGate"></span></a>{% endif %}
           {%- if social_config.gitlab %}
           <a href="https://gitlab.com/{{ social_config.gitlab }}/" target="_blank"><span class="svg gitlab" title="Gitlab"></span></a>{% endif %}
           {%- if social_config.github %}
           <a href="https://github.com/{{ social_config.github }}/" target="_blank"><span class="svg github" title="Github"></span></a>{% endif %}
-          {%- if social_config.github_sponsor %}
-          <a href="https://github.com/sponsors/{{ social_config.github_sponsor }}/" target="_blank"><span class="svg github-sponsor" title="Github"></span></a>{% endif %}
           {%- if social_config.bitbucket %}
           <a href="https://bitbucket.org/{{ social_config.bitbucket }}/" target="_blank"><span class="svg bitbucket" title="Bitbucket"></span></a>{% endif %}
           {%- if social_config.python %}
@@ -41,7 +39,9 @@
           <a href="https://www.twitch.tv/{{ social_config.twitch }}/" target="_blank"><span class="svg twitch" title="Twitch"></span></a>{% endif %}
           {%- if social_config.youtube %}
           <a href="https://www.youtube.com/channel/{{ social_config.youtube }}/" target="_blank"><span class="svg youtube" title="YouTube"></span></a>{% endif %}
-          {%- if social_config.researchgate %}
-          <a href="https://www.researchgate.net/profile/{{ social_config.researchgate }}/" target="_blank"><span class="svg researchgate" title="ResearchGate"></span></a>{% endif %}
+          {%- if social_config.buymeacoffee %}
+          <a href="https://www.buymeacoffee.com/{{ social_config.buymeacoffee }}" target="_blank"><span class="svg buymeacoffee" title="Buy Me A Coffee"></span></a>{% endif %}
+          {%- if social_config.github_sponsor %}
+          <a href="https://github.com/sponsors/{{ social_config.github_sponsor }}/" target="_blank"><span class="svg github-sponsor" title="GitHub Sponsor"></span></a>{% endif %}
         </span>
-{%- endmacro %}
\ No newline at end of file
+{%- endmacro %}