diff options
| author | Unknwon <u@gogs.io> | 2015-08-10 00:37:42 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-10 00:37:42 +0800 |
| commit | a79586cc545594d8876438e2497c9408945748b2 (patch) | |
| tree | 689da38141f2e3dc2b33a15132f5eb3116915b00 /templates/repo/pulls | |
| parent | 590c464c56c993c461f10470926a96448f4f7d00 (diff) | |
| parent | 8a3ee795d2d069bbb57b3d134367078c8e8391d5 (diff) | |
| download | gitea-a79586cc545594d8876438e2497c9408945748b2.tar.gz gitea-a79586cc545594d8876438e2497c9408945748b2.zip | |
Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts:
# modules/bindata/bindata.go
# public/css/gogs.min.css
# templates/repo/header.tmpl
Diffstat (limited to 'templates/repo/pulls')
| -rw-r--r-- | templates/repo/pulls/fork.tmpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index 2f76cf002a..01bbe9b797 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -14,19 +14,19 @@ <div class="ui selection dropdown"> <input type="hidden" id="uid" name="uid" value="{{.ContextUser.Id}}" required> <span class="text"> - <img class="ui mini avatar image" src="{{.ContextUser.AvatarLink}}"> + <img class="ui mini image" src="{{.ContextUser.AvatarLink}}"> {{.ContextUser.Name}} </span> <i class="dropdown icon"></i> <div class="menu"> <div class="item" data-value="{{.SignedUser.Id}}"> - <img class="ui mini avatar image" src="{{.SignedUser.AvatarLink}}"> + <img class="ui mini image" src="{{.SignedUser.AvatarLink}}"> {{.SignedUser.Name}} </div> {{range .Orgs}} {{if .IsOwnedBy $.SignedUser.Id}} <div class="item" data-value="{{.Id}}"> - <img class="ui mini avatar image" src="{{.AvatarLink}}"> + <img class="ui mini image" src="{{.AvatarLink}}"> {{.Name}} </div> {{end}} |