1. Replaced Rdiscount in favor of Kramdown (better html5 support) for markdown processing.

2. Added updated instructions to the README
3. Removed unused media css directories
4. Improved use of color variables for page theming.
5. Improved Typography and blog styling.
6. Added support for simple pre and code styles
7. Misc styling and markup improvements.

Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gem 'rake'
 gem 'jekyll'
-gem 'rdiscount'
+gem 'kramdown'
 gem 'RedCloth'
 gem 'haml', '>= 3.1'
 gem 'compass', '>= 0.11'

Gemfile.lock

@@ -5,8 +5,8 @@ GEM
     chunky_png (1.2.0)
     classifier (1.3.3)
       fast-stemmer (>= 1.0.0)
-    compass (0.11.1)
+    compass (0.11.3)
-      chunky_png (~> 1.1)
+      chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
     directory_watcher (1.4.0)
@@ -18,14 +18,14 @@ GEM
       directory_watcher (>= 1.1.1)
       liquid (>= 1.9.0)
       maruku (>= 0.5.9)
+    kramdown (0.13.3)
     liquid (2.2.2)
     maruku (0.6.0)
       syntax (>= 1.0.0)
     rake (0.9.0)
     rb-fsevent (0.4.0)
-    rdiscount (1.6.8)
     rubypants (0.2.0)
-    sass (3.1.1)
+    sass (3.1.2)
     syntax (1.0.0)
 
 PLATFORMS
@@ -36,7 +36,7 @@ DEPENDENCIES
   compass (>= 0.11)
   haml (>= 3.1)
   jekyll
+  kramdown
   rake
   rb-fsevent
-  rdiscount
   rubypants

README.markdown

@@ -1,59 +1,84 @@
-# What is Octopress?
+1. **It sports a clean responsive theme** written in semantic HTML5, focused on readability and friendliness toward mobile devices.
-Octopress gives developers a well designed starting point for a Jekyll blog. It's easy to configure and easy to deploy. Sweet huh?
+2. **Octopress loves programmers.** Embed code (with [Solarized](http://ethanschoonover.com/solarized) styling) in your posts from gists or from your filesystem.
+3. **Third party integration is simple** with built-in support for Twitter, Pinboard, Delicious, Disqus Comments, and Google Analytics.
+4. **It's easy to use.** A collection of rake tasks simplifies development and makes deploying a cinch.
+5. **Get curated plugins.** Plugins are hand selected from the Jekyll community then tested and improved.
 
-#### Octopress comes with
+## Get Setup
-1. A nice, easy to configure theme that focuses on readability.
-2. Built in support for Twitter, Delicious, Disqus Comments, Google Analytics, and Custom Search.
-3. Rake tasks that make development fast, and deploying easy.
 
-## Why?
+[Fork Octopress](https://github.com/imathis/octopress), then open the console and follow along.
-1. Building a Jekyll blog from scratch is a lot of work.
-2. Jekyll doesn't have default layouts or themes.
-3. Most developers don't want to do design.
 
-## Octopress is made of
+    git clone (your repo url)
-- [Jekyll](http://github.com/henrik/jekyll) a blog aware static site generator (Henrik's fork adds [HAML](http://haml-lang.com) support)
-- [Compass](http://compass-style.org) an awesome [SASS](http://sass-lang.com) framework
-- [FSSM](http://github.com/ttilley/fssm/tree/master) + a rake task, automatically regenerates the blog as you work
-- [Serve](http://github.com/jlong/serve) for live previews of the site while in development
-- [Rsync](http://samba.anu.edu.au/rsync/) for easy deployment
 
-## Setup
+    # Optionally add a branch for pulling in Octopress updates
-Setup is really simple.
+    git remote add octopress git://github.com/imathis/octopress.git
 
-1. Download Octopress: <code>git clone git://github.com/imathis/octopress.git</code>
+Setup an [RVM](http://beginrescueend.com/) and install dependencies.
-2. Install dependencies (requires the bundler gem): <code>bundle install</code>
-3. Run <code>rake preview</code> to build the site and preview it in a local webserver.
 
-You'll want to change some settings, so check out the wiki for [Setup & Configurations](http://wiki.github.com/imathis/octopress/configuration).
+    source .rvmrc
+    bundle install
 
-#### Optional:
+    # Install pygments (for syntax highlighing)
-- Install Pygments (Python syntax highlighter), if you wish to enable _Syntax Highlighting_.  Download from [pygments.org](http://pygments.org), or <code>sudo aptitude install python-pigments</code> for Debian/Ubuntu users.
+    sudo easy_install pip
+    sudo pip install pygments
 
-## Usage
+    # Install the default Octopress theme
-Octopress is almost like a front-end for Jekyll. It provides some really handy rake tasks and automation to make blogging as simple as possible. With Octopress you can:
+    rake install
 
-- Preview the site locally with the power of Serve.
+### Write A Post
-- Automatically regenerate your blog while you work.
-- Generate and deploy with a single command.
 
-See the wiki to learn more about [Usage](http://wiki.github.com/imathis/octopress/usage).
+    rake post['hello world']
 
-## Third Party Integration
+This will create a new post named something like `2011-06-17-hello-world.markdown` in the `source/_posts` directory.
-With search, comments, and analytics, you have no need for a database. This is what makes a statically generated blog possible.
+Open that file in your favorite text editor and you'll see a block of [yaml front matter](https://github.com/mojombo/jekyll/wiki/yaml-front-matter)
+which tells Jekyll how to processes posts and pages.
 
-- Twitter
+    ---
-- Disqus Comments
+    title: Hello World
-- Google Custom Search
+    date: 2011-06-17 14:34
-- Google Analytics
+    layout: post
-- Delicious Bookmarks
+    ---
 
-If you already have an account with these services, you can get set up within seconds. Check out the wiki for [Third Party Configuration](http://wiki.github.com/imathis/octopress/third-party-integration) details, and to learn how to setup or remove these services.
+Octopress adds some custom paramaters to give you more publishing flexibility and you can [read about those here](#include_link),
+but for now. Go ahead and type up a sample post or use some [inspired filler](http://baconipsum.com/).
 
-## Octopress Style
+### Generate Your Blog
-- Stylesheets use [SASS](http://sass-lang.com) and [Compass](http://compass-style.org)
+
-- They're broken up into Layout, Typography, Theme (colors), and Partials
+    rake preview
-- Checkout [the wiki](http://wiki.github.com/imathis/octopress/style-customization) for help with customization.
+
+This will generate your blog, watch your `sass` and `source` directories for changes regenerating automatically, and mount Jekyll's built in webbrick server. Open your browser to `http://localhost:4000` and check it out.
+
+If you'd rather use [POW](http://pow.cx) to serve up your site, you can do this instead.
+
+    cd ~/.pow
+    ln -s /path/to/octopress
+
+    #Then generate your site
+    rake watch
+
+`rake watch` does the same thing as `rake preview` except it doesn't mount Jekyll's webbrick server.
+
+### Configure Octopress
+
+http://gmarik.info/blog/2010/05/10/blogging-with-jekyll-and-heroku-for-free
+http://jstorimer.com/2009/12/29/jekyll-on-heroku.html
+
+Octopress keeps configurations in two places, the `Rakefile` and the `_config.yml`.
+
+In the `rakefile` you'll want to set up your deployment configurations.
+
+    ## -- Rsync Deploy config -- ##
+    # Be sure your public key is listed in your server's ~/.ssh/authorized_keys file
+    ssh_user      = "mathisweb@imathis.com"
+    document_root = "~/dev.octopress.org/"
+
+    ## -- Git deploy config -- ##
+    source_branch = "source" # this compiles to your deploy branch
+    deploy_branch = "master" # For user/organization pages, use "master" for project pages use "gh-pages"
+
+If you want to deploy with github pages, read [http://pages.github.com](http://pages.github.com) for guidance.
+
+TODO : Write _configt.yml instructions…
 
 ## License
 (The MIT License)

Rakefile

@@ -1,7 +1,6 @@
 require "rubygems"
 require "bundler/setup"
 
-port        = "4000"      # preview project port eg. http://localhost:4000
 site        = "public"    # compiled site directory
 source      = "source"    # source file directory
 stash       = "_stash"    # directory to stash posts for speedy generation
@@ -10,8 +9,8 @@ post_format = "markdown"  # file format for new posts when using the post rake t
 
 ## -- Rsync Deploy config -- ##
 # Be sure your public key is listed in your server's ~/.ssh/authorized_keys file
-ssh_user      = "user@host.com"    # for rsync deployment
+ssh_user      = "mathisweb@imathis.com"
-document_root = "~/document_root/" # for rsync deployment
+document_root = "~/dev.octopress.org/"
 
 ## -- Github Pages deploy config -- ##
 # Read http://pages.github.com for guidance
@@ -28,7 +27,7 @@ task :install, :theme do |t, args|
   system "mkdir -p #{source}; cp -R themes/"+theme+"/source/ #{source}/"
   system "mkdir -p sass; cp -R themes/"+theme+"/sass/ sass/"
   system "mkdir -p _plugins; cp -R themes/"+theme+"/_plugins/ _plugins/"
-  system "mkdir -p #{source}/_posts";
+  system "mkdir -p #{source}/#{posts}";
   puts "## Layouts, images, and javascritps from the #{theme} theme have been installed into ./#{source}"
   puts "## Sass stylesheet sources from the #{theme} theme have been installed into ./sass"
   puts "## Plugins from the #{theme} theme have been installed into ./_plugins"
@@ -54,8 +53,9 @@ task :post, :filename do |t, args|
   require './_plugins/titlecase.rb'
   args.with_defaults(:filename => 'new-post')
   open("#{source}/_posts/#{Time.now.strftime('%Y-%m-%d')}-#{args.filename.downcase.gsub(/[ _]/, '-')}.#{post_format}", 'w') do |post|
+    system "mkdir -p #{source}/#{posts}";
     post.puts "---"
-    post.puts "title: \"#{args.filename.gsub(/[-_]/, ' ').titlecase}\""
+    post.puts "title: #{args.filename.gsub(/[-_]/, ' ').titlecase}"
     post.puts "date: #{Time.now.strftime('%Y-%m-%d %H:%M')}"
     post.puts "layout: post"
     post.puts "---"
@@ -77,6 +77,11 @@ task :integrate do
   FileUtils.mv Dir.glob("#{source}/#{stash}/*.*"), "#{source}/#{posts}/"
 end
 
+desc "Clean out caches: _code_cache, _gist_cache, .sass-cache"
+task :clean do
+  system "rm -rf _code_cache/** _gist_cache/** .sass-cache/**"
+end
+
 ##############
 # Deploying  #
 ##############

_config.yml

@@ -4,14 +4,14 @@ destination: public
 code_dir: downloads/code
 port: 4000
 
-url: http://octopress.dev
+url: http://dev.octopress.org
-title: My Octopress Blog
+title: Octopress
 subtitle: A blogging framework for hackers.
 author: Your Name
 subscribe_rss: /atom.xml
-subscribe_email: http://feedburner.com/asdfasdf
+subscribe_email:
 
-#markdown: rdiscount
+markdown: kramdown
 pygments: true
 recent_posts: 1
 simple_search: http://google.com/search

themes/classic/sass/default/core/_layout.scss

@@ -1,9 +1,9 @@
 $default-border-radius: 4px;
 
 $pad-min: 18px;
-$pad-narrow: 18px;
+$pad-narrow: 20px;
-$pad-medium: 24px;
+$pad-medium: 35px;
-$pad-wide: 30px;
+$pad-wide: 55px;
 $sidebar-width-medium: 240px;
 $sidebar-pad-medium: 15px;
 $sidebar-pad-wide: 20px;
@@ -117,8 +117,6 @@ body {
   }
   body > nav + div > div { margin-right: $sidebar-width-wide; }
   #articles {
-    padding-top: $pad-wide/2;
-    padding-bottom: $pad-wide/2;
     + aside {
       width: $sidebar-width-wide - $sidebar-pad-wide*2;
       padding: 0 $sidebar-pad-wide $sidebar-pad-wide;

themes/classic/sass/default/core/_theme.scss

@@ -1,37 +1,53 @@
-// Link Colors
+// Main Link Colors
 $link-color: lighten(#165b94, 3);
-$link-color-hover: darken(#165b94, 5);
+$link-color-hover: adjust-hue($link-color, -200);
+$link-color-visited: darken(adjust_hue($link_color, 70), 10);
+$link-color-active: darken($link-color-hover, 15);
 
 // Main Section Colors
 $body-color: #333333;
 $light-text: #999999;
 $page-bg: #252525;
+$article-border: #eeeeee;
+$main-bg: #f5f5f5;
 
-$header-bg: #333; //#0c2e46; //darken(#238bd2, 32); //#263448; //#323232;
+$header-bg: #333;
 $header-border: lighten($header-bg, 15);
 $title-color: #f2f2f2;
 $subtitle-color: #aaa;
 
-$nav-bg: #ccc;//#3a6ea5;
+$type-border: #ddd;
+$type-color-light: #555;
+$type-color: #222;
+
+$nav-bg: #ccc;
 $nav-color: darken($nav-bg, 38);
 $nav-color-hover: darken($nav-color, 25);
 $nav-border: darken($nav-bg, 10);
 $nav-border-top: lighten($nav-bg, 15);
-$nav-border-bottom: darken($nav-bg, 25);//darken($nav-bg, 5);
+$nav-border-bottom: darken($nav-bg, 25);
 $nav-border-left: darken($nav-bg, 11);
 $nav-border-right: lighten($nav-bg, 7);
 
-$sidebar-bg: #eee; //#f8f8f8; //desaturate(change-color(#e8f4f4, $hue: 207), 100); //mix(#f5f5f5, aqua, 93%);
+$sidebar-bg: #eee;
+$sidebar-color: change-color(mix($type-color, $sidebar-bg, 80), $hue: hue($sidebar-bg), $saturation: saturation($sidebar-bg)/2);
+$sidebar-border: desaturate(darken($sidebar-bg, 7), 10);
 $sidebar-border: darken($sidebar-bg, 7);
-
+$sidebar-link-color: $link-color;
-// Blog
+$sidebar-link-color-hover: $link-color-hover;
-$article-border: #eeeeee;
+$sidebar-link-color-subdued: lighten($sidebar-color, 20);
-$main-bg: #f9f8f6;
+$sidebar-link-color-subdued-hover: $link-color-hover;//darken($sidebar-link-color-subdued, 20);
+$twitter-status-link: lighten($sidebar-link-color-subdued, 15);
 
 $footer-color: #999999;
-//$footer-bg: #444444;
+$footer-bg: #ccc;
-$footer-bg: $nav-bg;//$page-bg;
+$footer-color: darken($footer-bg, 38);
-$footer-border: $nav-border-top;//$page-bg;
+$footer-color-hover: darken($footer-color, 10);
+$footer-placeholder: desaturate(darken($footer-bg, 10), 15);
+$footer-border-top: lighten($footer-bg, 15);
+$footer-link-color: darken($footer-bg, 38);
+$footer-link-color-hover: darken($footer-color, 25);
+$page-border-bottom: darken($footer-bg, 5);
 
 // Form Colors
 $fieldset-bg: #ececec;
@@ -48,6 +64,6 @@ $textinput-border-right: #c3c3c3;
 $textinput-border-focus: #989898;
 
 #articles a, #articles + aside a {
-  @include link-colors($link-color, $hover: saturate(darken($link_color, 15), 20), $focus: saturate(darken($link_color, 15), 20), $visited: darken(adjust_hue($link_color, 70), 10));
+  @include link-colors($link-color, $hover: $link-color-hover, $focus: $link-color-hover, $visited: $link-color-visited, $active: $link-color-active);
 }
 a { @include transition(color, .5s); }

themes/classic/sass/default/core/_typography.scss

@@ -1,11 +1,7 @@
-$type-border: #ddd;
+$blockquote: $type-border !default;
-$type-color-light: #555;
-$type-color: #000;
-$blockquote: $type-border !default; //darken($type-border, 20) !default;
 $mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;
 
 // Fonts
-//@include font-face("Adelle", font-files("adellebasic_bold-webfont.woff", woff, "adellebasic_bold-webfont.ttf", truetype, "adellebasic_bold-webfont.svg#webfontKykxqSyz", svg), $eot: "adellebasic_bold-webfont.eot" );
 .heading {
   font-family: "PT Serif", "Georgia", "Helvetica Neue", Arial, sans-serif;
 }
@@ -14,7 +10,7 @@ $mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;
 .mono { font-family: $mono; }
 
 body > header h1 {
-  font-size: 2em;
+  font-size: 3em;
   @extend .heading;
   font-weight: normal;
   line-height: 1.2em;
@@ -31,10 +27,10 @@ body {
   @extend .heading;
   text-rendering: optimizelegibility;
   margin-bottom: 1em;
-  font-weight: normal;
+  font-weight: bold;
 }
 h1 {
-  font-size: 2.4em;
+  font-size: 3.2em;
   line-height: 1.2em
 }
 h2, section h1 {
@@ -59,8 +55,6 @@ ul{ list-style-type: disc; }
 ol{ list-style-type: decimal; ol { list-style-type: lower-alpha; } }
 ul ul, ol ol { margin-left: 1.75em; }
 
-li { margin-bottom: .5em; }
-
 strong { font-weight: bold; }
 
 em { font-style: italic; }

themes/classic/sass/default/media/_480.scss

@@ -1,26 +0,0 @@
-#articles + aside { display: none; }
-body > nav {
-  .site-serch {
-    width: 10em;
-    .search { width: 100%; background-color: #f6f6f6; }
-  }
-}
-
-body > nav, body > footer, body > div > div {
-  padding-left: .5em;
-  padding-right: .5em;
-}
-body > * { font-size: .8em; }
-body > header {
-  font-size: .5em;
-  padding: .4em .5em;
-}
-header, #{headings()} { text-align: center; }
-.site-search {
-  margin: .15em 0 0; padding: 0;
-  .search {
-    padding: .3em .8em 0;
-    line-height: 1.5em;
-    font-size: .85em;
-  }
-}

themes/classic/sass/default/media/_768.scss

@@ -1,8 +0,0 @@
-//body {
-  //padding: 0 1em;
-//}
-//body > header {
-  //font-size: 1em;
-  //padding-top: .5em;
-  //padding-bottom: .5em;
-//}

themes/classic/sass/default/media/_992.scss

@@ -1,19 +0,0 @@
-//@include media-layout(1.2em, 20em, 1em);
-//body > * {
-  //margin: 0 auto;
-  //font-size: 1em;
-//}
-//body {
-  //max-width: 1280px;
-  //margin: 0 auto;
-  //> header {
-    //padding-top: 2em;
-    //padding-bottom: 1em;
-  //}
-  //> nav {
-    //border-left: 1px solid $header-border;
-    //border-right: 1px solid $header-border;
-    //@include border-top-radius(.6em);
-  //}
-//}
-

themes/classic/sass/default/partials/_blog.scss

@@ -1,11 +1,18 @@
 $border: inline-image('dotted-border.png');
 #articles {
+  @media only screen and (max-width: 992px) {
+    ul, ol { margin-left: 1.4em; }
+  }
   > article {
     padding-bottom: 1em;
     &:last-child { margin-bottom: 0; border-bottom: none; }
     h2 {
       padding-top: 0.8em;
       background: $border top left repeat-x;
+      &:first-child {
+        background: none;
+        padding-top: 0;
+      }
     }
     .byline + time:before, .byline + time +time:before {
       content: "\2022 ";
@@ -31,7 +38,6 @@ $border: inline-image('dotted-border.png');
         margin: 0;
         font-style: italic;
         @extend .sans;
-        //font-family: "Georgia", Palatino, Times, "Times New Roman";
       }
     }
     .entry-content {
@@ -60,6 +66,10 @@ $border: inline-image('dotted-border.png');
         }
       }
     }
+    header.feature h1 {
+      font-size: 2.0em; font-style: italic;
+      line-height: 1.3em;
+    }
     #disqus_thread { }
     .meta {
       border-bottom: 1px dashed #dddddd;

themes/classic/sass/default/partials/_footer.scss

@@ -1,11 +1,11 @@
 body > footer {
   @extend .sans;
   font-size: .8em;
-  color: $nav-color;
+  color: $footer-color;
   text-shadow: lighten($footer-bg, 5) 0 1px;
   background-color: $footer-bg;
-  @include background(linear-gradient(lighten($nav-bg, 8), $nav-bg, darken($nav-bg, 11)));
+  @include background(linear-gradient(lighten($footer-bg, 8), $footer-bg, darken($footer-bg, 11)));
-  border-top: 1px solid $footer-border;
+  border-top: 1px solid $footer-border-top;
   position: relative;
   padding-top: 1em;
   padding-bottom: 1em;
@@ -13,7 +13,7 @@ body > footer {
   @include border-bottom-radius(.4em);
   z-index: 1;
   a {
-    @include link-colors($nav-color, $nav-color-hover);
+    @include link-colors($footer-link-color, $footer-link-color-hover);
   }
   p:last-child { margin-bottom: 0; }
 }

themes/classic/sass/default/partials/_header.scss

@@ -13,5 +13,6 @@ body > header {
     @extend .sans;
     font-size: 1em;
     color: $subtitle-color;
+    font-weight: normal;
   }
 }

themes/classic/sass/default/partials/_page.scss

@@ -5,7 +5,7 @@ body {
   border: 0 0 1px 0 solid darken($page-bg, 5);
   > div {
     background-color: $sidebar-bg;
-    border-bottom: 1px solid $nav-border-bottom;
+    border-bottom: 1px solid $page-border-bottom;
     > div {
       background-color: $main-bg;
       border-right: 1px solid $sidebar-border;

themes/classic/sass/default/partials/_sidebar.scss

@@ -1,12 +1,14 @@
 .side-shadow-border {
-  @include box-shadow(#fff 0 1px);
+  @include box-shadow(lighten($sidebar-bg, 5) 0 1px);
 }
 #articles + aside {
+  color: $sidebar-color;
   padding-top: 1.2em;
+  text-shadow: lighten($sidebar-bg, 8) 0 1px;
   section {
     @extend .sans;
     font-size: .8em;
-    line-height: 1.5em;
+    line-height: 1.4em;
     margin-bottom: 1.5em;
     h1 {
       margin: 1.5em 0 0;
@@ -35,7 +37,9 @@
     color: inherit;
     @include transition(color, .5s);
   }
-  &:hover a, &:hover #tweets a { color: $link-color; }
+  &:hover a, &:hover #tweets a { color: $sidebar-link-color;
+    &:hover { color: $sidebar-link-color-hover; }
+  }
   #recent_posts {
     time {
       text-transform: uppercase;
@@ -48,8 +52,8 @@
   @import "delicious";
 }
 .aside-alt-link {
-  color: #999;
+  color: $sidebar-link-color-subdued;
   &:hover {
-    color: #555;
+    color: $sidebar-link-color-subdued-hover;
   }
 }

themes/classic/sass/default/partials/_syntax.scss

@@ -26,15 +26,16 @@ $green:     #859900;
 //$base3: $base03;
 
 .highlight, html .gist .gist-file .gist-syntax .gist-highlight {
-  pre.line-numbers {
+  .line-numbers {
     text-align: right;
+    font-size: .8em;
+    line-height: 1.45em;
     background: $base02 !important;
     border-right: 1px solid darken($base03, 2) !important;
     @include box-shadow(lighten($base02, 2) -1px 0 inset);
     text-shadow: darken($base02, 10) 0 -1px;
     span { color: $base01 !important; }
-    padding-left: .8em !important;
+    padding: .8em !important;
-    padding-right: .8em !important;
   }
 }
 html .gist .gist-file {
@@ -47,10 +48,7 @@ html .gist .gist-file {
     .gist-highlight{
       background: $base03 !important;
       pre {
-        @extend .pre;
+        @extend .pre-code;
-      }
-      pre.line-numbers {
-
       }
     }
   }
@@ -79,19 +77,39 @@ html .gist .gist-file {
     }
   }
 }
-pre { @extend .pre; }
+pre {
-
+  background: #fff;
-.pre {
+  border: 1px solid #ddd;
+  @include border-radius(.4em);
   @extend .mono;
-  @include selection(adjust-color($base03, $lightness: 23%, $saturation: -65%), $text-shadow: $base03 0 1px);
+  line-height: 1.45em;
   font-size: .8em;
+  margin-bottom: 1.5em;
+  padding: .4em .8em;
+  color: #555;
+}
+
+p code {
+  @extend .mono;
+  display: inline-block;
+  white-space: no-wrap;
+  background: #fff;
+  font-size: .9em;
+  color: #555;
+  border: 1px solid #ddd;
+  @include border-radius(.4em);
+  padding: 0 .3em;
+}
+
+.pre-code {
+  @include selection(adjust-color($base03, $lightness: 23%, $saturation: -65%), $text-shadow: $base03 0 1px);
   overflow: scroll;
   overflow-y: hidden;
+  display: block;
+  padding: .8em !important;
   overflow-x: auto;
   line-height: 1.45em;
-  padding: 1em 1.2em !important;
   background: $base03 !important;
-  code { background: $base03 !important; overflow: hidden; }
   color: $base1 !important;
   span { color: $base1 !important; }
   span { font-style: normal !important; font-weight: normal !important; }
@@ -162,12 +180,13 @@ pre { @extend .pre; }
 }
 
 .highlight, .gist-highlight {
+  pre { background: none; @include border-radius(none); border: none; padding: 0; margin-bottom: 0; }
   margin-bottom: 1.5em;
   background: $base03;
   overflow-y: hidden;
   overflow-x: auto;
-  pre { overflow: visible; }
 }
+.highlight code { @extend .pre-code; background: #000;}
 figure {
   margin-bottom: 1.5em;
   figcaption {
@@ -201,7 +220,6 @@ h3.filename { @extend .code-title; }
   position: absolute; right: .8em;
   @include hover-link;
   color: #666 !important;
-  &:hover { color: $link-color !important; }
   z-index: 1;
   font-size: 13px;
   text-shadow: #cbcccc 0 1px 0;

themes/classic/sass/default/partials/_twitter.scss

@@ -9,13 +9,13 @@
       background: inline-image('bird_32_gray_fail.png') no-repeat center .5em;
     }
   }
-  a { color: #666; @include hover-link; }
+  a { color: $sidebar-link-color-subdued; @include hover-link; }
   p {
     position: relative;
     padding-right: 1em;
   }
-  a[href*='status']{
+  a[href*=status]{
-    color: #aaa;
+    color: $twitter-status-link;
     float: right;
     padding: 0 0 .1em 1em;
     position: relative; right: -1.3em;
@@ -23,7 +23,7 @@
     font-size: .7em;
     span { font-size: 1.5em; }
     &:hover {
-      color: #555;
+      color: $sidebar-link-color-subdued-hover;
       text-decoration: none;
     }
   }

themes/classic/source/_includes/article.html

@@ -3,13 +3,14 @@
 {% else %}
   {% assign author = site.author %}
 {% endif %}
-<header>
+{% unless page.no_header %}
+  <header>
     {% if index %}
       <h1 class="entry-title"><a href="{{ page.url }}">{{ page.title | titlecase }}</a></h1>
     {% else %}
       <h1 class="entry-title">{{ page.title | titlecase }}</h1>
     {% endif %}
-  {% unless page.nometa %}
+    {% unless page.no_meta %}
       <p>
         {% if page.date %}
           <time datetime="{{ page.date | datetime }}" pubdate {% if page.updated %} updated {% endif %}>{{ page.date | ordinalize }}</time>
@@ -20,7 +21,8 @@
         {% if author %}<span class="byline author vcard">By <span class="fn">{{ author }}</span></span>{% endif %}
       </p>
     {% endunless %}
-</header>
+  </header>
+{% endunless %}
 {% if index %}
 <div class="entry-content">{{ content | exerpt(content, page.url, 'Continue reading &raquo;') | smart_quotes }}</div>
 {% else %}

themes/classic/source/_includes/header.html

@@ -1,4 +1,6 @@
-<h1><a href="/">{{ site.title }}</a></h1>
+<hgroup>
-{% if site.subtitle %}
+  <h1><a href="/">{{ site.title }}</a></h1>
+  {% if site.subtitle %}
     <h2>{{ site.subtitle }}</h2>
-{% endif %}
+  {% endif %}
+</hgroup>

themes/classic/source/archive.html

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: Blog Archive
-nometa: true
+no_meta: true
 ---
 {% for post in site.posts reverse %}
   {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %}

themes/classic/source/fonts/adellebasic_bold-webfont.svg

@@ -1,139 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG webfont generated by Font Squirrel.
-Copyright   : Copyright c 2009 by TypeTogether All rights reserved
-Designer    : Veronika Burian Jos Scaglione
-Foundry     : TypeTogether
-Foundry URL : wwwtypetogethercom
-</metadata>
-<defs>
-<font id="webfontKykxqSyz" horiz-adv-x="1167" >
-<font-face units-per-em="2048" ascent="1546" descent="-502" />
-<missing-glyph horiz-adv-x="413" />
-<glyph unicode=" "  horiz-adv-x="413" />
-<glyph unicode="&#x09;" horiz-adv-x="413" />
-<glyph unicode="&#xa0;" horiz-adv-x="413" />
-<glyph unicode="!" horiz-adv-x="569" d="M414 401h-258l-37 719v363h330v-363zM461 135q0 -160 -176 -160t-176 160t176 160t176 -160z" />
-<glyph unicode="&#x22;" horiz-adv-x="825" d="M358 915h-276v531h276v-531zM743 915h-276v531h276v-531z" />
-<glyph unicode="#" horiz-adv-x="1243" d="M831 0h-210l34 248h-176l-37 -248h-213l37 248h-205l45 207h193l35 231h-205l43 209h193l32 217h213l-32 -217h176l32 217h213l-32 -217h207l-41 -209h-197l-35 -231h207l-41 -207h-199zM688 455l35 231h-176l-37 -231h178z" />
-<glyph unicode="$" horiz-adv-x="1083" d="M999 399q0 -158 -85 -254t-234 -129v-180h-254v166q-227 10 -356 74v327h223l26 -143q4 -23 11.5 -31t27.5 -14q51 -18 152 -18q207 0 207 145q0 72 -65.5 114t-159 66.5t-186.5 58t-158.5 113.5t-65.5 209q0 160 93 256t251 129v160h256v-150q152 -10 293 -59v-350 l-225 22l-25 136q-6 35 -41 45q-41 10 -117 10q-203 0 -202 -137q0 -68 65.5 -109t158.5 -67.5t186 -61.5t158.5 -118t65.5 -210z" />
-<glyph unicode="%" horiz-adv-x="1818" d="M410 526q-182 0 -263 99.5t-81 261.5q0 180 90 281.5t270 101.5q342 0 342 -357q0 -180 -91 -283.5t-267 -103.5zM662 -35h-285l772 1307h283zM420 694q61 0 89 51.5t28 159.5q0 100 -27 147.5t-88 47.5q-121 0 -121 -199q0 -207 119 -207zM1395 -25q-182 0 -263 99.5 t-81 261.5q0 180 90 281.5t270 101.5q342 0 342 -357q0 -180 -91 -283.5t-267 -103.5zM1402.5 143q63.5 0 90.5 50.5t27 160.5q0 100 -26 147.5t-89 47.5q-119 0 -119 -199q0 -106 26.5 -156.5t90 -50.5z" />
-<glyph unicode="&#x26;" horiz-adv-x="1470" d="M1409 0h-346l-113 131q-166 -156 -413 -156q-211 0 -338 112t-127 310q0 295 295 418q-76 119 -76 238q0 156 109.5 247t285.5 91q104 0 206.5 -28t158.5 -63v-321l-220 8l-24 137q-4 25 -29 33q-27 8 -73 8q-59 0 -90 -30.5t-31 -81.5q0 -86 112 -217l230 -271 q29 88 47 228h352v-158l-94 -19q-18 -4 -25.5 -9t-9.5 -25q-29 -133 -76 -232l129 -147q18 -23 39 -25l121 -18v-160zM784 317l-270 308q-145 -61 -145 -213q0 -82 47 -136.5t145 -54.5q135 0 223 96z" />
-<glyph unicode="'" horiz-adv-x="442" d="M358 915h-276v531h276v-531z" />
-<glyph unicode="(" horiz-adv-x="729" d="M655 -221l-235 -133q-145 190 -239.5 429.5t-94.5 497.5q0 485 352 951l232 -138q-131 -195 -192.5 -388t-61.5 -425q0 -238 59 -413.5t180 -380.5z" />
-<glyph unicode=")" horiz-adv-x="729" d="M297 -354l-231 135q125 190 187 380.5t62 428.5q0 231 -59 412.5t-186 386.5l233 135q147 -188 243.5 -433t96.5 -501q0 -483 -346 -944z" />
-<glyph unicode="*" horiz-adv-x="976" d="M342 782l-174 129l88 115l178 115l-213 -8l-137 45l70 204l137 -45l162 -133l-74 199v143h215v-143l-72 -199h-69l-19 -63l53 -41l-59 -201zM809 911l-174 -129l-86 117l-62 201l56 41l-21 63l164 133l137 45l68 -204l-137 -45l-211 8l178 -115z" />
-<glyph unicode="+" d="M705 248h-246v295h-273v237h273v287h246v-287h274v-237h-274v-295z" />
-<glyph unicode="," horiz-adv-x="516" d="M281 -244l-140 41l56 219q6 18 -11 25l-84 29l45 221q141 -2 214 -33t73 -127q0 -55 -43 -141z" />
-<glyph unicode="-" horiz-adv-x="636" d="M596 465h-555v260h555v-260z" />
-<glyph unicode="." horiz-adv-x="555" d="M453 135q0 -160 -174 -160q-176 0 -176.5 160t176.5 160q174 0 174 -160z" />
-<glyph unicode="/" horiz-adv-x="929" d="M315 -188h-292l575 1734h291z" />
-<glyph unicode="0" horiz-adv-x="1232" d="M606 -25q-291 0 -409.5 160t-118.5 459q0 616 553 616q287 0 405.5 -155.5t118.5 -444.5q0 -305 -128 -470t-421 -165zM618 195q113 0 161 93t48 310q0 213 -45 301t-157 88q-117 0 -167 -92t-50 -305q0 -211 46.5 -303t163.5 -92z" />
-<glyph unicode="1" horiz-adv-x="831" d="M791 0h-719v162l176 14q20 2 26.5 9.5t6.5 31.5v715q0 35 -27 43l-178 37l22 168h492v-963q0 -25 5 -32t28 -9l168 -14v-162z" />
-<glyph unicode="2" horiz-adv-x="1073" d="M1012 0h-946v190l274 269q129 125 175 173t83 108.5t37 117.5q0 131 -146 131q-88 0 -123.5 -38t-35.5 -144l-279 24q2 379 465 379q430 0 430 -327q0 -90 -45 -178.5t-92 -139.5t-145 -145l-232 -221h301q29 0 33 24l29 162h217v-385z" />
-<glyph unicode="3" horiz-adv-x="1062" d="M723 551v-8q270 -41 270 -316q0 -197 -134 -297t-361 -100q-154 0 -285 50t-211 138l164 181q139 -135 307 -136q213 0 213 185q0 176 -205 176q-66 0 -151 -14v204l100 13q227 29 227 221q0 141 -149 141q-88 0 -126 -39t-38 -143l-281 24q0 379 459 379 q229 0 332.5 -85t103.5 -255q0 -123 -66.5 -205.5t-168.5 -113.5z" />
-<glyph unicode="4" horiz-adv-x="1140" d="M934 -137h-283v264h-598v211l420 879l268 -123l-387 -727h297v329l283 43v-372h170v-240h-170v-264z" />
-<glyph unicode="5" horiz-adv-x="1110" d="M942 922h-543l-28 -281q106 70 260 70q184 0 289.5 -106.5t105.5 -311.5q0 -199 -133 -331t-371 -132q-340 0 -516 188l164 187q139 -139 326 -139q96 0 158.5 56t62.5 161q0 113 -57.5 155.5t-133.5 42.5q-113 0 -196 -88l-203 84l45 703h535q20 0 26 24l27 113l182 12 v-407z" />
-<glyph unicode="6" horiz-adv-x="1157" d="M1067 1004l-289 -35q0 92 -31.5 126.5t-113.5 34.5q-217 0 -230 -382q135 80 287 79q184 0 292 -100t108 -295q0 -229 -134.5 -343t-357.5 -114q-145 0 -246.5 50.5t-158 145.5t-81 211t-24.5 267q0 121 25.5 232.5t83 220t171 174t271.5 65.5q428 1 428 -337zM403 543 q2 -74 10.5 -126t28 -105.5t60.5 -82t102 -28.5q172 0 172 217q0 104 -37 147t-129 43q-101 1 -207 -65z" />
-<glyph unicode="7" horiz-adv-x="1089" d="M625 -137h-326q53 625 446 1059h-391q-14 0 -18 -5.5t-8 -21.5l-33 -172l-215 -16v473h989v-232q-186 -199 -311 -491.5t-133 -593.5z" />
-<glyph unicode="8" horiz-adv-x="1105" d="M823 696q215 -123 215 -325q0 -193 -139 -294.5t-367 -101.5q-223 0 -343.5 90.5t-120.5 264.5q0 111 51 192.5t143 157.5q-152 104 -151 281q0 182 124.5 281t323.5 99q201 0 313.5 -87t112.5 -240q0 -177 -162 -318zM459 575q-135 -125 -135 -229q0 -166 213 -166 q94 0 142 43t48 113q0 27 -6 49.5t-26 42.5l-31 34q-12 13 -47 33l-47 26q-13 7 -57 28.5t-54 25.5zM618 795q106 111 107 204q0 139 -164 140q-76 0 -115.5 -37t-39.5 -96q0 -37 15 -68t49 -56.5t63.5 -42.5t84.5 -44z" />
-<glyph unicode="9" d="M109 -18l131 188q131 -111 284 -111q135 0 186.5 90.5t57.5 251.5q-121 -78 -287 -77q-176 0 -287.5 113.5t-111.5 316.5q0 219 129 337.5t356 118.5q518 0 518 -659q0 -719 -546 -719q-123 0 -240.5 40t-189.5 110zM768 623q-4 78 -12 134t-28.5 113.5t-61.5 87 t-101 29.5q-170 0 -170 -217q0 -113 37 -167t127 -54q105 0 209 74z" />
-<glyph unicode=":" horiz-adv-x="555" d="M453 135q0 -160 -174 -160q-176 0 -176.5 160t176.5 160q174 0 174 -160zM453 913.5q0 -159.5 -174 -159.5q-176 0 -176.5 159.5t176.5 159.5q174 0 174 -159.5z" />
-<glyph unicode=";" horiz-adv-x="522" d="M281 -244l-140 41l56 219q6 18 -11 25l-84 29l45 221q141 -2 214 -33t73 -127q0 -55 -43 -141zM461 913.5q0 -159.5 -174 -159.5q-176 0 -176 159.5t176 159.5q174 0 174 -159.5z" />
-<glyph unicode="&#x3c;" d="M940 172l-799 281v286l795 291l70 -231l-598 -201l602 -201z" />
-<glyph unicode="=" d="M979 266h-791v240h791v-240zM979 647h-791v240h791v-240z" />
-<glyph unicode="&#x3e;" d="M1010 453l-799 -281l-70 225l602 201l-596 201l68 231l795 -291v-286z" />
-<glyph unicode="?" horiz-adv-x="1081" d="M600 401h-309v373q70 6 112.5 11.5t106 23.5t99.5 46t63.5 78t27.5 118q0 86 -43 133t-122 47q-78 0 -138 -25q-23 -8 -26 -41l-19 -131l-250 -18v377q236 90 447 90q496 0 495 -422q0 -199 -113.5 -322t-330.5 -149v-189zM621 135q0 -160 -175 -160q-176 0 -176 160 t176 160q175 0 175 -160z" />
-<glyph unicode="@" horiz-adv-x="1722" d="M1219 -143l49 -168q-164 -72 -416 -72q-340 0 -537.5 187.5t-197.5 539.5q0 369 220 594t574 225q322 0 515.5 -171t193.5 -480q0 -272 -108.5 -404.5t-294.5 -132.5q-184 0 -236 142q-145 -141 -250 -142q-109 0 -171 75t-62 214q0 229 121.5 389t328.5 160 q145 0 285 -65l-47 -302q-27 -147 -27 -217q0 -80 76 -79q51 0 89 35.5t56.5 93t26.5 111.5t8 106q0 231 -125 357t-385 126q-283 0 -432 -184.5t-149 -450.5q0 -268 144 -409.5t409 -141.5q168 1 342 64zM963 262l59 377q-35 25 -90 25q-92 0 -159.5 -103.5t-67.5 -263.5 q0 -143 82 -143.5t176 108.5z" />
-<glyph unicode="A" horiz-adv-x="1554" d="M1548 0h-647v160l168 18l-74 213h-508l-71 -213l162 -18v-160h-572v160l90 22q41 10 51 39l449 1262h362l447 -1266q8 -25 49 -35l94 -22v-160zM934 612l-182 557h-13l-188 -557h383z" />
-<glyph unicode="B" horiz-adv-x="1376" d="M750 0h-672v160l129 14q20 2 26.5 10.5t6.5 30.5v1049q0 25 -6.5 32t-26.5 9l-129 14v164h690q449 0 449 -363q0 -135 -72 -222t-178 -122v-6q342 -39 342 -362q0 -408 -559 -408zM555 221h141q141 0 213 47t72 172q0 215 -254 215h-172v-434zM555 860h82q129 0 203.5 45 t74.5 164q0 115 -62 153t-185 38h-113v-400z" />
-<glyph unicode="C" horiz-adv-x="1386" d="M1294 469v-381q-184 -113 -512 -113q-719 0 -719 773q0 342 197 551.5t565 209.5q287 0 465 -116v-402l-225 19l-33 200q-6 29 -33 37q-78 25 -182 25q-199 0 -312.5 -134t-113.5 -390q0 -266 108.5 -402.5t303.5 -136.5q119 0 205 27q18 4 25 12t11 31l31 190h219z" />
-<glyph unicode="D" horiz-adv-x="1540" d="M707 0h-629v164l129 14q20 2 26.5 9.5t6.5 31.5v1047q0 23 -6.5 31t-26.5 10l-129 14v162h663q375 0 555.5 -187.5t180.5 -531.5q0 -354 -192.5 -559t-577.5 -205zM557 221h117q481 0 481 524q0 279 -110.5 398t-358.5 119h-129v-1041z" />
-<glyph unicode="E" horiz-adv-x="1284" d="M1212 0h-1134v160l129 14q20 2 26.5 10.5t6.5 30.5v1051q0 25 -6.5 32t-26.5 9l-129 14v162h1089v-414l-225 10l-29 156q-6 27 -34 27h-322v-404h479v-227h-479v-412h367q29 0 32 23l33 180h223v-422z" />
-<glyph unicode="F" horiz-adv-x="1234" d="M891 0h-813v160l129 14q20 2 26.5 10.5t6.5 30.5v1051q0 25 -6.5 32t-26.5 9l-129 14v162h1081v-414l-225 10l-29 156q-6 27 -35 27h-313v-402h471v-227h-471v-414q0 -25 5 -32t28 -9l301 -16v-162z" />
-<glyph unicode="G" horiz-adv-x="1478" d="M1460 551l-84 -8q-33 -2 -33 -29v-440q-207 -98 -530 -99q-205 0 -353.5 57.5t-233.5 164t-125 241.5t-40 307q0 342 197 553t571 211q119 0 247 -30.5t216 -87.5v-387l-227 16l-31 184q-8 35 -33 41q-94 27 -188 27q-197 0 -309.5 -140.5t-112.5 -381.5 q0 -258 109.5 -398.5t326.5 -140.5q88 0 170 14q33 6 33 37v268h-227l28 185h629v-164z" />
-<glyph unicode="H" horiz-adv-x="1675" d="M1604 0h-648v160l129 14q20 2 26.5 10.5t6.5 30.5v432h-561v-430q0 -25 5 -32t28 -9l137 -16v-160h-649v160l129 14q20 2 26.5 10.5t6.5 30.5v1049q0 25 -6.5 32t-26.5 9l-129 14v164h649v-164l-137 -16q-23 -2 -28 -9.5t-5 -29.5v-387h561v387q0 25 -6 32t-27 9l-129 14 v164h648v-164l-138 -16q-23 -2 -27.5 -9.5t-4.5 -29.5v-1047q0 -25 5 -32t27 -9l138 -16v-160z" />
-<glyph unicode="I" horiz-adv-x="827" d="M762 0h-688v160l149 14q20 2 26.5 9t6.5 32v1049q0 25 -6 32t-27 9l-149 14v164h688v-164l-158 -16q-23 -2 -28 -9.5t-5 -29.5v-1047q0 -25 5.5 -32t27.5 -9l158 -16v-160z" />
-<glyph unicode="J" horiz-adv-x="1056" d="M526 336v930q0 23 -6 30t-26 9l-185 14v164h705v-164l-137 -16q-23 -2 -28 -8.5t-5 -28.5v-932q0 -182 -92.5 -270.5t-294.5 -88.5q-117 0 -227.5 25t-157.5 55v365l229 -17l21 -147q2 -20 22 -27q37 -12 82 -12q55 0 77.5 26.5t22.5 92.5z" />
-<glyph unicode="K" horiz-adv-x="1540" d="M1522 0h-453l-383 592l-129 -154v-219q0 -25 5 -32t28 -9l158 -16v-162h-670v162l129 14q20 2 26.5 9.5t6.5 31.5v1049q0 23 -6.5 31t-26.5 10l-129 14v162h649v-162l-137 -16q-23 -2 -28 -9.5t-5 -29.5v-512l483 549l-127 16v164h537v-164l-86 -14q-41 -6 -64 -35 l-376 -426l411 -629q18 -29 60 -33l127 -20v-162z" />
-<glyph unicode="L" horiz-adv-x="1277" d="M1212 0h-1134v162l129 14q20 2 26.5 10.5t6.5 30.5v1049q0 25 -6.5 32t-26.5 9l-129 14v162h682v-162l-170 -16q-23 -2 -28 -9.5t-5 -29.5v-1047h365q29 0 32 23l33 204h225v-446z" />
-<glyph unicode="M" horiz-adv-x="1970" d="M1898 0h-673v160l168 14q20 2 26 10.5t6 30.5v778h-8l-293 -698h-333l-289 700h-10v-778q0 -25 5 -32t27 -9l176 -16v-160h-622v160l129 14q20 2 26.5 10.5t6.5 30.5v1051q0 23 -6.5 31t-26.5 10l-129 14v162h549l356 -928h8l375 928h532v-160l-137 -16 q-23 -2 -27.5 -9.5t-4.5 -29.5v-1053q0 -35 32 -39l137 -16v-160z" />
-<glyph unicode="N" horiz-adv-x="1693" d="M1466 0h-336l-653 1069v-852q0 -25 5 -32t28 -9l137 -16v-160h-569v160l129 14q20 2 26.5 10.5t6.5 30.5v1053q0 25 -6.5 32t-26.5 9l-129 14v160h508l643 -1071v852q0 25 -6 32t-27 9l-129 14v164h569v-164l-137 -16q-23 -2 -28 -9.5t-5 -29.5v-1264z" />
-<glyph unicode="O" horiz-adv-x="1554" d="M768 -25q-356 0 -530.5 206t-174.5 556q0 342 190.5 557t543.5 215q346 0 520 -207.5t174 -537.5q0 -371 -183.5 -580t-539.5 -209zM780 227q385 0 385 518q0 506 -372 506q-184 0 -293 -127t-109 -381q0 -516 389 -516z" />
-<glyph unicode="P" horiz-adv-x="1323" d="M881 0h-803v162l129 14q20 2 26.5 10.5t6.5 30.5v1047q0 25 -6.5 32t-26.5 9l-129 14v164h694q264 0 379 -120t115 -316q0 -500 -561 -500h-150v-328q0 -25 5 -32t28 -9l293 -16v-162zM555 766h102q59 0 103.5 9t88.5 35t68.5 81t24.5 137q0 135 -69.5 183.5t-196.5 48.5 h-121v-494z" />
-<glyph unicode="Q" horiz-adv-x="1552" d="M1182 -176l59 -180q-143 -76 -291 -76q-324 0 -323 305q0 55 6 111q-291 35 -434.5 235.5t-143.5 517.5q0 342 190.5 557t542.5 215q236 0 395.5 -102t229.5 -266t70 -377q0 -326 -143.5 -528.5t-421.5 -245.5q-4 -25 -5 -70q0 -63 28 -95t93 -32q72 0 148 31zM774 227 q385 0 385 518q0 506 -373 506q-186 0 -294.5 -127t-108.5 -381q0 -516 391 -516z" />
-<glyph unicode="R" horiz-adv-x="1406" d="M1403 0h-447l-184 514q-18 53 -44 72.5t-77 19.5h-96v-385q0 -25 5 -32t28 -9l143 -16v-164h-653v164l129 14q20 2 26.5 9.5t6.5 31.5v1047q0 23 -6.5 31t-26.5 10l-129 14v162h698q256 0 366.5 -115t110.5 -295q0 -274 -270 -393q70 -33 119 -164l112 -293 q18 -33 62 -39l127 -20v-164zM555 819h94q131 0 205 49.5t74 186.5q0 115 -64.5 160t-206.5 45h-102v-441z" />
-<glyph unicode="S" horiz-adv-x="1214" d="M1090 1028l-232 21l-24 165q-4 31 -25 39q-72 23 -150 23q-113 0 -171 -47t-58 -127q0 -39 18.5 -71t38 -50t70.5 -39.5t74.5 -30t93.5 -28.5q94 -29 149.5 -52.5t125 -72.5t103.5 -128t34 -188q0 -238 -161 -352.5t-415 -114.5q-129 0 -266 27t-203 57v400h230l40 -195 q4 -31 35 -37q90 -23 172 -22q258 0 258 190q0 47 -18 82t-58 59.5t-78 38t-100 31.5q-201 57 -274 101q-178 106 -178 342q0 227 151.5 343.5t397.5 116.5q225 0 420 -82v-399z" />
-<glyph unicode="T" horiz-adv-x="1421" d="M1128 0h-819v162l211 14q20 2 26.5 9.5t6.5 31.5v1043h-211q-29 0 -33 -23l-33 -178h-225v424h1319v-424h-223l-33 178q-4 23 -33 23h-211v-1043q0 -23 5.5 -30t27.5 -9l225 -16v-162z" />
-<glyph unicode="U" horiz-adv-x="1607" d="M1112 588v678q0 25 -6 32t-27 9l-129 14v162h606v-162l-137 -16q-23 -2 -28 -9.5t-5 -29.5v-736q0 -283 -151.5 -419t-431.5 -136q-303 0 -442.5 137.5t-139.5 426.5v727q0 25 -6 32t-27 9l-127 14v162h648v-162l-138 -16q-23 -2 -27.5 -9.5t-4.5 -29.5v-670 q0 -188 58 -275.5t218 -87.5q164 0 230.5 80t66.5 275z" />
-<glyph unicode="V" horiz-adv-x="1505" d="M981 0h-418l-411 1266q-8 25 -50 34l-92 23l21 160h620v-160l-166 -18l308 -1024h16l297 1024l-164 18l21 160h530v-160l-86 -23q-45 -10 -51 -38z" />
-<glyph unicode="W" horiz-adv-x="2136" d="M1688 0h-414l-201 750h-12l-189 -750h-401l-309 1264q-6 27 -45 36l-105 23l21 160h626v-160l-172 -20l209 -1002h17l235 907h312l233 -913h16l211 1008l-172 20l21 160h553v-160l-97 -23q-37 -6 -47 -36z" />
-<glyph unicode="X" horiz-adv-x="1583" d="M1548 0h-671v160l161 18l-278 375l-277 -375l158 -18v-160h-586v160l119 22q35 8 53 39l389 504l-409 541q-16 27 -49 34l-107 23l21 160h641v-160l-160 -18l266 -373l279 373l-158 18l21 160h540v-160l-100 -23q-29 -8 -51 -38l-383 -496l419 -545q31 -33 52 -39 l110 -22v-160z" />
-<glyph unicode="Y" horiz-adv-x="1384" d="M1120 0h-803v162l205 14q20 2 26.5 9.5t6.5 31.5v336l-408 713q-14 23 -49 34l-92 23l21 160h614v-160l-160 -18l248 -484h16l248 484l-157 18l20 160h522v-160l-86 -23q-39 -10 -51 -38l-371 -705v-340q0 -23 5.5 -30t27.5 -9l217 -16v-162z" />
-<glyph unicode="Z" horiz-adv-x="1376" d="M1284 0h-1180v199l766 1063h-454q-29 0 -33 -23l-39 -192l-221 -7v443h1124v-207l-755 -1057h499q29 0 33 23l39 219h221v-461z" />
-<glyph unicode="[" horiz-adv-x="630" d="M557 -293h-459v1776h459v-156l-127 -22q-33 -4 -33 -41v-1336q0 -39 33 -43l127 -22v-156z" />
-<glyph unicode="\" horiz-adv-x="921" d="M897 -188h-283l-573 1734h281z" />
-<glyph unicode="]" horiz-adv-x="630" d="M532 1483v-1776h-464v156l133 22q33 4 32 43v1295q0 76 -32 82l-133 22v156h464z" />
-<glyph unicode="^" horiz-adv-x="1247" d="M1186 612h-295l-273 492l-266 -492h-291l404 748h313z" />
-<glyph unicode="_" horiz-adv-x="1024" d="M1024 -371h-1024v219h1024v-219z" />
-<glyph unicode="`" horiz-adv-x="1024" d="M762 1251l-117 -102l-364 299l168 160z" />
-<glyph unicode="a" horiz-adv-x="1140" d="M1118 0h-377l-20 111l-10 2q-141 -137 -344 -138q-299 0 -299 304q0 152 94 227.5t289 87.5l235 16v113q0 84 -24.5 123t-112.5 39q-82 0 -116 -25.5t-34 -111.5l-288 24q0 315 440 315q240 0 338 -79.5t98 -290.5v-498q0 -25 5 -32t28 -9l98 -16v-162zM686 270v170 l-139 -10q-90 -6 -127 -32.5t-37 -88.5q0 -113 117 -112q86 -1 186 73z" />
-<glyph unicode="b" horiz-adv-x="1247" d="M420 0h-293q31 197 31 299v999q0 35 -27 43l-113 39l23 166h422v-567l8 -2q135 111 309 110q178 0 287 -126.5t109 -397.5q0 -303 -115 -445.5t-316 -142.5q-186 0 -301 129l-10 -2zM465 774v-479q88 -80 188 -80q199 0 199 332q0 131 -46 215t-142 84q-90 0 -199 -72z " />
-<glyph unicode="c" horiz-adv-x="1044" d="M901 266l80 -190q-166 -100 -389 -101q-266 0 -401.5 148.5t-135.5 394.5q0 279 152.5 424t408.5 145q113 0 212.5 -25.5t152.5 -60.5v-321l-219 10l-25 135q-4 27 -24 33q-43 14 -105 14q-100 0 -163.5 -77.5t-63.5 -245.5q0 -342 264 -342q119 0 256 59z" />
-<glyph unicode="d" horiz-adv-x="1251" d="M1221 0h-381l-21 115l-14 2q-145 -141 -336 -142q-397 0 -397 545q0 289 122.5 428t311.5 139q156 0 289 -98v311q0 33 -27 41l-113 39l23 166h412v-1331q0 -23 5 -30t27 -9l99 -14v-162zM782 305v483q-90 61 -176 62q-109 0 -160 -88t-51 -236q0 -309 187 -309 q98 0 200 88z" />
-<glyph unicode="e" horiz-adv-x="1075" d="M930 283l76 -203q-215 -104 -420 -105q-281 0 -406 153t-125 413q0 266 142.5 406t365.5 140q213 0 332 -119.5t119 -375.5q0 -55 -4 -137h-627q16 -242 242 -242q117 0 305 70zM385 649h326q-2 217 -154 217q-156 0 -172 -217z" />
-<glyph unicode="f" horiz-adv-x="894" d="M799 0h-744v164l115 12q20 2 26.5 10.5t6.5 32.5v623q0 20 -17 20h-137v205h154v113q0 203 110.5 297t327.5 94q80 0 139.5 -12.5t113.5 -42t84 -90t30 -150.5l-287 -35v13q0 65 -20 89q-22 27 -74 27q-72 0 -93.5 -36t-21.5 -117v-130q0 -20 16 -20h324v-205h-340v-637 q0 -25 7 -32t30 -9l250 -22v-162z" />
-<glyph unicode="g" horiz-adv-x="1165" d="M1139 893l-189 -14q76 -96 76 -207q0 -168 -120 -264.5t-316 -96.5q-96 0 -162 19l-68 -109l201 -12q299 -18 391 -51q150 -49 168 -199q4 -25 4 -55q0 -176 -147.5 -272.5t-415.5 -96.5q-512 0 -512 256q0 63 25.5 107.5t87.5 101.5q-90 39 -90 135q0 61 59 125 q47 49 127 123q-80 39 -128 119t-48 188q0 182 120 289.5t349 107.5q111 0 188 -20h400v-174zM756 700q0 90 -49.5 137.5t-137.5 47.5q-90 0 -143 -46t-53 -143q0 -170 190 -170q86 0 139.5 47t53.5 127zM643 -76l-299 21q-53 -66 -53 -109q0 -106 248 -106q281 0 280 118 q0 25 -11 39.5t-42 21.5t-52.5 10t-70.5 5z" />
-<glyph unicode="h" horiz-adv-x="1277" d="M1253 0h-444v668q0 174 -108.5 174t-213.5 -76v-549q0 -25 5.5 -32t27.5 -9l98 -14v-162h-565v162l92 14q20 2 26.5 10.5t6.5 30.5v1081q0 35 -26 43l-113 39l22 166h422v-579l11 -2q150 123 327 122q158 0 227.5 -82.5t69.5 -248.5v-539q0 -25 5 -32t28 -9l102 -14v-162 z" />
-<glyph unicode="i" horiz-adv-x="647" d="M492 1415q0 -88 -49.5 -136t-137.5 -48t-136 48t-48 136t48 134t136 46q90 0 138.5 -46t48.5 -134zM625 0h-584v162l104 14q20 2 26.5 10.5t6.5 30.5v602q0 35 -26 43l-111 39l22 166h424v-850q0 -25 5.5 -32t27.5 -9l105 -14v-162z" />
-<glyph unicode="j" horiz-adv-x="622" d="M174 -57v876q0 35 -27 43l-116 39l24 166h428v-1176q0 -348 -356 -348q-113 0 -206 34t-136 71l88 170q86 -53 178 -54q66 0 94.5 38.5t28.5 140.5zM489 1415q0 -88 -49 -136t-137 -48t-137 48t-49 136q0 86 49 133t137 47q90 0 138 -46t48 -134z" />
-<glyph unicode="k" horiz-adv-x="1269" d="M1255 0h-397l-260 522l-111 -121v-184q0 -25 5.5 -32t27.5 -9l123 -14v-162h-600v162l102 14q20 2 26.5 10.5t6.5 30.5v1081q0 35 -26 43l-113 39l22 166h426v-874l375 395h283v-162l-107 -20q-27 -4 -51 -31l-145 -154l262 -489q16 -31 61 -37l90 -14v-160z" />
-<glyph unicode="l" horiz-adv-x="647" d="M621 0h-578v162l102 14q20 2 26.5 10.5t6.5 30.5v1081q0 35 -26 43l-113 39l22 166h426v-1329q0 -25 5.5 -32t27.5 -9l101 -14v-162z" />
-<glyph unicode="m" horiz-adv-x="1820" d="M1794 0h-444v662q0 51 -5.5 83.5t-33 62.5t-76.5 30q-82 0 -166 -56q6 -49 6 -100v-465q0 -27 5 -34t28 -9l82 -12v-162h-424v672q0 35 -3 58.5t-12.5 51t-33 42t-60.5 14.5q-92 0 -170 -66v-555q0 -25 4.5 -31t28.5 -10l101 -14v-162h-568v162l92 14q20 2 26.5 10.5 t6.5 30.5v602q0 35 -26 43l-111 39l22 166h361l16 -106l11 -3q158 129 327 129q176 0 250 -122q156 123 330 122q162 0 231.5 -82.5t69.5 -263.5v-524q0 -25 5 -33t28 -10l102 -12v-162z" />
-<glyph unicode="n" horiz-adv-x="1277" d="M1253 0h-444v662q0 59 -5 91.5t-29.5 60.5t-74.5 28q-53 0 -114.5 -23.5t-98.5 -52.5v-549q0 -25 5.5 -32t27.5 -9l98 -14v-162h-565v164l92 12q20 2 26.5 10.5t6.5 30.5v602q0 35 -26 43l-111 39l25 166h358l16 -106l9 -5q176 131 360 131q164 0 236.5 -87t72.5 -261 v-522q0 -25 5 -32t28 -9l102 -14v-162z" />
-<glyph unicode="o" horiz-adv-x="1189" d="M582 -25q-268 0 -397.5 148.5t-129.5 402.5q0 262 139.5 411.5t413.5 149.5q270 0 398.5 -144t128.5 -394q0 -268 -139.5 -421t-413.5 -153zM596 190q215 0 215 349q0 176 -51 251.5t-156 75.5q-225 0 -225 -329q0 -347 217 -347z" />
-<glyph unicode="p" horiz-adv-x="1259" d="M719 -434h-668v164l82 12q23 4 30 12t7 31v1034q0 35 -27 43l-108 39l22 166h361l18 -104l10 -5q160 129 349 129q182 0 287.5 -125.5t105.5 -398.5q0 -80 -11.5 -155.5t-41 -156.5t-74.5 -140.5t-122 -97.5t-173 -38q-164 0 -293 105v-293q0 -25 5 -32t28 -9l213 -18 v-162zM477 770v-477q90 -78 193 -78q195 0 194 332q0 297 -174 297q-104 0 -213 -74z" />
-<glyph unicode="q" horiz-adv-x="1220" d="M1219 -434h-623v164l176 14q25 2 33 9t8 28v321l-10 4q-154 -131 -324 -131q-190 0 -298.5 130.5t-108.5 406.5q0 293 126 434t312 141q162 0 297 -116l31 96h268q-16 -154 -16 -332v-954q0 -23 5 -30t27 -9l97 -14v-162zM780 301v483q-96 66 -180 66q-104 0 -155.5 -89 t-51.5 -235q0 -309 193 -309q96 0 194 84z" />
-<glyph unicode="r" horiz-adv-x="968" d="M723 0h-670v166l92 12q20 2 26.5 10.5t6.5 30.5v600q0 35 -26 43l-111 39l22 166h361l25 -164h12q119 184 289 184q113 0 178 -18v-373l-246 9l-20 108q-4 23 -27 23q-66 0 -148 -72v-543q0 -25 5.5 -32t27.5 -9l203 -16v-164z" />
-<glyph unicode="s" horiz-adv-x="997" d="M911 731l-219 14l-20 107q-2 25 -21 29q-53 16 -131 16q-160 0 -160 -104q0 -37 32 -61.5t70 -36t107 -27.5q18 -4 29 -6q74 -16 124 -35t106.5 -54.5t85 -97t28.5 -147.5q0 -178 -127 -265.5t-336 -87.5q-127 0 -250 26t-155 48v297l219 -16l20 -117q2 -27 25 -31 q61 -20 158 -20q170 0 170 106q0 55 -47.5 82t-139.5 43l-77.5 14.5t-75 18.5t-77 27.5t-64.5 40t-56 57.5t-32.5 77t-14.5 101q0 178 130 268t323 90q225 0 376 -59v-297z" />
-<glyph unicode="t" horiz-adv-x="892" d="M791 238l55 -181q-168 -82 -334 -82q-180 0 -258 78t-78 252v537q0 20 -16 20h-144v182q135 14 196.5 90t78.5 244h194v-291q0 -20 17 -20h289v-205h-306v-489q0 -94 29 -131t111 -37q78 0 166 33z" />
-<glyph unicode="u" horiz-adv-x="1275" d="M1241 0h-381l-16 111l-10 2q-53 -41 -94.5 -65.5t-115 -48.5t-155.5 -24q-158 0 -227.5 89.5t-69.5 271.5v500q0 25 -5 31.5t-28 11.5l-98 20l20 168h420v-678q0 -96 22.5 -134t86.5 -38q109 0 211 94v527q0 25 -5 30.5t-28 10.5l-88 20l22 168h408v-850q0 -23 5 -30 t24 -9l102 -14v-164z" />
-<glyph unicode="v" horiz-adv-x="1275" d="M819 0h-358l-326 848q-10 27 -43 35l-86 18l33 166h555v-166l-131 -16l209 -584h14l217 584l-133 16l27 166h473v-166l-74 -12q-41 -10 -51 -35z" />
-<glyph unicode="w" horiz-adv-x="1800" d="M1419 0h-323l-160 686h-12l-162 -686h-369l-258 848q-8 27 -43 35l-86 18l33 166h518v-170l-115 -12l164 -576h15l182 731h309l176 -731h12l154 576l-117 12l27 170h430v-166l-74 -14q-39 -6 -49 -41z" />
-<glyph unicode="x" horiz-adv-x="1234" d="M1214 0h-581v160l96 18l-156 205l-170 -203l115 -18v-162h-491v160l92 18q27 4 53 35l270 299l-278 332q-25 27 -49 35l-82 22l20 166h545v-166l-100 -16l151 -191l168 191l-112 16l20 166h453v-166l-95 -20q-12 -4 -51 -39l-250 -277l287 -350q33 -33 53 -37l92 -16 v-162z" />
-<glyph unicode="y" horiz-adv-x="1267" d="M907 -434h-682v166l160 18q33 2 51 45l88 195l-391 856q-8 27 -43 35l-84 20l33 166h543v-166l-129 -16l227 -541h14l217 541l-133 16l27 166h457v-166l-66 -12q-39 -6 -51 -35l-451 -1102l213 -22v-164z" />
-<glyph unicode="z" horiz-adv-x="1058" d="M1001 0h-929v172l549 702h-287q-18 0 -23 -26l-24 -115l-217 -12v346h899v-176l-539 -701h301q18 0 23 27l24 141l223 11v-369z" />
-<glyph unicode="{" horiz-adv-x="677" d="M610 -141l-20 -164q-246 4 -343 64.5t-97 220.5q0 53 14 177t14 201q0 84 -33.5 116t-109.5 36v162q76 4 109.5 35.5t33.5 115.5q0 78 -14 203t-14 178q0 160 97 220.5t343 64.5l20 -164q-86 -20 -115.5 -47t-29.5 -100q0 -51 16.5 -170t16.5 -185q0 -178 -129 -233 q129 -55 129 -232q0 -63 -16.5 -182t-16.5 -170q0 -74 29.5 -100.5t115.5 -46.5z" />
-<glyph unicode="|" horiz-adv-x="573" d="M426 -293h-281v1839h281v-1839z" />
-<glyph unicode="}" horiz-adv-x="677" d="M88 -305l-20 164q86 20 115.5 46.5t29.5 100.5q0 51 -16.5 170t-16.5 182q0 176 129 232q-129 55 -129 233q0 66 16.5 184.5t16.5 170.5q0 74 -29.5 100.5t-115.5 46.5l20 164q246 -4 343 -64.5t97 -220.5q0 -53 -14 -178t-14 -203q0 -84 33.5 -115.5t109.5 -35.5v-162 q-76 -4 -109.5 -36t-33.5 -116q0 -78 14 -201.5t14 -176.5q0 -160 -97 -220.5t-343 -64.5z" />
-<glyph unicode="~" horiz-adv-x="1073" d="M868 942l160 -59q-25 -147 -80 -218t-151 -71q-78 0 -237 47t-216 47q-51 0 -83 -20.5t-62 -77.5l-152 74q33 121 101.5 196.5t162.5 75.5q82 0 231.5 -47t213.5 -47q47 0 69.5 21.5t42.5 78.5z" />
-<glyph unicode="&#xad;" horiz-adv-x="636" d="M596 465h-555v260h555v-260z" />
-<glyph unicode="&#x2000;" horiz-adv-x="802" />
-<glyph unicode="&#x2001;" horiz-adv-x="1607" />
-<glyph unicode="&#x2002;" horiz-adv-x="802" />
-<glyph unicode="&#x2003;" horiz-adv-x="1607" />
-<glyph unicode="&#x2004;" horiz-adv-x="534" />
-<glyph unicode="&#x2005;" horiz-adv-x="401" />
-<glyph unicode="&#x2006;" horiz-adv-x="266" />
-<glyph unicode="&#x2007;" horiz-adv-x="266" />
-<glyph unicode="&#x2008;" horiz-adv-x="200" />
-<glyph unicode="&#x2009;" horiz-adv-x="321" />
-<glyph unicode="&#x200a;" horiz-adv-x="88" />
-<glyph unicode="&#x2010;" horiz-adv-x="636" d="M596 465h-555v260h555v-260z" />
-<glyph unicode="&#x2011;" horiz-adv-x="636" d="M596 465h-555v260h555v-260z" />
-<glyph unicode="&#x2012;" horiz-adv-x="636" d="M596 465h-555v260h555v-260z" />
-<glyph unicode="&#x2013;" horiz-adv-x="1024" d="M1022 465h-1022v219h1022v-219z" />
-<glyph unicode="&#x2014;" horiz-adv-x="2048" d="M2048 465h-2048v219h2048v-219z" />
-<glyph unicode="&#x2018;" horiz-adv-x="460" d="M389 1296l-41 -196q-86 2 -137 10t-90 43t-39 96q0 53 39 131l98 207l129 -39l-47 -202q-2 -16 10 -23z" />
-<glyph unicode="&#x2019;" horiz-adv-x="460" d="M244 1100l-131 39l47 202q6 18 -10 25l-78 25l41 196q63 0 104 -5t82 -19.5t60.5 -46t19.5 -78.5q0 -57 -37 -131z" />
-<glyph unicode="&#x201c;" horiz-adv-x="829" d="M389 1296l-41 -196q-86 2 -137 10t-90 43t-39 96q0 53 39 131l98 207l129 -39l-47 -202q-2 -16 10 -23zM758 1296l-41 -196q-86 2 -137.5 10t-90 43t-38.5 96q0 53 38 131l99 207l129 -39l-47 -202q-2 -16 10 -23z" />
-<glyph unicode="&#x201d;" horiz-adv-x="829" d="M244 1100l-131 39l47 202q6 18 -10 25l-78 25l41 196q63 0 104 -5t82 -19.5t60.5 -46t19.5 -78.5q0 -57 -37 -131zM612 1100l-131 39l47 202q6 18 -10 25l-78 25l41 196q63 0 104.5 -5t82.5 -19.5t60.5 -46t19.5 -78.5q0 -57 -37 -131z" />
-<glyph unicode="&#x2026;" horiz-adv-x="1443" d="M432 135q0 -160 -174 -160q-176 0 -176 160t176 160q174 0 174 -160zM899 135q0 -160 -174 -160q-176 0 -176 160t176 160q174 0 174 -160zM1362 135q0 -160 -174 -160q-176 0 -176 160t176 160q174 0 174 -160z" />
-<glyph unicode="&#x202f;" horiz-adv-x="321" />
-<glyph unicode="&#x205f;" horiz-adv-x="401" />
-<glyph unicode="&#xe000;" horiz-adv-x="1065" d="M0 1065h1065v-1065h-1065v1065z" />
-<glyph horiz-adv-x="1024" />
-</font>
-</defs></svg>