Resolve conflict

[rails.git] / app / views / site / _markdown_help.html.erb

diff --git a/app/views/site/_markdown_help.html.erb b/app/views/site/_markdown_help.html.erb
index 9c03ac6fe1bd78dec6d187e67e66c266509ff162..7c5639912b37c082e29ec42af5f27beba095035e 100644 (file)
--- a/app/views/site/_markdown_help.html.erb
+++ b/app/views/site/_markdown_help.html.erb
@@ -1,29 +1,26 @@
-<table>
-  <thead>
-    <tr>
-      <th colspan="2"><%= t "site.markdown_help.title" %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <th><%= t "site.markdown_help.headings" %></th>
-      <td># <%= t "site.markdown_help.heading" %><br />## <%= t "site.markdown_help.subheading" %></td>
-    </tr>
-    <tr>
-      <th><%= t "site.markdown_help.unordered" %></th>
-      <td>* <%= t "site.markdown_help.first" %><br />* <%= t "site.markdown_help.second" %></td>
-    </tr>
-    <tr>
-      <th><%= t "site.markdown_help.ordered" %></th>
-      <td>1. <%= t "site.markdown_help.first" %><br />2. <%= t "site.markdown_help.second" %></td>
-    </tr>
-    <tr>
-      <th><%= t "site.markdown_help.link" %></th>
-      <td>[<%= t "site.markdown_help.text" %>](<%= t "site.markdown_help.url" %>)</td>
-    </tr>
-    <tr>
-      <th><%= t "site.markdown_help.image" %></th>
-      <td>![<%= t "site.markdown_help.alt" %>](<%= t "site.markdown_help.url" %>)</td>
-    </tr>
-  </tbody>
-</table>
+<h4 class='heading'><%= t "site.markdown_help.title_html" %></h4>
+<ul>
+  <li>
+    <h4><%= t "site.markdown_help.headings" %></h4>
+    <p># <%= t "site.markdown_help.heading" %><br>
+       ## <%= t "site.markdown_help.subheading" %></p>
+  </li>
+  <li>
+    <h4><%= t "site.markdown_help.unordered" %></h4>
+    <p>* <%= t "site.markdown_help.first" %><br>
+       * <%= t "site.markdown_help.second" %></p>
+  </li>
+  <li>
+    <h4><%= t "site.markdown_help.ordered" %></h4>
+    <p>1. <%= t "site.markdown_help.first" %><br>
+       2. <%= t "site.markdown_help.second" %></p>
+  </li>
+  <li>
+    <h4><%= t "site.markdown_help.link" %></h4>
+    <span>[<%= t "site.markdown_help.text" %>](<%= t "site.markdown_help.url" %>)</span>
+  </li>
+  <li>
+    <h4><%= t "site.markdown_help.image" %></h4>
+    <span>![<%= t "site.markdown_help.alt" %>](<%= t "site.markdown_help.url" %>)</span>
+  </li>
+</ul>