diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-04-12 01:45:47 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-04-12 01:45:47 -0400 |
| commit | 790a2c1099f1e9946b854741ce8e5acfe12f119a (patch) | |
| tree | 4d49beabde467712e69734f29a8d4203e3c465ad | |
| parent | 31d613c01d313e14cc57fcb183f7489352ff6aa5 (diff) | |
| parent | b057cffd85746363a5279e9178721f8418294d65 (diff) | |
| download | gitea-790a2c1099f1e9946b854741ce8e5acfe12f119a.tar.gz gitea-790a2c1099f1e9946b854741ce8e5acfe12f119a.zip | |
Merge branch 'dev' of github.com:gogits/gogs into dev
| -rwxr-xr-x | public/css/gogs.css | 17 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 12 |
2 files changed, 29 insertions, 0 deletions
diff --git a/public/css/gogs.css b/public/css/gogs.css index 634548b8c8..8be2bc4e72 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -74,6 +74,7 @@ html, body { padding-left: 0; padding-right: 0; margin-right: 10px; + margin-top: 0; } .nav-item:hover, @@ -310,6 +311,22 @@ html, body { padding-right: 18px; } +#user-profile .profile-rel .col-md-6 { + text-align: center; + padding-bottom: 12px; +} + +#user-profile .profile-rel strong { + font-size: 24px; + color: #444; + display: block; +} + +#user-profile .profile-rel p { + margin-right: 0; + color: #888; +} + #user-activity .tab-pane { padding: 20px; } diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 88ee318f4a..0cbd348910 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -10,6 +10,18 @@ </div> <div class="profile-info"> <ul class="list-group"> + <li class="list-group-item"> + <div class="profile-rel"> + <div class="col-md-6 followers"> + <strong>123</strong> + <p>followers</p> + </div> + <div class="col-md-6 following"> + <strong>123</strong> + <p>following</p> + </div> + </div> + </li> {{if .Owner.Location}} <li class="list-group-item"><i class="fa fa-thumb-tack"></i>{{.Owner.Location}}</li> {{end}} |