From e851ce49f5db841855cd0f653dcb202a4ec7d11d Mon Sep 17 00:00:00 2001 From: Zhiming Wang Date: Tue, 16 Jun 2015 01:11:43 -0700 Subject: fix font issues: moving back to Droid Sans Mono for code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I just noticed that code font is crazy without Consolas installed (I recently reinstalled my OS and got rid of Office for Mac 2011 — that's probably why). The line numbers are all off (since the line heights are carefully pre-calculated, and fallback fonts of different leadings won't help). Therefore, I'm moving to the quite nice looking and controllable Droid Sans Mono. Isn't as satisfactory as Consolas on the web, but certainly better than Monaco. Note: I originally copied my list Consolas, Monaco, 'Andale Mono', monospace (I added Courier since I like it a lot as the primitive monospace font) from MDN Wiki, but now it looks like a bad choice when I don't have Consolas any more. By the way, MDN Wiki renders line numbers using JS, so at least they are able to calculate the line heights. I'm serving everything statically, so this is a problem. --- pyblog | 6 +++--- source/blog/2015-06-12-the-tip-of-the-iceberg.md | 2 ++ source/css/theme.css | 12 ++++++++++-- templates/template.html | 1 + 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pyblog b/pyblog index 75512bc9..8b500a03 100755 --- a/pyblog +++ b/pyblog @@ -576,12 +576,12 @@ def _pre_tag_insert_line_numbers(soup, pre_tag): num_lines = len(pre_tag.text.split("\n")) for line_number in range(1, num_lines + 1): # line number divs will look like: - # - # + # + # ln_tag = soup.new_tag("span") ln_tag["class"] = "line-number" ln_tag["data-line"] = line_number - ln_tag["style"] = "top: %dpx" % ((line_number - 1) * CODE_LINE_HEIGHT) + ln_tag["style"] = "top: %dpx" % ((line_number - 1) * CODE_LINE_HEIGHT + 1) # add a comment to the content of the span to suppress tidy5 # empty tag warning ln_tag.append(soup.new_string("", bs4.Comment)) diff --git a/source/blog/2015-06-12-the-tip-of-the-iceberg.md b/source/blog/2015-06-12-the-tip-of-the-iceberg.md index bf4565f8..e5a747ab 100644 --- a/source/blog/2015-06-12-the-tip-of-the-iceberg.md +++ b/source/blog/2015-06-12-the-tip-of-the-iceberg.md @@ -7,6 +7,8 @@ date-display: June 12, 2015 *By the way, I'm not sure if I'm going to stand by this post when I wake up tomorrow morning. It will stay either way, though.* +--- + [^not-shaming]: In this case the campaign is too civilized to be called a shaming campaign. [^judge]: And I question if most shamers did. diff --git a/source/css/theme.css b/source/css/theme.css index c31ce02e..b692f963 100644 --- a/source/css/theme.css +++ b/source/css/theme.css @@ -22,6 +22,10 @@ article { text-align: justify; } +article code { + font-size: 10.5pt; +} + h1.title { text-align: center; font-size: 18pt; @@ -51,7 +55,7 @@ h3 { } code { - font-family: 'Consolas', 'Monaco', 'Andale Mono', 'Courier', monospace; + font-family: 'Droid Sans Mono', 'Courier', monospace; font-weight: thin; } @@ -68,7 +72,7 @@ pre[class*=sourceCode] { } pre code { - font-size: 10.5pt; + font-size: 10pt; } .line-number { @@ -101,6 +105,10 @@ div.footnotes { font-size: 10pt; } +div.footnotes code { + font-size: 9.5pt; +} + img { display: block; max-width: 100%; diff --git a/templates/template.html b/templates/template.html index d6145a0e..6bf2d9de 100644 --- a/templates/template.html +++ b/templates/template.html @@ -32,6 +32,7 @@ $endfor$ +