tagging and sidebar fixes

diff --git a/content/2012/an-idle-wish-for-a-future-star-trek-series.md b/content/2012/an-idle-wish-for-a-future-star-trek-series.md
index 962f586e0f9a0abafc5828468ac3f9e41b9eae8c..6a4534ae4282bbd79e6fd11c19bc3bd9d6ace6db 100644 (file)
--- a/content/2012/an-idle-wish-for-a-future-star-trek-series.md
+++ b/content/2012/an-idle-wish-for-a-future-star-trek-series.md
@@ -1,8 +1,8 @@
 Title: An Idle Wish for a Future <em>Star Trek</em> Series
 Date: 2012-11-17 19:00
 Status: published
-Category: arts &amp; culture
-Tags: sex &amp; gender, Star Trek
+Category: arts & culture
+Tags: sex & gender, Star Trek
 Slug: an-idle-wish-for-a-future-star-trek-series
 
 At some point, the first officer man should say, "When I was a little girl ..." and then everyone looks at him funny, and he says, "What, didn't I ever tell you that I'm trans?" Everyone else: "_No!_" "Oh. Well, now you know."

diff --git a/content/2013/another-idle-wish-for-a-future-star-trek-series.md b/content/2013/another-idle-wish-for-a-future-star-trek-series.md
index c7ca32f9e18105d22553f4aafb5dce9811dfd168..3c2f99330e4e8cfbe08a210b6944992c13e152a4 100644 (file)
--- a/content/2013/another-idle-wish-for-a-future-star-trek-series.md
+++ b/content/2013/another-idle-wish-for-a-future-star-trek-series.md
@@ -1,7 +1,7 @@
 Title: Another Idle Wish for a Future <em>Star Trek</em> Series
 Date: 2013-11-17 17:54
 Status: published
-Category: arts &amp; culture
+Category: arts & culture
 Tags: Friendship Is Magic, Star Trek
 Slug: another-idle-wish-for-a-future-star-trek-series
 

diff --git a/content/2014/lexicographic.md b/content/2014/lexicographic.md
index 70a535e8d44b8e3383ad6835144a9a9f3739f5fb..c0472b546905a2854ca0a0329d157bd9e393f437 100644 (file)
--- a/content/2014/lexicographic.md
+++ b/content/2014/lexicographic.md
@@ -2,7 +2,7 @@ Title: Lexicographic
 Date: 2014-06-17 05:00
 Status: published
 Category: Uncategorized
-Tags: sex & gender
+Tags: sex & gender
 Slug: lexicographic
 
 "Here's a draft of the new sign-up form."

diff --git a/content/2014/twilight-sparkle-is-a-disaster-waiting-to-happen.md b/content/2014/twilight-sparkle-is-a-disaster-waiting-to-happen.md
index 54da6405a55db0489fbc962056ebfef622b27fae..78b9abd4cdac10cb6d507ab6b9a87defc4225134 100644 (file)
--- a/content/2014/twilight-sparkle-is-a-disaster-waiting-to-happen.md
+++ b/content/2014/twilight-sparkle-is-a-disaster-waiting-to-happen.md
@@ -1,7 +1,7 @@
 Title: Twilight Sparkle Is a Disaster Waiting to Happen
 Date: 2014-03-02 23:06
 Status: published
-Category: arts & culture
+Category: arts & culture
 Tags: Friendship Is Magic
 Slug: twilight-sparkle-is-a-disaster-waiting-to-happen
 

diff --git a/content/2014/yet-another-idle-wish-for-a-future-star-trek-series.md b/content/2014/yet-another-idle-wish-for-a-future-star-trek-series.md
index 61c20c51e0de270a66741b0be19a94c96949878a..294a1910525d4a1dc8e92461f926c857b2b90c5d 100644 (file)
--- a/content/2014/yet-another-idle-wish-for-a-future-star-trek-series.md
+++ b/content/2014/yet-another-idle-wish-for-a-future-star-trek-series.md
@@ -1,7 +1,7 @@
 Title: Yet Another Idle Wish for a Future <em>Star Trek</em> Series
 Date: 2014-11-17 05:00
 Status: published
-Category: arts &amp; culture
+Category: arts & culture
 Tags: Star Trek
 Slug: yet-another-idle-wish-for-a-future-star-trek-series
 

diff --git a/content/2015/electrolysis.md b/content/2015/electrolysis.md
index 2bcd36522626dcef983f20ce6dc16b777efb73e5..a4bab4d7839029154d030363c81c3d7af3b02561 100644 (file)
--- a/content/2015/electrolysis.md
+++ b/content/2015/electrolysis.md
@@ -2,7 +2,7 @@ Title: Electrolysis
 Date: 2015-07-03 11:14
 Status: published
 Category: Uncategorized
-Tags: sex & gender
+Tags: sex & gender
 Slug: electrolysis
 
 "Would it be _weird_ for a guy to get permanent hair removal on his face just because he doesn't like shaving?"

diff --git a/content/2015/pi-day-is-an-unholy-festival-of-sin-that-is-corrupting-our-children.md b/content/2015/pi-day-is-an-unholy-festival-of-sin-that-is-corrupting-our-children.md
index c0c1f248d5eba2c10efe9782995d9003e2d03064..f83ff3940eecdc3fea0a79ae5f349b0f014a37eb 100644 (file)
--- a/content/2015/pi-day-is-an-unholy-festival-of-sin-that-is-corrupting-our-children.md
+++ b/content/2015/pi-day-is-an-unholy-festival-of-sin-that-is-corrupting-our-children.md
@@ -1,7 +1,7 @@
 Title: "Pi Day" Is an Unholy Festival of Sin That Is Corrupting Our Children
 Date: 2015-03-14 03:14
 Status: published
-Category: arts & culture
+Category: arts & culture
 Slug: pi-day-is-an-unholy-festival-of-sin-that-is-corrupting-our-children
 
 Dear reader, it's the fourteenth day of the third month of the year, and if you're reading this blog, some charlatans or overenthusiastic youth (the subject of whose enthusiasm is not what they think it is) have probably tried to convince you to celebrate it as "Pi Day." You see (these quacks implored you) π is around 3.14, and March fourteenth is 3/14. And _furthermore_ (they may have put to you) furthermore _this_ year's Pi Day is special, because it's 3/14/15, which is like 3.1415! Why (an especially impudent few might have continued to venture), we should plan some grand spectacle on 9:26 a.m. on the day, which is like 3.1415926! With (and this is the part that is most inevitable and offensive) pie! Get it, because it sounds like _pi_ and is shaped like a circle?

diff --git a/content/2015/still-yet-another-idle-wish-for-a-future-star-trek-series.md b/content/2015/still-yet-another-idle-wish-for-a-future-star-trek-series.md
index d25a263f4f0af8fb0eabd4bd8c8660a9ad63425a..62927d8d9f0460ceff425fd59dff91ac9af8f8b6 100644 (file)
--- a/content/2015/still-yet-another-idle-wish-for-a-future-star-trek-series.md
+++ b/content/2015/still-yet-another-idle-wish-for-a-future-star-trek-series.md
@@ -1,7 +1,7 @@
 Title: Still Yet Another Idle Wish for a Future <em>Star Trek</em> Series
 Date: 2015-11-17 05:00
 Status: published
-Category: arts &amp; culture
+Category: arts & culture
 Tags: Star Trek
 Slug: still-yet-another-idle-wish-for-a-future-star-trek-series
 

diff --git a/content/2016/bayesian-gem.md b/content/2016/bayesian-gem.md
index 168473f2e6c519d48561a4d8298db056c1922c3c..5a5efc09abeb6c6943bd7ba0496401f63f9e455f 100644 (file)
--- a/content/2016/bayesian-gem.md
+++ b/content/2016/bayesian-gem.md
@@ -1,7 +1,7 @@
 Title: Bayesian Gem
 Date: 2016-05-12 05:00
 Status: published
-Category: arts & culture
+Category: arts & culture
 Tags: fanfiction, Steven Universe
 Slug: bayesian-gem
 

diff --git a/content/2016/book-recommendations-i.md b/content/2016/book-recommendations-i.md
index 43d3858e657e306649b555122eee05abdc62f359..a3f346f4fc058611e981c8073c5148954a0f3d1b 100644 (file)
--- a/content/2016/book-recommendations-i.md
+++ b/content/2016/book-recommendations-i.md
@@ -2,7 +2,7 @@ Title: Book Recommendations I
 Date: 2016-09-18 23:55
 Status: published
 Category: Uncategorized
-Tags: sex & gender
+Tags: sex & gender
 Slug: book-recommendations-i
 
 kind of tempted to start [_haveyoureadMTiMBNoAT.com_](http://www.annelawrence.com/mtimb.html) to compete with goddam [_haveyoureadnevada.com_](http://haveyoureadnevada.com/), but it won't help

diff --git a/content/2016/disability.md b/content/2016/disability.md
index ac929857a8add8e7c782c783f1850ad86a7a341a..1a099852f58dc4787933229937747cb1e44f5e80 100644 (file)
--- a/content/2016/disability.md
+++ b/content/2016/disability.md
@@ -2,7 +2,7 @@ Title: Disability
 Date: 2016-01-05 05:00
 Status: published
 Category: Uncategorized
-Tags: sex & gender
+Tags: sex & gender
 Slug: disability
 
 "So this book is titled _Gender Matters: Training for Educators Working With Students With Disabilities_. And I'm like, 'Huh? Gender is a disability?'"

diff --git a/content/2016/falself.md b/content/2016/falself.md
index f05a487b5a21ba70bd7428be23003fe4ccbb83a9..748d71ceeeb08ced3cb378cb09c946502744a790 100644 (file)
--- a/content/2016/falself.md
+++ b/content/2016/falself.md
@@ -2,7 +2,7 @@ Title: Falself
 Date: 2016-08-08 22:48
 Status: published
 Category: Uncategorized
-Tags: sex & gender
+Tags: sex & gender
 Slug: falself
 
 _(somewhere in the Tumblrverse)_

diff --git a/content/2016/is-there-affirmative-action-for-incompetent-crossplay.md b/content/2016/is-there-affirmative-action-for-incompetent-crossplay.md
index fb992983c6d39db15b4a0f1ae472b53a56b6a2f5..8dc334284d29ffed7820aabc59a61b1519a1394b 100644 (file)
--- a/content/2016/is-there-affirmative-action-for-incompetent-crossplay.md
+++ b/content/2016/is-there-affirmative-action-for-incompetent-crossplay.md
@@ -1,8 +1,8 @@
 Title: Is There Affirmative Action for Incompetent Crossplay?
 Date: 2016-09-05 10:32
 Status: published
-Category: arts & culture
-Tags: cosplay, sex & gender, Steven Universe, timely Special Event
+Category: arts & culture
+Tags: cosplay, sex & gender, Steven Universe, timely Special Event
 Slug: is-there-affirmative-action-for-incompetent-crossplay
 
 So I was at [San Francisco Comic Con](http://sanfrancomiccon.com/) the other day. I don't think I find conventions themselves to be as fun as a lot of other people seem to (I didn't even last all of Saturday at [BABSCon 'fourteen and 'fifteen](http://zackmdavis.net/blog/2016/01/ideas-have-expirations/#babscon) before getting ponied out and BARTing home, and didn't even bother attending this year), but I had never cosplayed before, and had been thinking lately that I have exactly the right body type to play [Pearl](http://steven-universe.wikia.com/wiki/Pearl) from _Obnoxious Bad Decision Chil_—I mean, _Steven Universe_, on account of being my being tall, thin, white, and having a big nose. (She's even pretty flat-chested!) So I ordered [the Pearl dress from Hot Topic](http://www.hottopic.com/product/cartoon-network-steven-universe-pearl-dress/10619954.html) (I maybe should've gotten the XXXL instead of merely the XXL), a pink (really should be more peach, but close enough) wig, yellow gym shorts, and pink socks; improvised a gem from medical tape and the bowl of a plastic spoon; and set off Saturday morning to catch the train to the city and a short walk to the San Francisco Marriot Marquis.

diff --git a/content/2016/joined.md b/content/2016/joined.md
index 491c600f06c34bc2e2464fd5002a461347fcd75c..ae99fae78621b3ab484779eee300c6ab39f7c5c4 100644 (file)
--- a/content/2016/joined.md
+++ b/content/2016/joined.md
@@ -1,7 +1,7 @@
 Title: Joined
 Date: 2016-12-19 22:17
 Status: published
-Category: arts & culture
+Category: arts & culture
 Tags: cosplay, Star Trek, timely Special Event
 Slug: joined
 

diff --git a/content/2016/retrospective-review-of-the-imitation-game-2014.md b/content/2016/retrospective-review-of-the-imitation-game-2014.md
index 2edd2636b2df14bdc8a585ec2b3e84d4e29131d3..f56f058003f20a216bbb33c54a711d27b4ca3fb2 100644 (file)
--- a/content/2016/retrospective-review-of-the-imitation-game-2014.md
+++ b/content/2016/retrospective-review-of-the-imitation-game-2014.md
@@ -1,7 +1,7 @@
 Title: Retrospective Review of <em>The Imitation Game</em> (2014)
 Date: 2016-07-21 23:07
 Status: published
-Category: arts &amp; culture
+Category: arts & culture
 Slug: retrospective-review-of-the-imitation-game-2014
 
 Fun movie, but if we're [not going to try to accurately portray](http://www.scottaaronson.com/blog/?p=2096) the historical Turing, I preferred [Greg Egan's version](http://gregegan.customer.netspace.net.au/MISC/ORACLE/Oracle.html) where a time-traveling robot woman helps him cure cancer.

diff --git a/content/2016/wicked-transcendence-ii.md b/content/2016/wicked-transcendence-ii.md
index a4a58aca4ce9c350f2b6f4303f9c3261fe2c5aca..159ff1f49542685ed0a27dc9cd5e77ef076f774f 100644 (file)
--- a/content/2016/wicked-transcendence-ii.md
+++ b/content/2016/wicked-transcendence-ii.md
@@ -2,7 +2,7 @@ Title: Wicked Transcendence II
 Date: 2016-09-27 22:55
 Status: published
 Category: Uncategorized
-Tags: sex & gender
+Tags: sex & gender
 Slug: wicked-transcendence-ii
 
 went to the genderqueer support/discussion group at the Pacific Center [again](http://zackmdavis.net/blog/2016/07/wicked-transcendence/); showed up early to change into my Pearl dress (it would be a waste to only wear it [once](http://zackmdavis.net/blog/2016/09/is-there-affirmative-action-for-incompetent-crossplay/)) and surreptitiously slip a [copy of Anne Lawrence](http://zackmdavis.net/blog/2016/09/book-recommendations-i/) into the library

diff --git a/content/2016/wicked-transcendence.md b/content/2016/wicked-transcendence.md
index 92c5fad6b9a19ac5f91ec5025b024a1f62140ee5..4131e7d6cd426bb0cccd19114a548c218fb91c5e 100644 (file)
--- a/content/2016/wicked-transcendence.md
+++ b/content/2016/wicked-transcendence.md
@@ -2,7 +2,7 @@ Title: Wicked Transcendence
 Date: 2016-07-26 19:09
 Status: published
 Category: Uncategorized
-Tags: sex & gender
+Tags: sex & gender
 Slug: wicked-transcendence
 
 off to go check out the genderqueer support/discussion group (_my people_) and try to teach them about evopsych and the Blanchard typology

diff --git a/content/2017/a-desperate-fervent-wish-for-star-trek-discovery.md b/content/2017/a-desperate-fervent-wish-for-star-trek-discovery.md
index 7dd921efb00f62d6b974eab8397c728cdd33fe0e..62b82f5902d19c8042618ff0e7a550aca709cad0 100644 (file)
--- a/content/2017/a-desperate-fervent-wish-for-star-trek-discovery.md
+++ b/content/2017/a-desperate-fervent-wish-for-star-trek-discovery.md
@@ -1,7 +1,7 @@
 Title: A Desperate, Fervent Wish for <em>Star Trek: Discovery</em>
 Date: 2017-11-17 05:00
 Status: published
-Category: arts &amp; culture
+Category: arts & culture
 Tags: Star Trek
 Slug: a-desperate-fervent-wish-for-star-trek-discovery
 

diff --git a/content/2017/gems-will-be-gems.md b/content/2017/gems-will-be-gems.md
index 807c6cb49b4c866cf10f3ecf2a00f08a9a1b02c6..dadc906d73274198a05a2369adddb7da99ef1dbd 100644 (file)
--- a/content/2017/gems-will-be-gems.md
+++ b/content/2017/gems-will-be-gems.md
@@ -1,7 +1,7 @@
 Title: Gems Will Be Gems
 Date: 2017-05-28 14:08
 Status: published
-Category: arts & culture
+Category: arts & culture
 Tags: cosplay, Steven Universe
 Slug: gems-will-be-gems
 

diff --git a/content/2017/missing-books-iii.md b/content/2017/missing-books-iii.md
index 6264bb7281f2d8a4ec4dc037286ae92e832e2e30..64fca9dc7d3161248358d40b1733748c19b7b4f4 100644 (file)
--- a/content/2017/missing-books-iii.md
+++ b/content/2017/missing-books-iii.md
@@ -2,7 +2,7 @@ Title: Missing Books III
 Date: 2017-03-07 10:04
 Status: published
 Category: social science
-Tags: missing books, sex & gender
+Tags: missing books, sex & gender
 Slug: missing-books-iii
 
 _Everyday Applied Evolutionary Psychology, Except Ignoring Sex Differences Because We Know Blue Tribe Is Squeamish About That Part and We Respect Your Culture, Revised Second Edition_

diff --git a/content/2017/sworn-to-the-word.md b/content/2017/sworn-to-the-word.md
index 04a0fccdc062636563fa450de0bdc5a78db7b67c..7096afdf4444d8f40c1fc076668dcb069ab9f2eb 100644 (file)
--- a/content/2017/sworn-to-the-word.md
+++ b/content/2017/sworn-to-the-word.md
@@ -1,7 +1,7 @@
 Title: Sworn to the Word
 Date: 2017-02-25 15:11
 Status: published
-Category: arts & culture
+Category: arts & culture
 Tags: Steven Universe
 Slug: sworn-to-the-word
 

diff --git a/content/2017/wicked-transcendence-iii.md b/content/2017/wicked-transcendence-iii.md
index 6d2ebaabdc2b3c9f6dc10376b489537fd9aeb0bd..77a48b6087636604678f330191acb0bda1d365a0 100644 (file)
--- a/content/2017/wicked-transcendence-iii.md
+++ b/content/2017/wicked-transcendence-iii.md
@@ -2,7 +2,7 @@ Title: Wicked Transcendence III
 Date: 2017-03-15 14:49
 Status: published
 Category: Uncategorized
-Tags: sex & gender
+Tags: sex & gender
 Slug: wicked-transcendence-iii
 
 ([Previously](http://zackmdavis.net/blog/2016/09/wicked-transcendence-ii/), [previously](http://zackmdavis.net/blog/2016/07/wicked-transcendence/).)

diff --git a/content/2018/another-desperate-fervent-wish-for-star-trek-discovery.md b/content/2018/another-desperate-fervent-wish-for-star-trek-discovery.md
index 2b0054dc60c751f87ae121ad810531e70a76d3da..d9ba0024870a6d0fd24deb94db3183e868870273 100644 (file)
--- a/content/2018/another-desperate-fervent-wish-for-star-trek-discovery.md
+++ b/content/2018/another-desperate-fervent-wish-for-star-trek-discovery.md
@@ -1,7 +1,7 @@
 Title: Another Desperate, Fervent Wish for <em>Star Trek: Discovery</em>
 Date: 2018-11-17 15:57
 Status: published
-Category: arts &amp; culture
+Category: arts & culture
 Tags: Star Trek
 Slug: another-desperate-fervent-wish-for-star-trek-discovery
 

diff --git a/theme/static/css/style.css b/theme/static/css/style.css
index a2a0b292cad4f249fcf374357017ad980f5abbcb..7745a80c9a5287826e7fa9127a5859f5c7421764 100644 (file)
--- a/theme/static/css/style.css
+++ b/theme/static/css/style.css
@@ -215,12 +215,21 @@ header h1 a:hover {
 }
 
 .widget h3 {
-    font-size: 14px;
+    background: linear-gradient(#8b8e96, #66686e);
+    color: #fff;
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 15px;
     font-weight: bold;
-    margin-bottom: 10px;
-    color: #222;
-    text-transform: uppercase;
-    letter-spacing: 0.5px;
+    letter-spacing: 0.3px;
+    text-shadow: 0 -1px 0 #555;
+    margin: 0 -15px 10px -15px;
+    padding: 8px 15px;
+    border-radius: 4px;
+}
+
+.sidebar .widget:first-child h3 {
+    margin-top: -15px;
+    border-radius: 4px 4px 0 0;
 }
 
 .widget ul {
@@ -235,7 +244,13 @@ header h1 a:hover {
 
 .widget li {
     margin-bottom: 3px;
+    padding-bottom: 3px;
     line-height: 1.4;
+    border-bottom: 1px solid #eee;
+}
+
+.widget li:last-child {
+    border-bottom: none;
 }
 
 .widget li strong {
@@ -246,15 +261,22 @@ header h1 a:hover {
 .widget a {
     color: #58388c;
     font-size: 12px;
+    font-weight: bold;
 }
 
 .tagcloud {
-    line-height: 2.2;
+    line-height: 1.15;
 }
 
 .tagcloud a {
     display: inline-block;
-    margin-right: 8px;
+    font-weight: normal;
+    margin: 0 3px 0 0;
+}
+
+.widget-more {
+    margin-top: 8px;
+    font-size: 12px;
 }
 
 .archive-title {

diff --git a/theme/templates/base.html b/theme/templates/base.html
index ee873c66a6f9a20c95d2289fd34cf75f27646c79..c0509338fd19dc231ccb66dd463e92d4fa7fc9f4 100644 (file)
--- a/theme/templates/base.html
+++ b/theme/templates/base.html
@@ -32,8 +32,9 @@
         <aside class="sidebar">
             <div class="widget">
                 <h3>Archives</h3>
+                {% set archive_dates = all_articles if all_articles is defined else dates %}
                 <ul>
-                {% for year, year_articles in dates|groupby('date.year')|reverse %}
+                {% for year, year_articles in archive_dates|groupby('date.year')|reverse %}
                     <li><strong>{{ year }}</strong>
                         <ul>
                         {% for month_num, month_articles in year_articles|groupby('date.month')|reverse %}
@@ -66,9 +67,9 @@
                 {% set min_count = counts|min %}
                 <div class="tagcloud">
                 {% for tag, articles in tags|sort %}
-                    {% set c = articles|count %}
-                    {% set size = 10 + ((c - min_count) / ((max_count - min_count) or 1)) * 10 %}
-                    <a href="{{ SITEURL }}/{{ tag.url }}" style="font-size: {{ size|round(1) }}px;" title="{{ c }} posts">{{ tag }}</a>
+                    {% set count = articles|count %}
+                    {% set size = 10 + ((count - min_count) / ((max_count - min_count) or 1)) * 16 %}
+                    <a href="{{ SITEURL }}/{{ tag.url }}" style="font-size: {{ size|round(1) }}px;" title="{{ count }} posts">{{ tag }}</a>
                 {% endfor %}
                 </div>
             </div>