From 7046df6028d3e910a3c5a1434d1240f65508eda8 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Mon, 16 Nov 2015 00:16:03 -0500
Subject: [PATCH] UI fix

---
 gogs.go                      |  2 +-
 public/css/gogs.css          |  5 ---
 public/less/_repository.less |  5 ---
 templates/.VERSION           |  2 +-
 templates/repo/header.tmpl   | 84 ++++++++++++++++++------------------
 5 files changed, 44 insertions(+), 54 deletions(-)

diff --git a/gogs.go b/gogs.go
index a2ff0b5e880..157133eda6f 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.7.12.1115 Beta"
+const APP_VER = "0.7.12.1116 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/public/css/gogs.css b/public/css/gogs.css
index b4f4782dcad..6300dfaa668 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -2235,11 +2235,6 @@ footer .container .links > *:first-child {
   font-weight: normal;
   padding: 5px 10px;
 }
-.repository.commits .header .ui.right .button {
-  float: right;
-  margin-left: 5px;
-  margin-top: 1px;
-}
 .repository .commits.table {
   font-size: 13px;
 }
diff --git a/public/less/_repository.less b/public/less/_repository.less
index 004e7233149..75070f74472 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -595,11 +595,6 @@
 						padding: 5px 10px;
 					}
 				}
-				.button {
-					float: right;
-					margin-left: 5px;
-					margin-top: 1px;
-				}
 			}
 		}
 	}
diff --git a/templates/.VERSION b/templates/.VERSION
index 21364203fb2..3501f1632e8 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.7.12.1115 Beta
\ No newline at end of file
+0.7.12.1116 Beta
\ No newline at end of file
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 048939f27a0..5a811d6ae21 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -1,48 +1,48 @@
 {{with .Repository}}
 <div class="ui container"><!-- start container -->
-    <div class="ui vertically padded grid head"><!-- start grid -->
-        <div class="column"><!-- start column -->
-            <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>
-                    <a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
-                    <div class="divider"> / </div>
-                    <a href="{{$.RepoLink}}">{{.Name}}</a>
-                    {{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 vertically padded grid head"><!-- start grid -->
+    <div class="column"><!-- start column -->
+      <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>
+          <a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
+          <div class="divider"> / </div>
+          <a href="{{$.RepoLink}}">{{.Name}}</a>
+          {{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 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" href="{{.RepoLink}}/watchers">
-                            {{.NumWatches}}
-                        </a>
-                    </div>
-                    <div class="ui labeled button" tabindex="0">
-                        <a class="ui 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" href="{{.RepoLink}}/stars">
-                            {{.NumStars}}
-                        </a>
-                    </div>
-                    {{if .CanBeForked}}
-                    <div class="ui labeled button" tabindex="0">
-                        <a class="ui 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" href="{{.RepoLink}}/forks">
-                            {{.NumForks}}
-                        </a>
-                    </div>
-                    {{end}}
-                </div>
-            </div>
-        </div><!-- end column -->
-    </div><!-- end grid -->
+        <div class="ui right">
+          <div class="ui labeled button" tabindex="0">
+            <a class="ui 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" href="{{.RepoLink}}/watchers">
+                {{.NumWatches}}123
+            </a>
+          </div>
+          <div class="ui labeled button" tabindex="0">
+            <a class="ui 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" href="{{.RepoLink}}/stars">
+                {{.NumStars}}
+            </a>
+          </div>
+          {{if .CanBeForked}}
+          <div class="ui labeled button" tabindex="0">
+            <a class="ui 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" href="{{.RepoLink}}/forks">
+                {{.NumForks}}
+            </a>
+          </div>
+          {{end}}
+        </div>
+      </div>
+    </div><!-- end column -->
+  </div><!-- end grid -->
 </div><!-- end container -->
 <div class="ui divider"></div>
 {{end}}