Merge pull request gollum#597 from shanebdavis/master

altered CSS to more closely match github's markdown css
github · Dec 4, 2012 · 64d90b0 · 64d90b0
2 parents b81aa92 + a0e9989
commit 64d90b0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css
@@ -21,7 +21,9 @@ body, html {
 #wiki-wrapper {
   margin: 0 auto;
   overflow: visible;
-  width: 80%;
+  width: 920px;
+  padding-left:20px;
+  padding-right:20px;
 }
 
 a:link {

diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css
@@ -97,20 +97,16 @@ a.absent {
 .markdown-body h1 {
   font-size: 28px;
   color: #000;
-  margin-top: 50px;
-  margin-bottom: 20px;
+  margin-top: 20px;
+  margin-bottom: 10px;
 }
 .markdown-body h2 {
   font-size: 24px;
   border-bottom: 1px solid #ccc;
   color: #000;
-  margin-top: 40px;
-  margin-bottom: 20px;
 }
 .markdown-body h3 {
   font-size: 18px;
-  margin-top: 30px;
-  margin-bottom: 15px;
 }
 .markdown-body h4 {
   font-size: 16px;
@@ -127,10 +123,13 @@ a.absent {
 .markdown-body ul,
 .markdown-body ol,
 .markdown-body dl,
-.markdown-body li,
 .markdown-body table,
 .markdown-body pre {
-  margin: 15px 0;
+  margin: 0px 0;
+  margin-bottom: 15px;
+}
+.markdown-body li {
+  margin: 0px;
 }
 .markdown-body hr {
   background: transparent url(../images/dirty-shade.png) repeat-x 0 0;
@@ -146,12 +145,9 @@ a.absent {
 .markdown-body>h5:first-child,
 .markdown-body>h6:first-child {
 }
-.markdown-body h1+h2{
+.markdown-body h1+h2+h3{
   margin-top: 30px;
 }
-.markdown-body h2+h3{
-  margin-top: 10px;
-}
 .markdown-body a:first-child h1,
 .markdown-body a:first-child h2,
 .markdown-body a:first-child h3,