From edf68fefc43225112f5716e003568733d374afad Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 4 Dec 2010 11:56:09 +0000
Subject: [PATCH] fixed formatting for combined styles (#1)

---
 css/basic.css   | 3 ++-
 css/content.css | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/css/basic.css b/css/basic.css
index b9045dc..d0f44e8 100644
--- a/css/basic.css
+++ b/css/basic.css
@@ -170,8 +170,9 @@ acronym, abbr {
 }
 
 pre, code, samp, kbd {
-    font: normal 1em Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace;
+    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Liberation Mono", Monaco, "Courier New", monospace;
     /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */
+    font-size: 1em;
     direction: ltr;
     text-align: left;
 }
diff --git a/css/content.css b/css/content.css
index 0d405c2..fae5dc1 100644
--- a/css/content.css
+++ b/css/content.css
@@ -64,6 +64,10 @@
     background-color: __background_alt__;
     color: inherit;
 }
+/* fix if background-color hides underlining */
+.dokuwiki em.u code {
+    text-decoration: underline;
+}
 .dokuwiki pre {
     border: 1px solid __border__;
     padding: 0 .2em;