Merge branch 'dev'

FEMessage · Nov 22, 2019 · 8c83c27 · 8c83c27
2 parents b2d439a + 9f19faa
commit 8c83c27
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/components/line-content.vue b/src/components/line-content.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="line-content" :class="className">
-    {{ text }}
-  </div>
+  <div class="line-content" :class="className">{{ text }}</div>
 </template>
 <script>
 export default {

diff --git a/src/components/line-wrapper.vue b/src/components/line-wrapper.vue
@@ -63,7 +63,7 @@ export default {
   color: #f1f1f1;
   line-height: 20px;
   height: 20px;
-  white-space: nowrap;
+  white-space: pre;
   // word-break: break-all;
   box-sizing: border-box;
   padding-left: 16px;