Merge branch 'dev' of https://gitcode.net/dcloud/hello-uni-app-x into dev

pages/CSS/text/line-height.uvue

 <template>
   <view style="flex-grow: 1;">
     <view style="height: 1000rpx;background-color: gray;justify-content: center;align-items: center;">
-      <text class="common">CSS测试 CSS测试 CSS测试</text>
       <text class="common" style="line-height: 150rpx;">line-height: 150rpx</text>
-      <text class="common">CSS测试 CSS测试 CSS测试</text>
       <text class="common" style="line-height: 3;">line-height: 3</text>
-      <text class="common">CSS测试 CSS测试 CSS测试</text>
       <text class="common" style="line-height: 3em;">line-height: 3em</text>
-      <text class="common">CSS测试 CSS测试 CSS测试</text>
+      <text class="common" style="line-height: 3;">line-height: 3\nline-height: 3\nline-height: 3</text>
     </view>
   </view>
 </template>
@@ -19,5 +16,8 @@
 <style>
   .common {
     font-size: 20px;
+    border: 1px red solid;
+    margin: 10px 0;
+    padding: 0 10px;
   }
 </style>