From cf29edcd7465e99bf123765d35a06afb463edd64 Mon Sep 17 00:00:00 2001
From: Jakob Kramer <jakob.kramer@gmx.de>
Date: Tue, 24 Apr 2012 17:16:31 +0200
Subject: allow pre+code tags in rendered HTML

---
 mediagoblin/static/css/base.css | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'mediagoblin/static/css')

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index ed3f69a6..6909bf28 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -544,18 +544,34 @@ table.media_panel th {
   margin-left: 10px;
 }
 
-/* ASCII art */
+/* ASCII art and code */
 
 @font-face {
   font-family: Inconsolata;
   src: local('Inconsolata'), url('../fonts/Inconsolata.otf') format('opentype')
 }
 
-.ascii-wrapper pre {
+pre, code {
   font-family: Inconsolata, monospace;
   line-height: 1em;
 }
 
+pre {
+  overflow: auto;
+  /* -10px, because it is usually preceded by <p> with margin-bottom: 20px */ 
+  margin: -10px 0 10px 0;
+}
+
+.comment_wrapper pre {
+  /* same as above, but with 2px */
+  margin: 8px 0 10px 0;
+}
+
+.ascii-wrapper pre {
+  /* but it should not affect the ASCII art */
+  margin: 0;
+}
+
 /* Media queries and other responsivisivity */
 @media screen and (max-width: 940px) {
   .media_pane {
-- 
cgit v1.2.3