Merge pull request #2157 from visuddhinanda/laravel

取消句子内p换行

app/Http/Resources/ArticleResource.php

@@ -195,9 +195,13 @@ class ArticleResource extends JsonResource
 
             $mode = $request->get('mode','read');
             $format = $request->get('format','react');
-            $data["html"] = MdRender::render($this->content,
-                                            $channels,$query_id,$mode,
-                                            'translation','markdown',$format);
+
+            $html = MdRender::render($this->content,
+                                     $channels,$query_id,$mode,
+                                     'translation','markdown',$format);
+            //Log::debug('article render',['content'=>$this->content,'format'=>$format,'html'=>$html]);
+
+            $data["html"] = $html;
             if(empty($this->summary)){
                 $data["_summary"] = MdRender::render($this->content,
                                                     $channels,$query_id,$mode,

resources/mustache/article/html/main.html

@@ -8,6 +8,9 @@
             text-indent: 2em;
             line-height: 1.7em;
         }
+        .sentence>p{
+            display: inline;
+        }
         a {
             text-decoration: none;
         }