Apply prettier and djlint

content/pages/about.md

@@ -15,6 +15,7 @@ Favorite short stories that I think everyone should read: [The Last Question](ht
 - User ad1217 in most places
 
 ### Some other stuff I host on this server
+
 - [A calendar of my classes, autogenerated](/WPI_Classes.ics/)
 - [My git repos (including dotfiles) which are not on github](/cgit/)
 

theme-fred/static/css/main.css

@@ -13,15 +13,15 @@
 @import url("pygment.css");
 
 body {
-  background: #1E1E1E;
+  background: #1e1e1e;
-  color: #EEE;
+  color: #eee;
   font: 15px Hoefler Text, bodyfont, serif;
   max-width: 50em;
   margin: 20px 20px 0 64px;
 }
 
 h1 {
-  color: #F00;
+  color: #f00;
   font-family: Helvetica, sans-serif;
   font-size: 1.5em;
   font-weight: normal;
@@ -29,19 +29,19 @@ h1 {
 }
 
 h2 {
-  color: #DDD;
+  color: #ddd;
   font-family: Helvetica, sans-serif;
   font-size: 1.3em;
 }
 
 h3 {
-  color: #CCC;
+  color: #ccc;
   font-family: Helvetica, sans-serif;
   font-size: 1em;
 }
 
 h4 {
-  color: #CCC;
+  color: #ccc;
   font-family: Helvetica, sans-serif;
   font-size: 0.9em;
 }
@@ -52,7 +52,8 @@ time {
   font-variant: small-caps;
 }
 
-#site-title, #site-title:visited{
+#site-title,
+#site-title:visited {
   color: #ddd;
   font-size: 150%;
 }
@@ -78,7 +79,7 @@ img {
 }
 
 blockquote {
-  border-left: 1px solid #A5ABAB;
+  border-left: 1px solid #a5abab;
   margin: 0px;
   padding: 0 12px 0 12px;
 }
@@ -105,19 +106,21 @@ a:hover {
 }
 
 a:visited {
-  color: #6F6144;
+  color: #6f6144;
 }
 
 a:visited:hover {
-  background-color: #F60;
+  background-color: #f60;
   color: white;
 }
 
-ul, ol {
+ul,
-  padding: .5em 0em 1em 3.2em;
+ol {
+  padding: 0.5em 0em 1em 3.2em;
 }
 
-ul li, ol li {
+ul li,
+ol li {
   line-height: 30px;
   padding: 6px 0 0 0;
 }
@@ -128,8 +131,9 @@ strong {
   font-weight: bold;
 }
 
-tt, pre {
+tt,
-  background-color: #2A2A2A;
+pre {
+  background-color: #2a2a2a;
   font-family: Inconsolata, Monaco, monospace;
   line-height: 1.2em;
 }
@@ -163,8 +167,8 @@ header a#page-title {
 }
 
 footer {
-  background: #2A2A2A;
+  background: #2a2a2a;
-  color: #CCC;
+  color: #ccc;
   font-family: helvetica, sans-serif;
   font-size: 13px;
   letter-spacing: 4px;

theme-fred/static/css/pygment.css

@@ -1,12 +1,12 @@
 .hll {
-background-color:#FFFFCC;
+  background-color: #ffffcc;
 }
 .c {
   color: #408090;
   font-style: italic;
 }
 .err {
-border:1px solid #FF0000;
+  border: 1px solid #ff0000;
 }
 .k {
   color: #007020;
@@ -27,30 +27,30 @@ color:#408090;
   font-style: italic;
 }
 .cs {
-background-color:#FFF0F0;
+  background-color: #fff0f0;
   color: #408090;
 }
 .gd {
-color:#A00000;
+  color: #a00000;
 }
 .ge {
   font-style: italic;
 }
 .gr {
-color:#FF0000;
+  color: #ff0000;
 }
 .gh {
   color: #000080;
   font-weight: bold;
 }
 .gi {
-color:#00A000;
+  color: #00a000;
 }
 .go {
   color: #303030;
 }
 .gp {
-color:#C65D09;
+  color: #c65d09;
   font-weight: bold;
 }
 .gs {
@@ -61,7 +61,7 @@ color:#800080;
   font-weight: bold;
 }
 .gt {
-color:#0040D0;
+  color: #0040d0;
 }
 .kc {
   color: #007020;
@@ -89,41 +89,41 @@ color:#902000;
   color: #208050;
 }
 .s {
-color:#4070A0;
+  color: #4070a0;
 }
 .na {
-color:#4070A0;
+  color: #4070a0;
 }
 .nb {
   color: #007020;
 }
 .nc {
-color:#0E84B5;
+  color: #0e84b5;
   font-weight: bold;
 }
 .no {
-color:#60ADD5;
+  color: #60add5;
 }
 .nd {
   color: #555555;
   font-weight: bold;
 }
 .ni {
-color:#D55537;
+  color: #d55537;
   font-weight: bold;
 }
 .ne {
   color: #007020;
 }
 .nf {
-color:#10D0E0;
+  color: #10d0e0;
 }
 .nl {
   color: #002070;
   font-weight: bold;
 }
 .nn {
-color:#0E84B5;
+  color: #0e84b5;
   font-weight: bold;
 }
 .nt {
@@ -131,14 +131,14 @@ color:#062873;
   font-weight: bold;
 }
 .nv {
-color:#BB60D5;
+  color: #bb60d5;
 }
 .ow {
   color: #007020;
   font-weight: bold;
 }
 .w {
-color:#BBBBBB;
+  color: #bbbbbb;
 }
 .mf {
   color: #208050;
@@ -153,37 +153,37 @@ color:#208050;
   color: #208050;
 }
 .sb {
-color:#4070A0;
+  color: #4070a0;
 }
 .sc {
-color:#4070A0;
+  color: #4070a0;
 }
 .sd {
-color:#4070A0;
+  color: #4070a0;
   font-style: italic;
 }
 .s2 {
-color:#4070A0;
+  color: #4070a0;
 }
 .se {
-color:#4070A0;
+  color: #4070a0;
   font-weight: bold;
 }
 .sh {
-color:#4070A0;
+  color: #4070a0;
 }
 .si {
-color:#70A0D0;
+  color: #70a0d0;
   font-style: italic;
 }
 .sx {
-color:#C65D09;
+  color: #c65d09;
 }
 .sr {
   color: #235388;
 }
 .s1 {
-color:#4070A0;
+  color: #4070a0;
 }
 .ss {
   color: #517918;
@@ -192,13 +192,13 @@ color:#517918;
   color: #007020;
 }
 .vc {
-color:#BB60D5;
+  color: #bb60d5;
 }
 .vg {
-color:#BB60D5;
+  color: #bb60d5;
 }
 .vi {
-color:#BB60D5;
+  color: #bb60d5;
 }
 .il {
   color: #208050;

theme-fred/templates/archives.html

@@ -2,11 +2,14 @@
 {% block content %}
     <section id="content" class="body">
         <h1>Archives for {{ SITENAME }}</h1>
-
         <dl>
             {% for article in dates %}
-    <dt>{{ article.locale_date }}</dt>
+                <dt>
-    <dd><a href='{{ article.url }}'>{{ article.title }}</a></dd>
+                    {{ article.locale_date }}
+                </dt>
+                <dd>
+                    <a href='{{ article.url }}'>{{ article.title }}</a>
+                </dd>
             {% endfor %}
         </dl>
     </section>

theme-fred/templates/article.html

@@ -4,13 +4,11 @@
     {% include 'article_infos.html' %}
     <article>
         {{ article.content }}
-
+        <p id="cat-tags">
-    <p id="cat-tags"> category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
+            category: <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
             {% if article.tags %}
                 tags:
-			{% for tag in article.tags %}
+                {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag | escape }}</a>{% endfor %}
-				<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag | escape }}</a>
-			{% endfor %}
             {% endif %}
         </p>
     </article>

theme-fred/templates/article_infos.html

@@ -1,4 +1,6 @@
 <header>
-    <h1><a href="{{ SITEURL }}/{{ article.url }}" id="page-title">{{ article.title }}</a></h1>
+    <h1>
+        <a href="{{ SITEURL }}/{{ article.url }}" id="page-title">{{ article.title }}</a>
+    </h1>
     {% if not HIDE_DATE %}<time datetime="{{ article.date.isoformat() }}">{{ article.locale_date }}</time>{% endif %}
 </header>

theme-fred/templates/base.html

@@ -1,46 +1,57 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
+        <title>
+            {% block title %}{{ SITENAME }}{% endblock %}
+        </title>
         <meta charset="utf-8" />
-        <link rel="stylesheet" href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}" type="text/css" />
+        <link rel="stylesheet"
-        <link href="{{ SITEURL }}/{{ FEED_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} ATOM Feed" />
+              href="{{ SITEURL }}/theme/css/{{ CSS_FILE }}"
+              type="text/css"/>
+        <link href="{{ SITEURL }}/{{ FEED_ATOM }}"
+              type="application/atom+xml"
+              rel="alternate"
+              title="{{ SITENAME }} ATOM Feed"/>
         {% if FEED_RSS %}
-        <link href="{{ SITEURL }}/{{ FEED_RSS }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+            <link href="{{ SITEURL }}/{{ FEED_RSS }}"
+                  type="application/atom+xml"
+                  rel="alternate"
+                  title="{{ SITENAME }} RSS Feed"/>
         {% endif %}
-
         <!--[if IE]>
 <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-
         <!--[if lte IE 7]>
                 <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie.css"/>
 <script src="{{ SITEURL }}/js/IE8.js" type="text/javascript"></script><![endif]-->
-
         <!--[if lt IE 7]>
                 <link rel="stylesheet" type="text/css" media="all" href="{{ SITEURL }}/css/ie6.css"/><![endif]-->
     </head>
-
     <body>
         <header>
             <a href="{{ SITEURL }}" id="site-title">{{ SITENAME }}</a>
-        <div id="sitesubtitle">{% if SITESUBTITLE %} {{ SITESUBTITLE }}{% endif %}</div>
+            <div id="sitesubtitle">
+                {% if SITESUBTITLE %}{{ SITESUBTITLE }}{% endif %}
+            </div>
         </header>
-
+        {% block content %}{% endblock %}
-
-    {% block content %}
-    {% endblock %}
-
         <footer>
             <nav>
                 <ul>
                     {% for page in pages %}
-                    <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a>{% if not loop.last %} ::{% endif %}</li>
+                        <li>
+                            <a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a>
+                            {% if not loop.last %}::{% endif %}
+                        </li>
                     {% endfor %}
                     {% if categories|length > 1 %}
-                    <li>:: <a href="{{ SITEURL }}/categories.html">Categories</a></li>
+                        <li>
+                            :: <a href="{{ SITEURL }}/categories.html">Categories</a>
+                        </li>
                     {% endif %}
                     {% if tags|length > 1 %}
-                    <li>:: <a href="{{ SITEURL }}/tags.html">Tags</a></li>
+                        <li>
+                            :: <a href="{{ SITEURL }}/tags.html">Tags</a>
+                        </li>
                     {% endif %}
                 </ul>
             </nav>

theme-fred/templates/categories.html

@@ -2,7 +2,9 @@
 {% block content %}
     <ul>
         {% for category, articles in categories %}
-    <li><a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a></li>
+            <li>
+                <a href="{{ SITEURL }}/{{ category.url }}">{{ category }}</a>
+            </li>
         {% endfor %}
     </ul>
 {% endblock %}

theme-fred/templates/index.html

@@ -8,11 +8,9 @@
                 <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
             </article>
         {% endfor %}
-
         {% if articles_page.has_other_pages() %}
             {% include 'pagination.html' %}
         {% endif %}
-
     {% else %}
         No articles.
     {% endif %}

theme-fred/templates/page.html

@@ -2,7 +2,9 @@
 {% block title %}{{ page.title }}{% endblock %}
 {% block content %}
     <header>
-    <h1><a href="{{ SITEURL }}/{{ page.slug }}" id="page-title">{{ page.title }}</a></h1>
+        <h1>
+            <a href="{{ SITEURL }}/{{ page.slug }}" id="page-title">{{ page.title }}</a>
+        </h1>
     </header>
     <article>
         {{ page.content }}

theme-fred/templates/taglist.html

@@ -1,2 +1,11 @@
-{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}</p>{% endif %}
+{% if article.tags %}
-{% if PDF_PROCESSOR %}<p><a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a></p>{% endif %}
+    <p>
+        tags:
+        {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>{% endfor %}
+    </p>
+{% endif %}
+{% if PDF_PROCESSOR %}
+    <p>
+        <a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">get the pdf</a>
+    </p>
+{% endif %}

theme-fred/templates/tags.html

@@ -2,8 +2,9 @@
 {% block content %}
     <ul>
         {% for tag, articles in tags %}
-    <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a></li>
+            <li>
+                <a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a>
+            </li>
         {% endfor %}
     </ul>
 {% endblock %}
-