diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-10-19 02:22:38 -0400 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-10-19 02:22:38 -0400 |
| commit | d88ebd9a4b0e8102d2f5cd9cb3a95845f2a46522 (patch) | |
| tree | afaa57982ddb9a456c82bfc9eda41d52b3cefd30 | |
| parent | ec8ec58b176041596bf1ce92b8489f7440e27856 (diff) | |
| download | gitea-d88ebd9a4b0e8102d2f5cd9cb3a95845f2a46522.tar.gz gitea-d88ebd9a4b0e8102d2f5cd9cb3a95845f2a46522.zip | |
Fix #554
| -rw-r--r-- | public/ng/css/gogs.css | 7 | ||||
| -rw-r--r-- | public/ng/less/gogs/profile.less | 8 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 70 |
3 files changed, 45 insertions, 40 deletions
diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css index f10eb788cb..8e5b590c00 100644 --- a/public/ng/css/gogs.css +++ b/public/ng/css/gogs.css @@ -2228,8 +2228,7 @@ textarea#issue-add-content { margin-left: 240px; } .profile-avatar { - width: 200px; - height: 200px; + width: 100%; border-radius: 6px; } #profile-name { @@ -2243,7 +2242,6 @@ textarea#issue-add-content { font-weight: bold; } .profile-info { - padding: 0 50px; font-size: 14px; } .profile-info ul { @@ -2280,3 +2278,6 @@ textarea#issue-add-content { #profile-header li .current { border-bottom: 2px solid #D26911; } +#profile-body { + margin-left: 10px; +} diff --git a/public/ng/less/gogs/profile.less b/public/ng/less/gogs/profile.less index f618d2606b..ae0a2b2201 100644 --- a/public/ng/less/gogs/profile.less +++ b/public/ng/less/gogs/profile.less @@ -1,6 +1,5 @@ .profile-avatar { - width: 200px; - height: 200px; + width: 100%; border-radius: 6px; } #profile-name { @@ -14,7 +13,7 @@ font-weight: bold; } .profile-info { - padding: 0 50px; + // padding: 0 50px; font-size: 14px; ul { padding-bottom: 10px; @@ -54,4 +53,7 @@ border-bottom: 2px solid #D26911; } } +} +#profile-body { + margin-left: 10px; }
\ No newline at end of file diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 62fe4c5d9b..af3d11a034 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -2,12 +2,12 @@ {{template "ng/base/header" .}} <div class="main-wrapper"> <div id="user-profile-page" class="container clear"> - <div class="grid-1-4 left"> - <div class="text-center"> + <div class="grid-1-5 left"> + <div> <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}}"/> </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}} <span class="center-block" id="profile-username">{{.Owner.Name}}</span> </div> @@ -50,40 +50,42 @@ <hr> </div> </div> - <div class="grid-3-4 left"> - <ul class="menu menu-line" id="profile-header"> - <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> - </ul> - <div class="tab-content"> - {{if eq .TabName "activity"}} - <div class="tab-pane active" id="dashboard-news"> - <br> - {{template "user/dashboard/feeds" .}} - </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> + <div class="grid-4-5 left"> + <div id="profile-body"> + <ul class="menu menu-line" id="profile-header"> + <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> + </ul> + <div class="tab-content"> + {{if eq .TabName "activity"}} + <div class="tab-pane active" id="dashboard-news"> + <br> + {{template "user/dashboard/feeds" .}} + </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}} - {{end}} + </div> </div> + {{end}} </div> - {{end}} </div> </div> </div> |