Merge branch 'dev'

Author: ddchef

src/App.vue

@@ -1,27 +1,29 @@
 <template>
   <div>
-    <el-form>
+    <el-form label-width="100px" label-position="top">
       <el-row :gutter="10">
-        <el-col :span="12">
-          <el-form-item label="旧数据：">
-            <el-input
-              v-model="oldStr"
-              type="textarea"
-              :autosize="{minRows: 2, maxRows: 15}"
-              placeholder="请输入旧数据"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="新数据：">
-            <el-input
-              v-model="newStr"
-              type="textarea"
-              :autosize="{minRows: 2, maxRows: 15}"
-              placeholder="请输入新数据"
-            ></el-input>
-          </el-form-item>
-        </el-col>
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="旧数据：">
+              <el-input
+                v-model="oldStr"
+                type="textarea"
+                :autosize="{minRows: 2, maxRows: 15}"
+                placeholder="请输入旧数据"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="新数据：">
+              <el-input
+                v-model="newStr"
+                type="textarea"
+                :autosize="{minRows: 2, maxRows: 15}"
+                placeholder="请输入新数据"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-col :span="8">
           <el-form-item label="展示效果：">
             <el-switch

src/lib/code-diff/index.vue

@@ -92,14 +92,48 @@ export default {
 }
 </script>
 
-<style>
+<style lang="postcss">
 .hljs{
   display: inline-block;
   padding: 0;
   background: transparent;
-  vertical-align:middle
+  vertical-align:middle;
+  height: 17px;
 }
-.d2h-file-header{
-  display: none
+.d2h-wrapper{
+  position: relative;
+}
+
+.d2h-wrapper .d2h-file-header{
+  display: none;
+}
+
+.d2h-wrapper .d2h-files-diff{
+  position: relative;
+}
+
+.d2h-wrapper .d2h-file-side-diff{
+  margin-bottom: -5px;
+}
+
+.d2h-wrapper .d2h-files-diff > .d2h-file-side-diff ~ .d2h-file-side-diff {
+  position: absolute;
+}
+
+.d2h-wrapper .d2h-code-side-emptyplaceholder {
+  max-height: 17px;
+}
+
+.d2h-wrapper .d2h-code-side-line,.d2h-wrapper .d2h-code-line {
+  display: block;
+  width: auto;
+}
+
+.d2h-wrapper .d2h-code-side-line.d2h-info {
+  height: 18px;
+}
+
+.d2h-wrapper .d2h-code-linenumber, .d2h-code-side-linenumber{
+  height: 19px;
 }
 </style>