Explorar el Código

Merge pull request #2095 from weseek/support/adjust-kibela-column

Support/adjust kibela column
itizawa hace 6 años
padre
commit
aea151415b
Se han modificado 2 ficheros con 7 adiciones y 3 borrados
  1. 3 3
      src/client/js/components/PageEditor.jsx
  2. 4 0
      src/client/styles/scss/_wiki.scss

+ 3 - 3
src/client/js/components/PageEditor.jsx

@@ -288,8 +288,8 @@ class PageEditor extends React.Component {
     const emojiStrategy = this.props.appContainer.getEmojiStrategy();
 
     return (
-      <div className="d-flex">
-        <div className="page-editor-editor-container" style={{ flex: 1 }}>
+      <div className="row">
+        <div className="page-editor-editor-container col-6">
           <Editor
             ref={(c) => { this.editor = c }}
             value={this.state.markdown}
@@ -305,7 +305,7 @@ class PageEditor extends React.Component {
             onSave={this.onSaveWithShortcut}
           />
         </div>
-        <div className="d-none d-xl-block page-editor-preview-container" style={{ flex: 1 }}>
+        <div className="d-none d-xl-block page-editor-preview-container col-6">
           <Preview
             markdown={this.state.markdown}
             // eslint-disable-next-line no-return-assign

+ 4 - 0
src/client/styles/scss/_wiki.scss

@@ -123,6 +123,10 @@ div.body {
     }
   }
 
+  pre {
+    white-space: pre-line;
+  }
+
   // only inline code blocks
   p code {
     font-family: $font-family-monospace-not-strictly;