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. #438
  Fix for bottom margin in nested lists.
This commit is contained in:
Parker Moore 2013-03-05 23:44:02 +01:00
commit 7f4cf25546

View File

@ -73,6 +73,7 @@ ol { list-style-type: decimal;
ol { list-style-type: lower-roman; margin-bottom: 0px; }}} ol { list-style-type: lower-roman; margin-bottom: 0px; }}}
ul, ol { &, ul, ol { margin-left: 1.3em; }} ul, ol { &, ul, ol { margin-left: 1.3em; }}
ul, ol { ul, ol { margin-bottom: 0em; }}
strong { font-weight: bold; } strong { font-weight: bold; }