Improve Icons, Spacing, Pagination

2 files changed, 64 insertions, 12 deletions

diff --git a/templates/base.html b/templates/base.html
index bdb2537..8c74dd6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -49,7 +49,7 @@
           <li><h2><a href="{{ get_url(path=i.url, trailing_slash=i.slash) }}{%- if i.slash and config.extra.uglyurls %}index.html{%- endif %}">{{ i.name | safe }}</a></h2> </li>
           {%- endfor %}
           {%- if config.extra.js_theme %}
-          <li class="js">{%- if config.extra.icon_contrast %}<i type="reset" id="mode" class="{{ config.extra.icon_contrast }}"></i>{%- else %}<i type="reset" id="mode" class="svgh svgs contrast"></i>{%- endif %}</li>
+          <li class="js">{%- if config.extra.icon_contrast %}<i type="reset" id="mode" class="{{ config.extra.icon_contrast }}"></i>{%- else %}<i type="reset" id="mode" class="mode">&#9728;</i>{%- endif %}</li>
           {%- endif %}
         </ul>
       </div>
@@ -58,7 +58,7 @@
         <form class="js" name="goSearch">
           <div class="searchd">
             <input id="userinput" type="text" placeholder="Search" autocomplete="off" />
-            <button type="submit" title="Search">{%- if config.extra.icon_search %}<i class="{{ config.extra.icon_search }}"></i>{%- else %}<i class="svgs search"></i>{%- endif %}</button>
+            <button type="submit" title="Search">{%- if config.extra.icon_search %}<i class="{{ config.extra.icon_search }}"></i>{%- else %}<span class="si">&#8981;</span>{%- endif %}</button>
           </div>
           <div><div id="suggestions"></div></div>
         </form>
diff --git a/templates/macros/macros.html b/templates/macros/macros.html
index 68227d8..cb654e8 100644
--- a/templates/macros/macros.html
+++ b/templates/macros/macros.html
@@ -126,21 +126,73 @@
             {%- endif %}
       <nav>
         <ul>
-          {% if paginator.previous %}<li><a href="{{ paginator.first | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{%- if config.extra.icon_first %}<i class="{{ config.extra.icon_first }}"></i>{%- else %}&laquo;{%- endif %}</a></li>{% else %}<li><span class="off">{%- if config.extra.icon_first %}<i class="{{ config.extra.icon_first }}"></i>{%- else %}&laquo;{%- endif %}</span></li>{% endif %}
-          {% if paginator.previous %}<li><a href="{{ paginator.previous | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{%- if config.extra.icon_prev %}<i class="{{ config.extra.icon_prev }}"></i>{%- else %}&lsaquo;{%- endif %}</a></li>{% else %}<li><span class="off">{%- if config.extra.icon_prev %}<i class="{{ config.extra.icon_prev }}"></i>{%- else %}&lsaquo;{%- endif %}</span></li>{% endif %}
-          {%- for i in range(start=start, end=end+1) %}
-          <li>
+        {%- if paginator.previous -%}
+          <li><a class="on outp" href="{{ paginator.first | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">
+          {%- if config.extra.icon_first -%}<i class="{{ config.extra.icon_first }}" alt="First Page"></i>
+          {%- else -%}&#10096;
+          {%- endif -%}
+          </a></li>
+        {%- else -%}
+          <li><span class="off outp">
+          {%- if config.extra.icon_first -%}<i class="{{ config.extra.icon_first }}" alt="First Page"></i>
+          {%- else -%}&#10096;
+          {%- endif -%}
+          </span></li>
+        {%- endif -%}
+
+        {%- if paginator.previous -%}
+          <li><a class="on outp" href="{{ paginator.previous | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">
+          {%- if config.extra.icon_prev -%}<i class="{{ config.extra.icon_prev }}" alt="Previous Page"></i>
+          {%- else -%}&#10092;
+          {%- endif -%}
+          </a></li>
+        {%- else -%}
+          <li><span class="off outp">
+          {%- if config.extra.icon_prev -%}<i class="{{ config.extra.icon_prev }}" alt="Previous Page"></i>
+          {%- else -%}&#10092;
+          {%- endif -%}
+          </span></li>
+        {%- endif -%}
+
+        {%- for i in range(start=start, end=end+1) -%}
+          <li class="inp">
             {%- if i == paginator.current_index -%}
-            <a class="cnav" href="#">{{i}}</a>
+            <a class="on cnav" href="#">{{i}}</a>
             {%- elif i > 1 -%}
-            <a href="{{ paginator.base_url | safe }}{{ i ~ '/' }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{i}}</a>
+            <a class="on" href="{{ paginator.base_url | safe }}{{ i ~ '/' }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{i}}</a>
             {%- else -%}
-            <a href="{{ paginator.first | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ i }}</a>
+            <a class="on" href="{{ paginator.first | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{{ i }}</a>
             {%- endif -%}
           </li>
-          {%- endfor %}
-          {% if paginator.next %}<li><a href="{{ paginator.next | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{%- if config.extra.icon_next %}<i class="{{ config.extra.icon_next }}"></i>{%- else %}&rsaquo;{%- endif %}</a></li>{% else %}<li><span class="off">{%- if config.extra.icon_next %}<i class="{{ config.extra.icon_next }}"></i>{%- else %}&rsaquo;{%- endif %}</span></li>{% endif %}
-          {% if paginator.next %}<li><a href="{{ paginator.last | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">{%- if config.extra.icon_last %}<i class="{{ config.extra.icon_last }}"></i>{%- else %}&raquo;{%- endif %}</a></li>{% else %}<li><span class="off">{%- if config.extra.icon_last %}<i class="{{ config.extra.icon_last }}"></i>{%- else %}&raquo;{%- endif %}</span></li>{% endif %}
+        {%- endfor -%}
+
+        {%- if paginator.next -%}
+          <li><a class="on outp" href="{{ paginator.next | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">
+          {%- if config.extra.icon_next -%}<i class="{{ config.extra.icon_next }}" alt="Next Page"></i>
+          {%- else -%}&#10093;
+          {%- endif -%}
+          </a></li>
+        {%- else -%}
+          <li><span class="off outp">
+          {%- if config.extra.icon_next -%}<i class="{{ config.extra.icon_next }}" alt="Next Page"></i>
+          {%- else -%}&#10093;
+          {%- endif -%}
+          </span></li>
+        {%- endif -%}
+
+        {%- if paginator.next -%}
+          <li><a class="on outp" href="{{ paginator.last | safe }}{%- if config.extra.uglyurls %}index.html{%- endif %}">
+          {%- if config.extra.icon_last -%}<i class="{{ config.extra.icon_last }}" alt="Last Page"></i>
+          {%- else -%}&#10097;
+          {%- endif -%}
+          </a></li>
+        {%- else -%}
+          <li><span class="off outp">
+          {%- if config.extra.icon_last -%}<i class="{{ config.extra.icon_last }}" alt="Last Page"></i>
+          {%- else -%}&#10097;
+          {%- endif -%}
+          </span></li>
+        {%- endif -%}
         </ul>
       </nav>
   {%- endif %}