From dccc50e9d4d217cea91d76f17fa60bf5c0a6fb03 Mon Sep 17 00:00:00 2001
From: fuxiaohei <fuxiaohei@vip.qq.com>
Date: Sat, 27 Sep 2014 17:08:57 +0800
Subject: [PATCH] template and ui fix

---
 public/ng/css/gogs.css              | 9 ++++++++-
 public/ng/less/gogs/dashboard.less  | 4 ++++
 public/ng/less/gogs/repository.less | 3 ++-
 templates/repo/home.tmpl            | 2 +-
 templates/repo/sidebar.tmpl         | 2 +-
 templates/repo/view_file.tmpl       | 4 ++--
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index dbaa3db1c9..7116afc0cd 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -709,6 +709,7 @@ ol.linenums {
 #dashboard-header {
   border-bottom: 1px solid #d6d6d6;
   height: 69px;
+  background-color: #FFF;
 }
 #dashboard-header > .menu-line > li {
   padding: 12px 6px;
@@ -824,6 +825,11 @@ ol.linenums {
 #dashboard-my-repo .repo-contrib-header {
   border-top: 1px solid #d6d6d6;
 }
+#dashboard-my-mirror .panel-header,
+#dashboard-my-org .panel-header,
+#dashboard-my-repo .panel-header {
+  font-size: 14px;
+}
 #dashboard-my-repo .panel-header .octicon {
   margin-right: 6px;
   font-size: 12px;
@@ -1244,7 +1250,8 @@ The register and sign-in page style
   font-weight: normal;
   color: #888;
 }
-#repo-readme {
+#repo-readme,
+#repo-read-file {
   margin-bottom: 80px;
 }
 #repo-bare-start {
diff --git a/public/ng/less/gogs/dashboard.less b/public/ng/less/gogs/dashboard.less
index 24c433a31a..cf1b87cc6f 100644
--- a/public/ng/less/gogs/dashboard.less
+++ b/public/ng/less/gogs/dashboard.less
@@ -12,6 +12,7 @@
 #dashboard-header {
   border-bottom: 1px solid @dashboardHeaderBorderColor;
   height: 69px;
+  background-color: #FFF;
   > .menu-line {
     > li {
       padding: 12px 6px;
@@ -125,6 +126,9 @@
   .repo-contrib-header {
     border-top: 1px solid #d6d6d6;
   }
+  .panel-header{
+    font-size: 14px;
+  }
 }
 #dashboard-my-repo {
   .panel-header {
diff --git a/public/ng/less/gogs/repository.less b/public/ng/less/gogs/repository.less
index 7d6cdd0a5d..236271d47c 100644
--- a/public/ng/less/gogs/repository.less
+++ b/public/ng/less/gogs/repository.less
@@ -301,7 +301,8 @@
     }
   }
 }
-#repo-readme {
+#repo-readme,
+#repo-read-file{
   margin-bottom: 80px;
 }
 #repo-bare-start {
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 32fbf58226..a9d7f30403 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -3,7 +3,7 @@
 <div id="repo-wrapper">
     {{template "repo/header" .}}
     <div id="repo-content" class="clear container">
-        <div id="repo-main" class="left grid-4-5">
+        <div id="repo-main" class="left grid-5-6">
             <p id="repo-desc">
                 <span class="description">{{.Repository.DescriptionHtml}}</span>
                 <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a>
diff --git a/templates/repo/sidebar.tmpl b/templates/repo/sidebar.tmpl
index a4fa17b757..d43e36063d 100644
--- a/templates/repo/sidebar.tmpl
+++ b/templates/repo/sidebar.tmpl
@@ -1,4 +1,4 @@
-<div id="repo-sidebar" class="right grid-1-5">
+<div id="repo-sidebar" class="right grid-1-6">
     <ul class="menu menu-vertical" id="repo-sidebar-nav">
         <li>
             <a class="radius" href="{{.RepoLink}}/issues"><i class="octicon octicon-issue-opened"></i>{{.i18n.Tr "repo.issues"}}<span class="num right label label-blue label-radius">{{.Repository.NumOpenIssues}}</span></a>
diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl
index 96efcdac54..228d10cd99 100644
--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -1,4 +1,4 @@
-<div class="panel panel-radius" id="repo-readme">
+<div class="panel panel-radius" id="{{if .ReadmeExist}}repo-readme{{else}}repo-read-file{{end}}">
     <p class="panel-header">
         {{if .ReadmeExist}}
             <i class="icon fa fa-book fa-lg"></i>
@@ -12,7 +12,7 @@
         <strong class="file-name">{{.FileName}}</strong><span class="file-size">{{FileSize .FileSize}}</span>
 	    {{end}}
     </p>
-    <div class="{{if .ReadmeExist}}panel-content markdown{{end}} code-view">
+    <div class="{{if .ReadmeExist}}panel-content markdown{{end}} code-view" id="repo-code-view">
     	{{if .ReadmeExist}}
     	{{if .FileContent}}{{.FileContent | Str2html}}{{end}}
         {{else if not .IsFileText}}