From dc3f74c642be4dab8ce5507a444ba93371527e78 Mon Sep 17 00:00:00 2001
From: jackyzha0 <j.zhao2k19@gmail.com>
Date: Sun, 11 Apr 2021 14:55:54 -0700
Subject: fix broken multiline

---
 frontend/src/components/Inputs/Code.js    |  8 ++++++--
 frontend/src/components/renderers/Code.js |  9 ++++++++-
 frontend/src/pages/index.js               | 13 ++++++++++---
 frontend/src/pages/raw/[hash].js          |  1 -
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Inputs/Code.js b/frontend/src/components/Inputs/Code.js
index adb1536..96c08c4 100644
--- a/frontend/src/components/Inputs/Code.js
+++ b/frontend/src/components/Inputs/Code.js
@@ -6,11 +6,15 @@ import {Highlighter} from "../renderers/Code";
 import {CodeLike, Hover} from "../Common/mixins";
 
 const Wrapper = styled.div`
+  display: block;
   position: relative;
+  width: calc(100%);
 `
+
 const EditorWrapper = styled(Editor)`
   overflow: visible !important;
-  
+  position: relative;
+
   & > * {
     padding: 0 !important;
     width: 100%;
@@ -18,7 +22,7 @@ const EditorWrapper = styled(Editor)`
   
   & pre, & code, & > textarea {
     ${CodeLike}
-    min-height: 40vh;
+    // min-height: 40vh;
   }
   
   & pre {
diff --git a/frontend/src/components/renderers/Code.js b/frontend/src/components/renderers/Code.js
index 85fd5ab..c932add 100644
--- a/frontend/src/components/renderers/Code.js
+++ b/frontend/src/components/renderers/Code.js
@@ -40,11 +40,18 @@ export const StyledPre = styled.pre`
   }
 `
 
+const PreWithBr = (props) => (
+  <StyledPre {...props}>
+    {props.children}
+    <br />
+  </StyledPre>
+)
+
 export const Highlighter = ({language, lineNumbers, theme, pre = StyledPre, children}) => <SyntaxHighlighter
   language={LANGS[language]}
   style={THEMES[theme]}
   showLineNumbers={lineNumbers}
-  PreTag={pre}>
+  PreTag={PreWithBr}>
     {children}
 </SyntaxHighlighter>
 
diff --git a/frontend/src/pages/index.js b/frontend/src/pages/index.js
index 1b550e8..867a074 100644
--- a/frontend/src/pages/index.js
+++ b/frontend/src/pages/index.js
@@ -10,6 +10,7 @@ import Markdown from '../components/renderers/Markdown'
 import {Button, SubmitButton} from "../components/Common/Button";
 import {newPaste} from "../http/shared";
 import {Watermark} from "../components/Watermark";
+import {Labelled} from "../components/decorators/Labelled";
 
 const Container = styled.form`
   width: 100%;
@@ -105,16 +106,22 @@ const NewPaste = () =>  {
       return (
         <Flex>
           <FlexLeft>
-            {pasteInput}
+            <Labelled label="content">
+              {pasteInput}
+            </Labelled>
           </FlexLeft>
           <FlexRight className='preview' >
-            {preview}
+            <Labelled label="preview">
+              {preview}
+            </Labelled>
           </FlexRight>
         </Flex>
       );
     } else {
       return (
-        pasteInput
+        <Labelled label="content">
+          {pasteInput}
+        </Labelled>
       );
     }
   }
diff --git a/frontend/src/pages/raw/[hash].js b/frontend/src/pages/raw/[hash].js
index 3374eea..9edde36 100644
--- a/frontend/src/pages/raw/[hash].js
+++ b/frontend/src/pages/raw/[hash].js
@@ -11,7 +11,6 @@ const RawText = styled.pre`
 
 export async function getServerSideProps(ctx) {
   const data = await resolvePaste(ctx.params.hash)
-  console.log(data)
   return { props: { ...data } }
 }
 
-- 
cgit v1.2.3