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

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

custom/public/css/git.openi.css

@@ -44,12 +44,6 @@
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
 }
-.ui.label{
-  font-weight: normal;
-}
-.active {
-  color: #0366D6 !important;
-}
 
 .opacity5{ opacity:0.5;}
 .radius15{ border-radius:1.5rem !important; } 
@@ -287,70 +281,6 @@
   position: relative;
 }
 
-/**seach**/
-/**搜索导航条适配窄屏**/
-.seachnav{
-  overflow-x: auto;   
-  overflow-y: hidden;  
-  scrollbar-width: none; /* firefox */
-  -ms-overflow-style: none; /* IE 10+ */
-}
-.seachnav::-webkit-scrollbar {
-  display: none; /* Chrome Safari */
-}
-.ui.green.button, .ui.green.buttons .button{
-	background-color: #5BB973;
-}
-.seach .repos--seach{
-  padding-bottom: 0;
-  border-bottom: none;
-}
-.seach .ui.secondary.pointing.menu{
-  border-bottom: none;
-}
-.seach .ui.secondary.pointing.menu .item > i{
-  margin-right: 5px;
-}
-.seach .ui.secondary.pointing.menu .active.item{
-  border-bottom-width: 2px;
-  margin: 0 0 -1px;
-}
-.seach .ui.menu .active.item>.label {
-  background: #1684FC;
-  color: #FFF;
-}
-.seach .ui.menu .item>.label:not(.active.item>.label) {
-  background: #e8e8e8;
-  color: rgba(0,0,0,.6);
-}
-
-.highlight{
-  color: red;
-}
-.ui.list .list>.item>img.image+.content, .ui.list>.item>img.image+.content {
-  width: calc(100% - 3.0em);
-  margin-left: 0;
-}
-
-.seach .ui.list .list>.item .header, .seach .ui.list>.item .header{
-  margin-bottom: 0.5em;
-  font-size: 1.4rem !important;
-  font-weight: normal;
-}
-.seach .time, .seach .time a{
-  font-size: 12px;
-  color: grey;
-}
-
-.seach .list .item.members .ui.avatar.image {
-  width: 3.2em;
-  height: 3.2em;
-}
-.ui.list .list>.item.members>img.image+.content, .ui.list>.item.members>img.image+.content {
-  width: calc(100% - 4.0em);
-  margin-left: 0;
-}
-
 @media only screen and (max-width: 767px) {
   .am-mt-30{ margin-top: 1.5rem !important;}
   .ui.secondary.hometop.segment{

models/search_record.go

@@ -1,8 +1,6 @@
 package models
 
 import (
-	"fmt"
-
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/timeutil"
 )
@@ -21,12 +19,10 @@ func SaveSearchKeywordToDb(keyword string) error {
 	}
 	sess := x.NewSession()
 	defer sess.Close()
-
-	re, err := sess.Insert(record)
+	_, err := sess.Insert(record)
 	if err != nil {
 		log.Info("insert error." + err.Error())
 		return err
 	}
-	log.Info("success to save db.re=" + fmt.Sprint((re)))
 	return nil
 }

routers/search.go

@@ -52,7 +52,7 @@ func SearchApi(ctx *context.Context) {
 	if PageSize <= 0 || PageSize > 200 {
 		PageSize = setting.UI.IssuePagingNum
 	}
-	if Key != "" {
+	if Key != "" && !OnlyReturnNum {
 		models.SaveSearchKeywordToDb(Key)
 	}
 	if TableName == "repository" {

templates/explore/search_new.tmpl

@@ -5,7 +5,7 @@
             <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">
+                        <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="">

web_src/less/openi.less

@@ -804,3 +804,67 @@ display: block;
 	color: #0366d6 !important;
 	box-shadow: -15px 0px 10px #fff;
 }
+
+/**seach**/
+/**搜索导航条适配窄屏**/
+.seachnav{
+	overflow-x: auto;   
+	overflow-y: hidden;  
+	scrollbar-width: none; /* firefox */
+	-ms-overflow-style: none; /* IE 10+ */
+  }
+  .seachnav::-webkit-scrollbar {
+	display: none; /* Chrome Safari */
+  }
+  .ui.green.button, .ui.green.buttons .button{
+	  background-color: #5BB973;
+  }
+  .seach .repos--seach{
+	padding-bottom: 0;
+	border-bottom: none;
+  }
+  .seach .ui.secondary.pointing.menu{
+	border-bottom: none;
+  }
+  .seach .ui.secondary.pointing.menu .item > i{
+	margin-right: 5px;
+  }
+  .seach .ui.secondary.pointing.menu .active.item{
+	border-bottom-width: 2px;
+	margin: 0 0 -1px;
+  }
+  .seach .ui.menu .active.item>.label {
+	background: #1684FC;
+	color: #FFF;
+  }
+  .seach .ui.menu .item>.label:not(.active.item>.label) {
+	background: #e8e8e8;
+	color: rgba(0,0,0,.6);
+  }
+  
+  .highlight{
+	color: red;
+  }
+  .ui.list .list>.item>img.image+.content, .ui.list>.item>img.image+.content {
+	width: calc(100% - 3.0em);
+	margin-left: 0;
+  }
+  
+  .seach .ui.list .list>.item .header, .seach .ui.list>.item .header{
+	margin-bottom: 0.5em;
+	font-size: 1.4rem !important;
+	font-weight: normal;
+  }
+  .seach .time, .seach .time a{
+	font-size: 12px;
+	color: grey;
+  }
+  
+  .seach .list .item.members .ui.avatar.image {
+	width: 3.2em;
+	height: 3.2em;
+  }
+  .ui.list .list>.item.members>img.image+.content, .ui.list>.item.members>img.image+.content {
+	width: calc(100% - 4.0em);
+	margin-left: 0;
+  }