Merge branch 'master' of github.com:imathis/octopress

* 'master' of github.com:imathis/octopress: Using data.code.to_i like a true Rubyist in plugins/gist_code.rb. Heh. imathis#438 Fix for bottom margin in nested lists.
briansimmons · Mar 5, 2013 · df09f01 · df09f01
2 parents 7628065 + 8c7c769
commit df09f01
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.themes/classic/sass/base/_typography.scss b/.themes/classic/sass/base/_typography.scss
@@ -73,6 +73,7 @@ ol { list-style-type: decimal;
     ol { list-style-type: lower-roman; margin-bottom: 0px; }}}
 
 ul, ol { &, ul, ol { margin-left: 1.3em; }}
+ul, ol { ul, ol { margin-bottom: 0em; }}
 
 strong { font-weight: bold; }