合并最新代码，并解决冲突。

Signed-off-by: zouap <zouap@pcl.ac.cn>

public/home/search.js

@@ -475,7 +475,7 @@ function displayRepoResult(page,jsonResult,onlyReturnNum,keyword){
             }
             html += "  <div class=\"content\">";	
             html += "       <div class=\"ui header\">";
-            html += "           <a class=\"name\" href=\"/" + recordMap["owner_name"] + "/" + recordMap["real_name"] +"\"> <span class=\"highlight\">" + recordMap["owner_name"] +"</span> <span>/</span> <strong>" + recordMap["name"] + "</strong></a>";
+            html += "           <a class=\"name\" href=\"/" + recordMap["owner_name"] + "/" + recordMap["real_name"] +"\"> <span>" + recordMap["owner_name"] +"</span> <span>/</span> <strong>" + recordMap["name"] + "</strong></a>";
             html +="            <span class=\"middle\"><svg class=\"svg octicon-repo-clone\" width=\"16\" height=\"16\" aria-hidden=\"true\"><use xlink:href=\"#octicon-repo-clone\"></use></svg></span>";
             html +="        </div>";
             html += "       <div class=\"description\">";

templates/explore/search_new.tmpl

@@ -4,15 +4,13 @@
         <div class="repos--seach">
             <div class="ui container">
                 <div class="ui two column centered grid">
-                    <div class="ui two column centered grid">
-                        <div class="fourteen wide mobile ten wide tablet ten wide computer column ui form ignore-dirty" style="margin-top:1.2rem;margin-bottom: 1.2rem;">
-                            <div class="ui fluid action input">
+                    <div class="fourteen wide mobile ten wide tablet ten wide computer column ui form ignore-dirty" style="margin-top:1.2rem;margin-bottom: 1.2rem;">
+                        <div class="ui fluid action input">
                                 <input name="q" id="keyword_input" value="{{.Keyword}}" placeholder="搜索..." autofocus="">
                                 <input type="hidden" name="topic" value="">
                                 <input type="hidden" name="tab" value="">
                                 <input type="hidden" name="sort" value="hot">
                                 <button class="ui green button" onclick="search()">搜索</button>
-                            </div>
                         </div>
                     </div>
                 </div>