Browse Source

Merge remote-tracking branch 'origin/master'

sandm 2 years ago
parent
commit
cd36f363de

+ 0 - 1
public/themes/default/assets/app/css/index_new2.css

@@ -352,7 +352,6 @@ body{
     font-size:18px;
     font-weight:bold;
     height: 40px;
-    line-height: 40px;
 }
 .home_pic_news .news_info .title_line{
     width:45px;

+ 1 - 1
public/themes/default/views/app/index.blade.php

@@ -373,7 +373,7 @@
 
                             <div class="pic_box"><img src="{{upload_asset($v->small_img)}}" alt="" border="0"/></div>
                             <div class="news_info">
-                                <div class="news_title substring">{{$v->title}}</div>
+                                <div class="news_title">{{$v->title}}</div>
                                 <div class="title_line"></div>
                                 <div class="news_content">{!!  cut_str(strip_tags(htmlspecialchars_decode($v->content,ENT_QUOTES)),'60',0,'...') !!}</div>
                                 <a href="