css fix

public/less/_base.less

@@ -184,6 +184,18 @@ pre {
 			display: none!important;
 		}
 	}
+
+	&.tabs.buttons {
+		.active {
+			font-weight: 900;
+			&.green {
+		    box-shadow: 0 0 0 2px #13ae38 inset!important;
+			}
+			&.red {
+		    box-shadow: 0 0 0 2px #d41515 inset!important;
+			}
+		}
+	}
 }
 
 .overflow.menu {
@@ -271,6 +283,7 @@ footer {
 .octicon.icon,
 .mega-octicon.icon {
 	font-family: octicons;
+	opacity: 1!important;
 }
 
 // Accessibility

public/less/_repository.less

@@ -26,7 +26,7 @@
 		.fork-flag {
 			margin-left: @mega-octicon-width + 8px;
 			display: block;
-			font-size: 11px;
+			font-size: 12px;
 			line-height: 10px;
 			white-space: nowrap;
 		}

templates/repo/header.tmpl

@@ -2,32 +2,6 @@
 <div class="ui container"><!-- start container -->
 	<div class="ui vertically padded grid head"><!-- start grid -->
 		<div class="column"><!-- start column -->
-			{{if not .IsBare}}
-			<div class="ui black small compact menu floated right count labelled">
-				<a class="item{{if eq .OwnerID $.SignedUserID}} poping up{{end}}"{{if not (eq .OwnerID $.SignedUserID)}} href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" data-position="top center" data-variation="tiny"{{end}}>
-					<i class="icon octicon octicon-repo-forked"></i>
-					{{$.i18n.Tr "repo.fork"}}
-				</a>
-				<span class="active item num">{{.NumForks}}</span>
-			</div>
-			{{end}}
-
-			<div class="ui black small compact menu floated right count labelled">
-				<a class="item" href="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star?redirect_to={{$.Link}}">
-					<i class="icon fa-star{{if not $.IsStaringRepo}}-o{{end}}"></i>
-					{{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}}
-				</a>
-				<span class="active item num">{{.NumStars}}</span>
-			</div>
-
-			<div class="ui black small compact menu floated right count labelled">
-				<a class="item" href="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch?redirect_to={{$.Link}}">
-					<i class="icon fa fa-eye{{if not $.IsWatchingRepo}}-slash{{end}}"></i>
-					{{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}}
-				</a>
-				<span class="active item num">{{.NumWatches}}</span>
-			</div>
-
 			<div class="ui header">
 				<div class="ui huge breadcrumb">
 					<i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i>
@@ -37,6 +11,35 @@
 					{{if .IsMirror}}<div class="ui label">{{$.i18n.Tr "mirror"}}</div>{{end}}
 					{{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.RepoLink}}">{{SubStr .BaseRepo.RepoLink 1 -1}}</a></div>{{end}}
 				</div>
+
+				<div class="ui right">
+					<div class="ui labeled button" tabindex="0">
+					  <a class="ui grey button" href="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch?redirect_to={{$.Link}}">
+					    <i class="icon fa fa-eye{{if not $.IsWatchingRepo}}-slash{{end}}"></i>{{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}}
+					  </a>
+					  <a class="ui basic label">
+					    {{.NumWatches}}
+					  </a>
+					</div>
+					<div class="ui labeled button" tabindex="0">
+					  <a class="ui grey button" href="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star?redirect_to={{$.Link}}">
+					    <i class="icon fa-star{{if not $.IsStaringRepo}}-o{{end}}"></i>{{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}}
+					  </a>
+					  <a class="ui basic label">
+					    {{.NumStars}}
+					  </a>
+					</div>
+					{{if not .IsBare}}
+					<div class="ui labeled button" tabindex="0">
+					  <a class="ui grey button {{if eq .OwnerID $.SignedUserID}}poping up{{end}}" {{if not (eq .OwnerID $.SignedUserID)}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" data-position="top center" data-variation="tiny"{{end}}>
+					    <i class="icon octicon octicon-repo-forked"></i>{{$.i18n.Tr "repo.fork"}}
+					  </a>
+					  <a class="ui basic label">
+					    {{.NumForks}}
+					  </a>
+					</div>
+					{{end}}
+				</div>
 			</div>
 		</div><!-- end column -->
 	</div><!-- end grid -->

templates/repo/issue/list.tmpl

@@ -9,7 +9,7 @@
 			</div>
 		</div>
 		<div class="ui divider"></div>
-		<div class="ui tiny buttons">
+		<div class="ui tiny tabs buttons">
 		  <a class="ui green basic button {{if not .IsShowClosed}}active{{end}}" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&assignee={{.AssigneeID}}">
 		  	<i class="octicon octicon-issue-opened"></i>
 		  	{{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}}

templates/user/dashboard/issues.tmpl

@@ -26,7 +26,7 @@
   			</div>
   		</div>
 			<div class="twelve wide column content">
-				<div class="ui tiny buttons">
+				<div class="ui tiny tabs buttons">
 				  <a class="ui green basic button {{if not .IsShowClosed}}active{{end}}" href="{{.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&state=open">
 				  	<i class="octicon octicon-issue-opened"></i>
 				  	{{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}}