Merge branch 'release/5.4' into 'grey'

样式调整



See merge request !199

@@ -12,7 +12,6 @@
     .panel-body {
     .panel-body {
         padding-left: 20px;
         padding-left: 20px;
         padding-right: 20px;
         padding-right: 20px;
-        display: flex;
         flex-wrap: wrap;
         flex-wrap: wrap;
         justify-content: space-between;
         justify-content: space-between;
 
 

 .guang-article {
 .guang-article {
     position: relative;
     position: relative;
     margin-top: 28px;
     margin-top: 28px;
+    height: 9.2rem;
+    overflow: hidden;
     
     
     .cate {
     .cate {
         position: absolute;
         position: absolute;
@@ -54,15 +56,22 @@
     }
     }
 
 
     .digest {
     .digest {
-        font-size: 23px;
+        font-size: 16px;
+        overflow : hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 3;
+        -webkit-box-orient: vertical;
+        min-height: 88px;
     }
     }
 
 
     .meta {
     .meta {
-        margin-top: 40px;
-        font-size: 17px;
+        margin-top: 20px;
+        font-size: 12px;
 
 
         .iconfont {
         .iconfont {
             vertical-align: middle;
             vertical-align: middle;
+            font-size: 10px
         }
         }
 
 
         span {
         span {

@@ -5,8 +5,9 @@
 
 
     .brand-info-box {
     .brand-info-box {
         background-color: #f5f5f5;
         background-color: #f5f5f5;
-        padding-top: 44px;
-        height: 480px;
+        padding-top: 22px;
+        height: 368px;
+        overflow: hidden;
     }
     }
 
 
     img {
     img {
@@ -18,12 +19,12 @@
         font-size: 18px;
         font-size: 18px;
         color: #b0b0b0;
         color: #b0b0b0;
         margin-top: 40px;
         margin-top: 40px;
-        margin-bottom: 70px;
+        margin-bottom: 60px;
     }
     }
 
 
     .summary {
     .summary {
-        font-size: 25px;
-        margin-bottom: 50px;
+        font-size: 16px;
+        margin-bottom: 36px;
 
 
         .red {
         .red {
             color: #e27b88;
             color: #e27b88;

@@ -46,7 +46,7 @@
         text-overflow: ellipsis;
         text-overflow: ellipsis;
         overflow: hidden;
         overflow: hidden;
         background-color: #fff;
         background-color: #fff;
-        font-size: 24px;
+        font-size: 16px;
         color: #808080;
         color: #808080;
     }
     }
 }
 }

@@ -35,7 +35,7 @@
         padding-right: 10px;
         padding-right: 10px;
         height: 30px;
         height: 30px;
         line-height: 30px;
         line-height: 30px;
-        font-size: 16px;
+        font-size: 12px;
         border-radius: 32px;
         border-radius: 32px;
         background-color: #999;
         background-color: #999;