routers/web/user/notification.go

@@ -344,9 +344,6 @@ func NotificationWatching(ctx *context.Context) {
 		page = 1
 	}
 
-	keyword := ctx.FormTrim("q")
-	ctx.Data["Keyword"] = keyword
-
 	var orderBy db.SearchOrderBy
 	ctx.Data["SortType"] = ctx.FormString("sort")
 	switch ctx.FormString("sort") {
@@ -381,7 +378,7 @@ func NotificationWatching(ctx *context.Context) {
 			Page:     page,
 		},
 		Actor:              ctx.Doer,
-		Keyword:            keyword,
+		Keyword:            ctx.FormTrim("q"),
 		OrderBy:            orderBy,
 		Private:            ctx.IsSigned,
 		WatchedByID:        ctx.Doer.ID,

templates/user/notification/notification_div.tmpl

@@ -35,26 +35,26 @@
 							{{$issue := .Issue}}
 							{{$repo := .Repository}}
 							<tr id="notification_{{.ID}}">
-								<td class="collapsing gt-pl-4" data-href="{{.Link}}">
+								<td class="collapsing" data-href="{{.Link}}">
 									{{if eq .Status 3}}
-										{{svg "octicon-pin" 16 "text blue"}}
+										<span class="blue">{{svg "octicon-pin"}}</span>
 									{{else if not $issue}}
-										{{svg "octicon-repo" 16 "text grey"}}
+										<span class="gray">{{svg "octicon-repo"}}</span>
 									{{else if $issue.IsPull}}
 										{{if $issue.IsClosed}}
 											{{if $issue.GetPullRequest.HasMerged}}
-												{{svg "octicon-git-merge" 16 "text purple"}}
+												<span class="purple">{{svg "octicon-git-merge"}}</span>
 											{{else}}
-												{{svg "octicon-git-pull-request" 16 "text red"}}
+												<span class="red">{{svg "octicon-git-pull-request"}}</span>
 											{{end}}
 										{{else}}
-											{{svg "octicon-git-pull-request" 16 "text green"}}
+											<span class="green">{{svg "octicon-git-pull-request"}}</span>
 										{{end}}
 									{{else}}
 										{{if $issue.IsClosed}}
-											{{svg "octicon-issue-closed" 16 "text red"}}
+											<span class="red">{{svg "octicon-issue-closed"}}</span>
 										{{else}}
-											{{svg "octicon-issue-opened" 16 "text green"}}
+											<span class="green">{{svg "octicon-issue-opened"}}</span>
 										{{end}}
 									{{end}}
 								</td>

web_src/css/user.css

@@ -85,6 +85,27 @@
   padding: 8px 15px;
 }
 
+.user.notification .svg {
+  float: left;
+  font-size: 2em;
+}
+
+.user.notification .svg.green {
+  color: var(--color-green);
+}
+
+.user.notification .svg.red {
+  color: var(--color-red);
+}
+
+.user.notification .svg.purple {
+  color: var(--color-purple);
+}
+
+.user.notification .svg.blue {
+  color: var(--color-blue);
+}
+
 .user.notification .content {
   float: left;
   margin-left: 7px;
@@ -149,13 +170,4 @@
 
 #notification_div .tab.segment {
   overflow-x: auto;
-  padding: 0;
-}
-
-#notification_div .menu .active.item {
-  background: var(--color-box-body);
-}
-
-#notification_table {
-  border: none;
 }