From d023ece3260442dd4c61262ae8b4fbcd94001583 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 4 Jun 2015 09:02:58 +0000
Subject: [PATCH] Some small fixes for the Content Centre CSS (#2492, #2491).

git-svn-id: https://svn.libreccm.org/ccm/trunk@3459 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl | 3 +++
 ccm-core/web/themes/foundry/foundry/styles/admin.css    | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl b/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl
index 056c860d8..711246bba 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/bebop/label.xsl
@@ -153,6 +153,9 @@
     
         <span>
             <xsl:call-template name="foundry:process-datatree-attributes"/>
+            <xsl:if test="$escape = 'yes'">
+                <xsl:attribute name="class" select="'escaped wysiwyg'"/>
+            </xsl:if>
             <xsl:choose>
                 <xsl:when test="$color != ''">
                     <xsl:attribute name="style">
diff --git a/ccm-core/web/themes/foundry/foundry/styles/admin.css b/ccm-core/web/themes/foundry/foundry/styles/admin.css
index c0fd6b669..abf323039 100644
--- a/ccm-core/web/themes/foundry/foundry/styles/admin.css
+++ b/ccm-core/web/themes/foundry/foundry/styles/admin.css
@@ -1310,6 +1310,7 @@ span.cmsTaskCommentCredentials {
 div.cmsNotesDisplay {
     margin-bottom: 1em;
     border: solid 1px #999999;
+    min-height: 7.5em;
 }
 
 div.cmsNotesContent {
@@ -1801,4 +1802,8 @@ span#quickLinksCascade {
 
 .static-new-item-form input {
     height: 1.8em;
+}
+
+.wysiwyg ul {
+    list-style: disc inside;
 }
\ No newline at end of file