This commit is contained in:
Unknwon 2014-10-19 02:22:38 -04:00
parent ec8ec58b17
commit d88ebd9a4b
3 changed files with 46 additions and 41 deletions

View File

@ -2228,8 +2228,7 @@ textarea#issue-add-content {
margin-left: 240px; margin-left: 240px;
} }
.profile-avatar { .profile-avatar {
width: 200px; width: 100%;
height: 200px;
border-radius: 6px; border-radius: 6px;
} }
#profile-name { #profile-name {
@ -2243,7 +2242,6 @@ textarea#issue-add-content {
font-weight: bold; font-weight: bold;
} }
.profile-info { .profile-info {
padding: 0 50px;
font-size: 14px; font-size: 14px;
} }
.profile-info ul { .profile-info ul {
@ -2280,3 +2278,6 @@ textarea#issue-add-content {
#profile-header li .current { #profile-header li .current {
border-bottom: 2px solid #D26911; border-bottom: 2px solid #D26911;
} }
#profile-body {
margin-left: 10px;
}

View File

@ -1,6 +1,5 @@
.profile-avatar { .profile-avatar {
width: 200px; width: 100%;
height: 200px;
border-radius: 6px; border-radius: 6px;
} }
#profile-name { #profile-name {
@ -14,7 +13,7 @@
font-weight: bold; font-weight: bold;
} }
.profile-info { .profile-info {
padding: 0 50px; // padding: 0 50px;
font-size: 14px; font-size: 14px;
ul { ul {
padding-bottom: 10px; padding-bottom: 10px;
@ -55,3 +54,6 @@
} }
} }
} }
#profile-body {
margin-left: 10px;
}

View File

@ -2,12 +2,12 @@
{{template "ng/base/header" .}} {{template "ng/base/header" .}}
<div class="main-wrapper"> <div class="main-wrapper">
<div id="user-profile-page" class="container clear"> <div id="user-profile-page" class="container clear">
<div class="grid-1-4 left"> <div class="grid-1-5 left">
<div class="text-center"> <div>
<a href="http://gravatar.com/emails/" id="profile-avatar" original-title="{{.i18n.Tr "user.change_avatar"}}"> <a href="http://gravatar.com/emails/" id="profile-avatar" original-title="{{.i18n.Tr "user.change_avatar"}}">
<img class="profile-avatar" src="{{.Owner.AvatarLink}}?s=200"title="{{.Owner.Name}}"/> <img class="profile-avatar" src="{{.Owner.AvatarLink}}?s=200"title="{{.Owner.Name}}"/>
</a> </a>
<div id="profile-name"> <div class="text-center" id="profile-name">
{{if .Owner.FullName}}<span id="profile-fullname" class="center-block">{{.Owner.FullName}}</span><br>{{end}} {{if .Owner.FullName}}<span id="profile-fullname" class="center-block">{{.Owner.FullName}}</span><br>{{end}}
<span class="center-block" id="profile-username">{{.Owner.Name}}</span> <span class="center-block" id="profile-username">{{.Owner.Name}}</span>
</div> </div>
@ -50,40 +50,42 @@
<hr> <hr>
</div> </div>
</div> </div>
<div class="grid-3-4 left"> <div class="grid-4-5 left">
<ul class="menu menu-line" id="profile-header"> <div id="profile-body">
<li> <ul class="menu menu-line" id="profile-header">
<a {{if not .TabName}}class="current"{{end}} href="{{.Owner.HomeLink}}"><i class="octicon octicon-repo"></i> {{.i18n.Tr "user.repositories"}}</a> <li>
</li> <a {{if not .TabName}}class="current"{{end}} href="{{.Owner.HomeLink}}"><i class="octicon octicon-repo"></i> {{.i18n.Tr "user.repositories"}}</a>
<li> </li>
<a {{if eq .TabName "activity"}}class="current"{{end}} href="{{.Owner.HomeLink}}?tab=activity"><i class="octicon octicon-repo"></i> {{.i18n.Tr "user.activity"}}</a> <li>
</li> <a {{if eq .TabName "activity"}}class="current"{{end}} href="{{.Owner.HomeLink}}?tab=activity"><i class="octicon octicon-repo"></i> {{.i18n.Tr "user.activity"}}</a>
</ul> </li>
<div class="tab-content"> </ul>
{{if eq .TabName "activity"}} <div class="tab-content">
<div class="tab-pane active" id="dashboard-news"> {{if eq .TabName "activity"}}
<br> <div class="tab-pane active" id="dashboard-news">
{{template "user/dashboard/feeds" .}} <br>
</div> {{template "user/dashboard/feeds" .}}
{{else}}
<div class="tab-pane active">
<div id="org-repo-list">
{{range .Repos}}
{{if not .IsPrivate}}
<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></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>
{{else}}
<div class="tab-pane active">
<div id="org-repo-list">
{{range .Repos}}
{{if not .IsPrivate}}
<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></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>
{{end}}
</div> </div>
</div> </div>
</div> </div>