fix profile ui

diff --git a/public/css/gogs.css b/public/css/gogs.css
index ce9f27e41086e88c8713af77e941611b2068f566..b4855d7805c7c00a6b8d5e86a2001a6659d1de14 100755 (executable)
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -311,11 +311,18 @@ html, body {
     border-radius: 2px;
 }
 
-#user-name {
-    margin-top: 20px;
+#user-name,#user-full-name {
     font-size: 1.6em;
     font-weight: bold;
+}
+
+#user-name{
     margin-bottom: 20px;
+    margin-top: 10px;
+}
+
+#user-full-name{
+    margin-top: 20px;
 }
 
 #user-profile .profile-info .list-group-item {
@@ -387,7 +394,7 @@ html, body {
 
 /* gogits user setting */
 
-#user-setting-nav {
+#user-setting-nav.repo-setting-nav {
     background-color: #FFF;
     border: 1px solid #CCC;
     padding: 0;

diff --git a/templates/repo/collaboration.tmpl b/templates/repo/collaboration.tmpl
index aea0aa4147f24a1978e84ae4e0e3feb15781bb48..ec0b832a4297bfab92fcd6e4477245ed1a5f18d5 100644 (file)
--- a/templates/repo/collaboration.tmpl
+++ b/templates/repo/collaboration.tmpl
@@ -3,7 +3,7 @@
 {{template "repo/nav" .}}
 {{template "repo/toolbar" .}}
 <div id="body" class="container">
-    <div id="user-setting-nav" class="col-md-2">
+    <div id="user-setting-nav" class="col-md-2 repo-setting-nav">
         <ul class="list-group">
             <li class="list-group-item"><a href="/{{.Owner.Name}}/{{.Repository.Name}}/settings">Options</a></li>
             <li class="list-group-item active"><a href="/{{.Owner.Name}}/{{.Repository.Name}}/collaboration">Collaborators</a></li>

diff --git a/templates/repo/setting.tmpl b/templates/repo/setting.tmpl
index 9066b587d8963a98e71ce05fb7ac38a33ca2c855..6672e90b5969353d47ce70c69c2de4e886682bea 100644 (file)
--- a/templates/repo/setting.tmpl
+++ b/templates/repo/setting.tmpl
@@ -3,7 +3,7 @@
 {{template "repo/nav" .}}
 {{template "repo/toolbar" .}}
 <div id="body" class="container">
-    <div id="user-setting-nav" class="col-md-2">
+    <div id="user-setting-nav" class="col-md-2 repo-setting-nav">
         <ul class="list-group">
             <li class="list-group-item active"><a href="/{{.Owner.Name}}/{{.Repository.Name}}/settings">Options</a></li>
             <li class="list-group-item"><a href="/{{.Owner.Name}}/{{.Repository.Name}}/collaboration">Collaborators</a></li>

diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 43ecabfa1656d180d0375bb45cf2e3b0b79d4454..4c42be24836df8a43da729f5602f91a81f7fd9ce 100644 (file)
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -6,7 +6,7 @@
             <a href="http://gravatar.com/emails/" class="center-block" data-toggle="tooltip" data-placement="bottom" title="Change your avatar at gravatar.com">
                 <img id="user-avatar" src="{{.Owner.AvatarLink}}?s=200" alt="user-avatar" title="{{.Owner.Name}}"/>
             </a>
-            {{if .Owner.FullName}}<span id="user-name" class="center-block">{{.Owner.FullName}}</span>{{end}}
+            {{if .Owner.FullName}}<span id="user-full-name" class="center-block">{{.Owner.FullName}}</span>{{end}}
             <span id="user-name" class="center-block">{{.Owner.Name}}</span>
         </div>
         <div class="profile-info">