Merge pull request redpwn#366 from redpwn/feat/improve-chall-rendering

feat(client): improve chall rendering

Author: chen-robert

client/src/components/markdown.js

@@ -4,11 +4,24 @@ import Timer from './timer'
 import Sponsors from './sponsors'
 import ActionButton from './action-button'
 
+// From https://github.com/developit/snarkdown/issues/75?
+const snarkdownEnhanced = (md) => {
+  const htmls = md
+    .split(/(?:\r?\n){2,}/)
+    .map(l =>
+      [' ', '\t', '#', '-', '*'].some(ch => l.startsWith(ch))
+        ? snarkdown(l)
+        : `<p>${snarkdown(l)}</p>`
+    )
+
+  return htmls.join('\n\n')
+}
+
 const Markdown = ({ content }) => (
   <Markup
     type='html'
     trim={false}
-    markup={snarkdown(content)}
+    markup={snarkdownEnhanced(content)}
     components={{ Timer, Sponsors, ActionButton }}
   />
 )

client/src/components/problem.js

@@ -99,6 +99,11 @@ export default withStyles({
     '& a': {
       display: 'inline',
       padding: 0
+    },
+    '& p': {
+      lineHeight: '1.4em',
+      fontSize: '1em',
+      marginTop: 0
     }
   },
   divider: {