From 168d713df8f58fb8030443f9f0ea71b798284da5 Mon Sep 17 00:00:00 2001
From: Joseph Reagle <joseph.2011@reagle.org>
Date: Wed, 23 Jan 2013 12:46:41 -0500
Subject: [PATCH] ul/li have no top/bottom margins, but list do

---
 pelican/themes/notmyidea/static/css/main.css |  6 ++++--
 tests/output/basic/theme/css/main.css        | 10 +++++++---
 tests/output/custom/theme/css/main.css       | 10 +++++++---
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pelican/themes/notmyidea/static/css/main.css b/pelican/themes/notmyidea/static/css/main.css
index ae8fe3d6..0295f6b2 100644
--- a/pelican/themes/notmyidea/static/css/main.css
+++ b/pelican/themes/notmyidea/static/css/main.css
@@ -74,14 +74,16 @@ em, i {font-style: italic;}
 /* Lists */
 ul {
 	list-style: outside disc;
-	margin: 0.5em 0 0 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
 ol {
 	list-style: outside decimal;
-	margin: 0.5em 0 0 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
+li { margin-top: 0.5em;}
+
 .post-info {
     float:right;
     margin:10px;
diff --git a/tests/output/basic/theme/css/main.css b/tests/output/basic/theme/css/main.css
index 29cce82c..0295f6b2 100644
--- a/tests/output/basic/theme/css/main.css
+++ b/tests/output/basic/theme/css/main.css
@@ -65,7 +65,8 @@ h1 a:hover {
 }
 	
 /* Paragraphs */
-p {margin-bottom: 1.143em;}
+p { margin-top: 1em;
+    margin-bottom: 1em;}
 
 strong, b {font-weight: bold;}
 em, i {font-style: italic;}
@@ -73,14 +74,16 @@ em, i {font-style: italic;}
 /* Lists */
 ul {
 	list-style: outside disc;
-	margin: 1em 0 1.5em 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
 ol {
 	list-style: outside decimal;
-	margin: 1em 0 1.5em 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
+li { margin-top: 0.5em;}
+
 .post-info {
     float:right;
     margin:10px;
@@ -88,6 +91,7 @@ ol {
 }
 
 .post-info p{
+    margin-top: 1px;
     margin-bottom: 1px;
 }
 
diff --git a/tests/output/custom/theme/css/main.css b/tests/output/custom/theme/css/main.css
index 29cce82c..0295f6b2 100644
--- a/tests/output/custom/theme/css/main.css
+++ b/tests/output/custom/theme/css/main.css
@@ -65,7 +65,8 @@ h1 a:hover {
 }
 	
 /* Paragraphs */
-p {margin-bottom: 1.143em;}
+p { margin-top: 1em;
+    margin-bottom: 1em;}
 
 strong, b {font-weight: bold;}
 em, i {font-style: italic;}
@@ -73,14 +74,16 @@ em, i {font-style: italic;}
 /* Lists */
 ul {
 	list-style: outside disc;
-	margin: 1em 0 1.5em 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
 ol {
 	list-style: outside decimal;
-	margin: 1em 0 1.5em 1.5em;
+	margin: 0em 0 0 1.5em;
 }
 
+li { margin-top: 0.5em;}
+
 .post-info {
     float:right;
     margin:10px;
@@ -88,6 +91,7 @@ ol {
 }
 
 .post-info p{
+    margin-top: 1px;
     margin-bottom: 1px;
 }