chiark / gitweb /
~cjwatson / blog.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 628eedd)
theme: reduce indentation of the markup a bit.
authorVladimír Vondruš <mosra@centrum.cz>
Tue, 24 Oct 2017 10:34:45 +0000 (12:34 +0200)
committerVladimír Vondruš <mosra@centrum.cz>
Tue, 24 Oct 2017 10:34:45 +0000 (12:34 +0200)
pelican-theme/templates/base.html patch | blob | history

diff --git a/pelican-theme/templates/base.html b/pelican-theme/templates/base.html
index b93ac9104371474be8e2c2bf51aa57e94bcdeab2..8124b170c76e968addc42123efa03d0b601cacc1 100644 (file)
--- a/pelican-theme/templates/base.html
+++ b/pelican-theme/templates/base.html
@@ -20,134 +20,130 @@
   {% endblock head %}
 </head>
 <body>
-<header>
-  <nav id="navigation"{% if page and page.landing and page.cover %} class="m-navbar-landing"{% endif %}{% if article and article.cover %} class="m-navbar-jumbo"{% endif %}>
-    <div class="m-container">
-      <div class="m-row">
-        <a href="{{ SITEURL }}/" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">
-          {%- if SITE_LOGO %}<img src="{{ SITE_LOGO }}" />{% endif -%}
-          {{- SITE_LOGO_TEXT -}}
-        </a>
-        <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right">&#9776;</a>
-        <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right">&#9776;</a>
-        <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
-          <div class="m-row">
-            <ol class="m-col-t-6 m-col-m-none">
-              {% for title, link, slug, sub in LINKS_NAVBAR1 %}
-              <li>
-                <a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a>
-                {% if sub %}
-                <ol>
-                  {% for title, link, slug in sub %}
-                  <li><a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
-                  {% endfor %}
-                </ol>
-                {% endif %}
-              </li>
-              {% endfor %}
-            </ol>
-            <ol class="m-col-t-6 m-col-m-none">
-              {% for title, link, slug, sub in LINKS_NAVBAR2 %}
-              <li>
-                <a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a>
-                {% if sub %}
-                <ol>
-                  {% for title, link, slug in sub %}
-                  <li><a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
-                  {% endfor %}
-                </ol>
-                {% endif %}
-              </li>
-              {% endfor %}
-            </ol>
-          </div>
+<header><nav id="navigation"{% if page and page.landing and page.cover %} class="m-navbar-landing"{% endif %}{% if article and article.cover %} class="m-navbar-jumbo"{% endif %}>
+  <div class="m-container">
+    <div class="m-row">
+      <a href="{{ SITEURL }}/" id="m-navbar-brand" class="m-col-t-9 m-col-m-none m-left-m">
+        {%- if SITE_LOGO %}<img src="{{ SITE_LOGO }}" />{% endif -%}
+        {{- SITE_LOGO_TEXT -}}
+      </a>
+      <a id="m-navbar-show" href="#navigation" title="Show navigation" class="m-col-t-3 m-hide-m m-text-right">&#9776;</a>
+      <a id="m-navbar-hide" href="#" title="Hide navigation" class="m-col-t-3 m-hide-m m-text-right">&#9776;</a>
+      <div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m">
+        <div class="m-row">
+          <ol class="m-col-t-6 m-col-m-none">
+            {% for title, link, slug, sub in LINKS_NAVBAR1 %}
+            <li>
+              <a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a>
+              {% if sub %}
+              <ol>
+                {% for title, link, slug in sub %}
+                <li><a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
+                {% endfor %}
+              </ol>
+              {% endif %}
+            </li>
+            {% endfor %}
+          </ol>
+          <ol class="m-col-t-6 m-col-m-none">
+            {% for title, link, slug, sub in LINKS_NAVBAR2 %}
+            <li>
+              <a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a>
+              {% if sub %}
+              <ol>
+                {% for title, link, slug in sub %}
+                <li><a href="{{ link }}"{% if slug == page_slug %} id="m-navbar-current"{% endif %}>{{ title }}</a></li>
+                {% endfor %}
+              </ol>
+              {% endif %}
+            </li>
+            {% endfor %}
+          </ol>
         </div>
       </div>
     </div>
-  </nav>
-</header>
+  </div>
+</nav></header>
 <main>
-  {% block main %}
-  {% endblock %}
+{% block main %}
+{% endblock %}
 </main>
-<footer>
-  <nav>
-    <div class="m-container">
-      <div class="m-row">
-        <div class="m-col-s-3 m-col-t-6">
-          {% if LINKS_FOOTER1 %}
-          <h3>
-            {%- if LINKS_FOOTER1[0][1] %}<a href="{{ LINKS_FOOTER1[0][1] }}">{% endif %}
-            {{- LINKS_FOOTER1[0][0] -}}
-            {% if LINKS_FOOTER1[0][1] -%}</a>{% endif -%}
-          </h3>
-          <ul>
-            {% for title, link in LINKS_FOOTER1 %}{% if loop.index0 != 0 %}
-            <li><a href="{{ link }}">{{ title }}</a></li>
-            {% endif %}{% endfor %}
-          </ul>
-          {% endif %}
-        </div>
-        <div class="m-col-s-3 m-col-t-6">
-          {% if LINKS_FOOTER2 %}
-          <h3>
-            {%- if LINKS_FOOTER2[0][1] %}<a href="{{ LINKS_FOOTER2[0][1] }}">{% endif %}
-            {{- LINKS_FOOTER2[0][0] -}}
-            {% if LINKS_FOOTER2[0][1] %}</a>{% endif -%}
-          </h3>
-          <ul>
-            {% for title, link in LINKS_FOOTER2 %}{% if loop.index0 != 0 %}
-            <li><a href="{{ link }}">{{ title }}</a></li>
-            {% endif %}{% endfor %}
-          </ul>
-          {% endif %}
-        </div>
-        <div class="m-clearfix-t"></div>
-        <div class="m-col-s-3 m-col-t-6">
-          {% if LINKS_FOOTER3 %}
-          <h3>
-            {%- if LINKS_FOOTER3[0][1] %}<a href="{{ LINKS_FOOTER3[0][1] }}">{% endif %}
-            {{- LINKS_FOOTER3[0][0] -}}
-            {% if LINKS_FOOTER3[0][1] %}</a>{% endif -%}
-          </h3>
-          <ul>
-            {% for title, link in LINKS_FOOTER3 %}{% if loop.index0 != 0 %}
-            <li><a href="{{ link }}">{{ title }}</a></li>
-            {% endif %}{% endfor %}
-          </ul>
-          {% endif %}
-        </div>
-        <div class="m-col-s-3 m-col-t-6">
-          {% if LINKS_FOOTER4 %}
-          <h3>
-            {%- if LINKS_FOOTER4[0][1] %}<a href="{{ LINKS_FOOTER4[0][1] }}">{% endif %}
-            {{- LINKS_FOOTER4[0][0] -}}
-            {% if LINKS_FOOTER4[0][1] %}</a>{% endif -%}
-          </h4>
-          <ul>
-            {% for title, link in LINKS_FOOTER4 %}{% if loop.index0 != 0 %}
-            <li><a href="{{ link }}">{{ title }}</a></li>
-            {% endif %}{% endfor %}
-          </ul>
-          {% else %}
-          <h3><a href="{{ BLOGURL }}">Blog</a></h3>
-          <ul>
-            {% for cat, null in categories %}
-            <li><a href="{{ cat.url }}">{{ cat }}</a></li>
-            {% endfor %}
-          </ul>
-          {% endif %}
-        </div>
+<footer><nav>
+  <div class="m-container">
+    <div class="m-row">
+      <div class="m-col-s-3 m-col-t-6">
+        {% if LINKS_FOOTER1 %}
+        <h3>
+          {%- if LINKS_FOOTER1[0][1] %}<a href="{{ LINKS_FOOTER1[0][1] }}">{% endif %}
+          {{- LINKS_FOOTER1[0][0] -}}
+          {% if LINKS_FOOTER1[0][1] -%}</a>{% endif -%}
+        </h3>
+        <ul>
+          {% for title, link in LINKS_FOOTER1 %}{% if loop.index0 != 0 %}
+          <li><a href="{{ link }}">{{ title }}</a></li>
+          {% endif %}{% endfor %}
+        </ul>
+        {% endif %}
       </div>
-      <div class="m-row">
-        <div class="m-col-l-10 m-push-l-1">
-          {% if FINE_PRINT %}
-          {{ FINE_PRINT|render_rst|indent(10) }}
-          {% endif %}
-        </div>
+      <div class="m-col-s-3 m-col-t-6">
+        {% if LINKS_FOOTER2 %}
+        <h3>
+          {%- if LINKS_FOOTER2[0][1] %}<a href="{{ LINKS_FOOTER2[0][1] }}">{% endif %}
+          {{- LINKS_FOOTER2[0][0] -}}
+          {% if LINKS_FOOTER2[0][1] %}</a>{% endif -%}
+        </h3>
+        <ul>
+          {% for title, link in LINKS_FOOTER2 %}{% if loop.index0 != 0 %}
+          <li><a href="{{ link }}">{{ title }}</a></li>
+          {% endif %}{% endfor %}
+        </ul>
+        {% endif %}
+      </div>
+      <div class="m-clearfix-t"></div>
+      <div class="m-col-s-3 m-col-t-6">
+        {% if LINKS_FOOTER3 %}
+        <h3>
+          {%- if LINKS_FOOTER3[0][1] %}<a href="{{ LINKS_FOOTER3[0][1] }}">{% endif %}
+          {{- LINKS_FOOTER3[0][0] -}}
+          {% if LINKS_FOOTER3[0][1] %}</a>{% endif -%}
+        </h3>
+        <ul>
+          {% for title, link in LINKS_FOOTER3 %}{% if loop.index0 != 0 %}
+          <li><a href="{{ link }}">{{ title }}</a></li>
+          {% endif %}{% endfor %}
+        </ul>
+        {% endif %}
+      </div>
+      <div class="m-col-s-3 m-col-t-6">
+        {% if LINKS_FOOTER4 %}
+        <h3>
+          {%- if LINKS_FOOTER4[0][1] %}<a href="{{ LINKS_FOOTER4[0][1] }}">{% endif %}
+          {{- LINKS_FOOTER4[0][0] -}}
+          {% if LINKS_FOOTER4[0][1] %}</a>{% endif -%}
+        </h4>
+        <ul>
+          {% for title, link in LINKS_FOOTER4 %}{% if loop.index0 != 0 %}
+          <li><a href="{{ link }}">{{ title }}</a></li>
+          {% endif %}{% endfor %}
+        </ul>
+        {% else %}
+        <h3><a href="{{ BLOGURL }}">Blog</a></h3>
+        <ul>
+          {% for cat, null in categories %}
+          <li><a href="{{ cat.url }}">{{ cat }}</a></li>
+          {% endfor %}
+        </ul>
+        {% endif %}
+      </div>
+    </div>
+    <div class="m-row">
+      <div class="m-col-l-10 m-push-l-1">
+        {% if FINE_PRINT %}
+        {{ FINE_PRINT|render_rst|indent(10) }}
+        {% endif %}
       </div>
     </div>
-  </nav>
-</footer>
+  </div>
+</nav></footer>
 </body>
 </html>
Colin Watson's blog