From 49c6534da6ac48ca6b2f716e655d9301369041c8 Mon Sep 17 00:00:00 2001 From: kristi Date: Tue, 8 May 2012 17:11:02 -0700 Subject: [PATCH] Put asciidoc fix into template with the rest of the markup css Also remove padding from the asciidoc code block so first line doesn't get indented --- lib/gollum/frontend/public/gollum/css/gollum.css | 11 ----------- lib/gollum/frontend/public/gollum/css/template.css | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/gollum/frontend/public/gollum/css/gollum.css b/lib/gollum/frontend/public/gollum/css/gollum.css index 7da4f2af..e8847dcb 100755 --- a/lib/gollum/frontend/public/gollum/css/gollum.css +++ b/lib/gollum/frontend/public/gollum/css/gollum.css @@ -10,17 +10,6 @@ A basic stylesheet for Gollum */ -/* - Fixes AsciiDoc listing block rendering. - Must be !important to override - .markdown-body code, .markdown-body tt { - in template.css. - https://github.com/github/gollum/issues/278 -*/ -pre > tt { - white-space: pre !important; -} - /* @section core */ body, html { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; diff --git a/lib/gollum/frontend/public/gollum/css/template.css b/lib/gollum/frontend/public/gollum/css/template.css index 196fa4c0..119c2395 100644 --- a/lib/gollum/frontend/public/gollum/css/template.css +++ b/lib/gollum/frontend/public/gollum/css/template.css @@ -331,6 +331,7 @@ a.absent { background-color: #f8f8f8; border-radius: 3px; } +.markdown-body pre>tt, .markdown-body pre>code { margin: 0; padding: 0;