fix #1960
Unknwon
9 years ago
parent
134d8e7681
commit
5dc3dd1704
@ -1,30 +1,32 @@ |
|||||||
.explore { |
.explore { |
||||||
padding-top: 15px; |
padding-top: 15px; |
||||||
padding-bottom: @footer-margin * 2; |
padding-bottom: @footer-margin * 2; |
||||||
|
} |
||||||
|
|
||||||
&.repositories { |
.ui.repository.list { |
||||||
.ui.repository.list { |
.item { |
||||||
.item { |
padding-bottom: 25px; |
||||||
border-top: 1px solid #eee; |
|
||||||
padding-top: 25px; |
&:not(:first-child) { |
||||||
padding-bottom: 25px; |
border-top: 1px solid #eee; |
||||||
.ui.header { |
padding-top: 25px; |
||||||
font-size: 1.5rem; |
} |
||||||
padding-bottom: 10px; |
|
||||||
.metas { |
.ui.header { |
||||||
color: #888; |
font-size: 1.5rem; |
||||||
font-size: 13px; |
padding-bottom: 10px; |
||||||
font-weight: normal; |
.metas { |
||||||
span:not(:last-child) { |
color: #888; |
||||||
margin-right: 5px; |
font-size: 13px; |
||||||
} |
font-weight: normal; |
||||||
} |
span:not(:last-child) { |
||||||
} |
margin-right: 5px; |
||||||
.time { |
|
||||||
font-size: 12px; |
|
||||||
color: #808080; |
|
||||||
} |
} |
||||||
} |
} |
||||||
} |
} |
||||||
|
.time { |
||||||
|
font-size: 12px; |
||||||
|
color: #808080; |
||||||
|
} |
||||||
} |
} |
||||||
} |
} |
||||||
@ -1 +1 @@ |
|||||||
0.7.12.1116 Beta |
0.7.13.1116 Beta |
||||||
@ -1,104 +1,86 @@ |
|||||||
{{template "ng/base/head" .}} |
{{template "base/head" .}} |
||||||
{{template "ng/base/header" .}} |
<div class="user profile"> |
||||||
<div class="main-wrapper"> |
<div class="ui container"> |
||||||
<div id="user-profile-page" class="container clear"> |
<div class="ui grid"> |
||||||
<div class="grid-1-5 left"> |
<div class="ui five wide column"> |
||||||
<div> |
<div class="ui card"> |
||||||
{{if and (.Owner.UseCustomAvatar) (eq .SignedUserName .Owner.Name)}} |
{{if and (.Owner.UseCustomAvatar) (eq .SignedUserName .Owner.Name)}} |
||||||
<a href="{{AppSubUrl}}/user/settings" id="profile-avatar" original-title="{{.i18n.Tr "user.change_custom_avatar"}}"> |
<a class="image poping up" href="{{AppSubUrl}}/user/settings" id="profile-avatar" data-content="{{.i18n.Tr "user.change_custom_avatar"}}" data-variation="inverted tiny" data-position="bottom center"> |
||||||
{{else if eq .SignedUserName .Owner.Name}} |
<img src="{{.Owner.AvatarLink}}?s=290" title="{{.Owner.Name}}"/> |
||||||
<a href="http://gravatar.com/emails/" id="profile-avatar" original-title="{{.i18n.Tr "user.change_avatar"}}"> |
</a> |
||||||
{{else}} |
{{else if eq .SignedUserName .Owner.Name}} |
||||||
<a id="profile-avatar"> |
<a class="image poping up" href="http://gravatar.com/emails/" id="profile-avatar" data-content="{{.i18n.Tr "user.change_avatar"}}" data-variation="inverted tiny" data-position="bottom center"> |
||||||
{{end}} |
<img src="{{.Owner.AvatarLink}}?s=290" title="{{.Owner.Name}}"/> |
||||||
<img class="profile-avatar" src="{{.Owner.AvatarLink}}?s=234" title="{{.Owner.Name}}"/> |
</a> |
||||||
</a> |
{{else}} |
||||||
<div class="text-center" id="profile-name"> |
<span class="image"> |
||||||
{{if .Owner.FullName}}<span id="profile-fullname" class="center-block">{{.Owner.FullName}}</span><br>{{end}} |
<img src="{{.Owner.AvatarLink}}?s=290" title="{{.Owner.Name}}"/> |
||||||
<span class="center-block" id="profile-username">{{.Owner.Name}}</span> |
</span> |
||||||
</div> |
{{end}} |
||||||
</div> |
<div class="content"> |
||||||
<div class="profile-info"> |
{{if .Owner.FullName}}<span class="header text center">{{.Owner.FullName}}</span>{{end}} |
||||||
<hr> |
<span class="username text center">{{.Owner.Name}}</span> |
||||||
<ul class="list-no-style"> |
</div> |
||||||
{{if .Owner.Location}} |
<div class="extra content"> |
||||||
<li class="list-group-item"><i class="octicon octicon-location"></i> {{.Owner.Location}}</li> |
<ul class="text black"> |
||||||
{{end}} |
{{if .Owner.Location}} |
||||||
{{if and .Owner.Email .IsSigned}} |
<li><i class="icon octicon octicon-location"></i> {{.Owner.Location}}</li> |
||||||
<li class="list-group-item"><i class="octicon octicon-mail"></i> <a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a></li> |
{{end}} |
||||||
{{end}} |
{{if and .Owner.Email .IsSigned}} |
||||||
{{if .Owner.Website}} |
<li> |
||||||
<li class="list-group-item"><i class="octicon octicon-link"></i> <a target="_blank" href="{{.Owner.Website}}">{{.Owner.Website}}</a></li> |
<i class="icon octicon octicon-mail"></i> |
||||||
{{end}} |
<a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a> |
||||||
<li class="list-group-item"><i class="octicon octicon-clock"></i> {{.i18n.Tr "user.join_on"}} {{DateFmtShort .Owner.Created}}</li> |
</li> |
||||||
</ul> |
{{end}} |
||||||
<hr> |
{{if .Owner.Website}} |
||||||
<ul class="list-no-style"> |
<li> |
||||||
<li class="list-group-item profile-rel"> |
<i class="icon octicon octicon-link"></i> |
||||||
<a class="text-black" href=""> |
<a target="_blank" href="{{.Owner.Website}}">{{.Owner.Website}}</a> |
||||||
<strong>{{.Owner.NumFollowers}}</strong> |
</li> |
||||||
<p>{{.i18n.Tr "user.followers"}}</p> |
{{end}} |
||||||
</a> |
<li><i class="icon octicon octicon-clock"></i> {{.i18n.Tr "user.join_on"}} {{DateFmtShort .Owner.Created}}</li> |
||||||
</li> |
</ul> |
||||||
<li class="list-group-item profile-rel"> |
</div> |
||||||
<a class="text-black" href=""> |
</div> |
||||||
<strong>{{.Owner.NumStars}}</strong> |
</div> |
||||||
<p>{{.i18n.Tr "user.starred"}}</p> |
<div class="ui eleven wide column"> |
||||||
</a> |
<div class="ui secondary pointing menu"> |
||||||
</li> |
<a class="{{if ne .TabName "activity"}}active{{end}} item" href="{{.Owner.HomeLink}}"> |
||||||
<li class="list-group-item profile-rel"> |
<i class="icon octicon octicon-repo"></i> {{.i18n.Tr "user.repositories"}} |
||||||
<a class="text-black" href=""> |
</a> |
||||||
<strong>{{.Owner.NumFollowings}}</strong> |
<a class="item"> |
||||||
<p>{{.i18n.Tr "user.following"}}</p> |
<a class="{{if eq .TabName "activity"}}active{{end}} item" href="{{.Owner.HomeLink}}?tab=activity"> |
||||||
</a> |
<i class="icon octicon octicon-rss"></i> {{.i18n.Tr "user.activity"}} |
||||||
</li> |
</a> |
||||||
</ul> |
</a> |
||||||
<hr> |
|
||||||
</div> |
|
||||||
</div> |
</div> |
||||||
<div class="grid-4-5 left"> |
{{if ne .TabName "activity"}} |
||||||
<div id="profile-body"> |
<div class="ui repository list"> |
||||||
<ul class="menu menu-line" id="profile-header"> |
{{range .Repos}} |
||||||
<li> |
{{if or (not .IsPrivate) (.HasAccess $.SignedUser)}} |
||||||
<a {{if not .TabName}}class="current"{{end}} href="{{.Owner.HomeLink}}"><i class="octicon octicon-repo"></i> {{.i18n.Tr "user.repositories"}}</a> |
<div class="item"> |
||||||
</li> |
<div class="ui header"> |
||||||
<li> |
<a href="{{AppSubUrl}}/{{$.Owner.Name}}/{{.Name}}">{{.Name}}</a> |
||||||
<a {{if eq .TabName "activity"}}class="current"{{end}} href="{{.Owner.HomeLink}}?tab=activity"><i class="octicon octicon-repo"></i> {{.i18n.Tr "user.activity"}}</a> |
{{if .IsPrivate}} |
||||||
</li> |
<span class="text gold"><i class="icon octicon octicon-lock"></i></span> |
||||||
</ul> |
{{end}} |
||||||
<div class="tab-content"> |
|
||||||
{{if eq .TabName "activity"}} |
<div class="ui right metas"> |
||||||
<div class="tab-pane active" id="dashboard-news"> |
<span class="text grey"><i class="octicon octicon-star"></i> {{.NumStars}}</span> |
||||||
<br> |
<span class="text grey"><i class="octicon octicon-git-branch"></i> {{.NumForks}}</span> |
||||||
{{template "user/dashboard/feeds" .}} |
|
||||||
</div> |
|
||||||
{{else}} |
|
||||||
<div class="tab-pane active"> |
|
||||||
<div id="org-repo-list"> |
|
||||||
{{range .Repos}} |
|
||||||
{{if or (not .IsPrivate) (.HasAccess $.SignedUser)}} |
|
||||||
<div class="org-repo-item"> |
|
||||||
<ul class="org-repo-status right"> |
|
||||||
<li><i class="octicon octicon-star"></i> {{.NumStars}}</li> |
|
||||||
<li><i class="octicon octicon-git-branch"></i> {{.NumForks}}</li> |
|
||||||
</ul> |
|
||||||
<h2> |
|
||||||
<a href="{{AppSubUrl}}/{{$.Owner.Name}}/{{.Name}}">{{.Name}}</a> |
|
||||||
{{if .IsPrivate}} |
|
||||||
<span class="text-gold"><i class="octicon octicon-lock"></i></span> |
|
||||||
{{end}} |
|
||||||
</h2> |
|
||||||
<p class="org-repo-description">{{.Description}}</p> |
|
||||||
<p class="org-repo-updated">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p> |
|
||||||
</div> |
|
||||||
{{end}} |
|
||||||
{{end}} |
|
||||||
</div> |
|
||||||
</div> |
|
||||||
{{end}} |
|
||||||
</div> |
</div> |
||||||
|
</div> |
||||||
|
{{if .Description}}<p>{{.Description}}</p>{{end}} |
||||||
|
<p class="time">{{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Updated $.i18n.Lang}}</p> |
||||||
</div> |
</div> |
||||||
|
{{end}} |
||||||
|
{{end}} |
||||||
</div> |
</div> |
||||||
|
{{else}} |
||||||
|
<br> |
||||||
|
{{template "user/dashboard/feeds" .}} |
||||||
|
{{end}} |
||||||
</div> |
</div> |
||||||
|
</div> |
||||||
</div> |
</div> |
||||||
{{template "ng/base/footer" .}} |
{{template "base/footer" .}} |
||||||
Loading…
Reference in new issue