Merge branch 'dev' of github.com:gogits/gogs into dev

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;
 }

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}}