From 0791d01513b0d06f8c369df36f31eedd0fbc9619 Mon Sep 17 00:00:00 2001
From: slene <vslene@gmail.com>
Date: Sat, 15 Mar 2014 20:40:26 +0800
Subject: [PATCH] update tmpl

---
 .gitignore                 |  1 +
 public/css/gogs.css        | 32 +++++++++++++++++++++++++++++---
 templates/base/footer.tmpl | 10 ++++++++++
 templates/base/head.tmpl   |  1 +
 templates/base/navbar.tmpl |  2 +-
 5 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6559d61a06..55d2a5784c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ gogs
 *.log
 custom/
 .vendor/
+repo/
diff --git a/public/css/gogs.css b/public/css/gogs.css
index e7730b2d41..c48a17984f 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -8,6 +8,10 @@ body {
     background: #F6F6F6;
 }
 
+html, body {
+    height: 100%;
+}
+
 /* override bs3 */
 
 .tooltip-inner {
@@ -47,6 +51,7 @@ body {
     background-color: #428bca;
     box-shadow: inset 0 -2px 5px rgba(0, 0, 0, .1);
     padding: 0 16px;
+    margin: 0;
 }
 
 /* gogits nav item link */
@@ -143,10 +148,9 @@ body {
 }
 
 #gogs-body-nav {
-    margin-top: 52px;
     margin-bottom: -50px;
     background-color: #FFF;
-    border-bottom: 1px solid #BBB;
+    border-bottom: 1px solid #DDD;
     height: 66px
 }
 
@@ -445,7 +449,7 @@ body {
 #gogs-repo-toolbar {
     margin-top: 51px;
     margin-bottom: -50px;
-    border-bottom: 1px solid #BBB;
+    border-bottom: 1px solid #DDD;
     background-color: #FFF;
     height: 40px;
     font-size: 14px;
@@ -551,3 +555,25 @@ body {
     border-top: none;
 }
 
+#wrapper {
+    min-height: 100%;
+    height: auto !important;
+    height: 100%;
+    margin: 0 auto -100px;
+    padding: 0 0 100px;
+}
+
+#footer {
+    background: #fff;
+    -webkit-box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.05);
+    box-shadow: 0 -1px 3px rgba(0, 0, 0, 0.05);;
+    height: 100px;
+}
+
+#footer .footer-wrap {
+    padding: 20px 0;
+}
+
+#footer a {
+    color: #000;
+}
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl
index a2131a9532..0f17c5ea64 100644
--- a/templates/base/footer.tmpl
+++ b/templates/base/footer.tmpl
@@ -5,5 +5,15 @@
         initUserSetting();{{end}}
     });
 </script>
+	<div class="wrapper-push"></div>
+</div>
+<footer id="footer">
+	<div class="container footer-wrap">
+		<p>
+			© 2014 Gogs. ver {{AppVer}}. <a target="_blank" href="https://github.com/gogits/gogs">GitHub</a>
+		</p>
+		<p class="desc"></p>
+	</div>
+</footer>
 </body>
 </html>
\ No newline at end of file
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index e881e7f56d..715f54efdb 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -19,4 +19,5 @@
 		<title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title>
 	</head>
 	<body>
+		<div id="wrapper">
 		<noscript>Please enable JavaScript in your browser!</noscript>
\ No newline at end of file
diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl
index 9d5cc07bd3..3fe0c1147a 100644
--- a/templates/base/navbar.tmpl
+++ b/templates/base/navbar.tmpl
@@ -1,4 +1,4 @@
-<div class="gogs-masthead navbar navbar-fixed-top" id="masthead">
+<div class="gogs-masthead navbar" id="masthead">
     <div class="container">
         <nav class="gogs-nav">
             <a id="gogs-nav-logo" class="gogs-nav-item{{if .PageIsHome}} active{{end}}" href="/"><img src="/img/favicon.png" alt="Gogs Logo" id="gogs-logo"></a>