From 1998ec88b82f29f7ea3c65f41895a1e76a1ded5a Mon Sep 17 00:00:00 2001
From: Leo Koppelkamm <diebuche@gmail.com>
Date: Sun, 12 May 2013 15:57:14 +0200
Subject: [PATCH] Fix overlapping text in markdown help

---
 app/assets/stylesheets/common.css.scss | 19 +++++++++----------
 app/views/site/_markdown_help.html.erb | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 049dadbff..0a23207d5 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1642,12 +1642,9 @@ a.button.submit {
 /* Rules for rich text editors */
 
 .richtext_container {
-  white-space: nowrap;
-
   .richtext_content {
     display: inline-block;
     vertical-align: top;
-    white-space: normal;
 
     .richtext_preview {
       display: inline-block;
@@ -1673,7 +1670,7 @@ a.button.submit {
     margin-left: 15px;
     background-color: #f8f8ff;
     padding: 10px;
-    width: 200px;
+    max-width: 450px;
 
     ul {
       margin-bottom: 0;
@@ -1685,20 +1682,22 @@ a.button.submit {
       padding-bottom: 5px;
     }
 
-    li h4, li span {
-      display: block;
+    li h4, li span, li p {
+      display: inline-block;
+      vertical-align: top;
       font-size: 11px;
     }
 
     li h4 {
+      width: 35%;
       margin: 0;
-      float: left;
     }
 
-    li span {
-      float: right;
-      width: 50%;
+    li span, li p {
+      width: 60%;
       margin-left: 10px;
+      margin-bottom: 5px;
+      white-space: nowrap;
     }
 
     input.richtext_doedit,
diff --git a/app/views/site/_markdown_help.html.erb b/app/views/site/_markdown_help.html.erb
index 07035477e..0d7fa3354 100644
--- a/app/views/site/_markdown_help.html.erb
+++ b/app/views/site/_markdown_help.html.erb
@@ -1,25 +1,25 @@
 <h4 class='heading'><%= t "site.markdown_help.title_html" %></h4>
 <ul>
-  <li class='clearfix'>
+  <li>
     <h4><%= t "site.markdown_help.headings" %></h4>
-    <span># <%= t "site.markdown_help.heading" %></span>
-    <span>## <%= t "site.markdown_help.subheading" %></span>
+    <p># <%= t "site.markdown_help.heading" %></br>
+       ## <%= t "site.markdown_help.subheading" %></p>
   </li>
-  <li class='clearfix'>
+  <li>
     <h4><%= t "site.markdown_help.unordered" %></h4>
-    <span>* <%= t "site.markdown_help.first" %></span>
-    <span>* <%= t "site.markdown_help.second" %></span>
+    <p>* <%= t "site.markdown_help.first" %></br>
+       * <%= t "site.markdown_help.second" %></p>
   </li>
-  <li class='clearfix'>
+  <li>
     <h4><%= t "site.markdown_help.ordered" %></h4>
-    <span>1. <%= t "site.markdown_help.first" %></span>
-    <span>2. <%= t "site.markdown_help.second" %></span>
+    <p>1. <%= t "site.markdown_help.first" %><br>
+       2. <%= t "site.markdown_help.second" %></p>
   </li>
-  <li class='clearfix'>
+  <li>
     <h4><%= t "site.markdown_help.link" %></h4>
     <span>[<%= t "site.markdown_help.text" %>](<%= t "site.markdown_help.url" %>)</span>
   </li>
-  <li class='clearfix'>
+  <li>
     <h4><%= t "site.markdown_help.image" %></h4>
     <span>![<%= t "site.markdown_help.alt" %>](<%= t "site.markdown_help.url" %>)</span>
   </li>
-- 
2.43.2