From c7f56d7483f403f66a3bf849f6dbe5e460719248 Mon Sep 17 00:00:00 2001
From: Unknwon <joe2010xtmf@163.com>
Date: Mon, 27 Oct 2014 11:18:00 -0400
Subject: [PATCH] Fix #584

---
 conf/app.ini                 | 2 --
 conf/locale/locale_en-US.ini | 2 +-
 conf/locale/locale_zh-CN.ini | 2 +-
 gogs.go                      | 2 +-
 public/ng/css/ui.css         | 6 +++---
 public/ng/less/ui/reset.less | 6 +++---
 templates/.VERSION           | 2 +-
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/conf/app.ini b/conf/app.ini
index 79f440dd4d3..ed4a1b62190 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -70,8 +70,6 @@ ENABLE_CACHE_AVATAR = false
 ENABLE_NOTIFY_MAIL = false
 ; More detail: https://github.com/gogits/gogs/issues/165
 ENABLE_REVERSE_PROXY_AUTHENTICATION = false
-; Repository Git hooks
-ENABLE_GIT_HOOKS = false
 
 [webhook]
 ; Cron task interval in minutes
diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
index f99a9e72857..4b85143a436 100644
--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -41,7 +41,7 @@ cancel = Cancel
 [install]
 install = Installation
 title = Install Steps For First-time Run
-requite_db_desc = Gogs requires MySQL, PostgreSQL or SQLite3, but SQLite3 is usually available in the official binary version.
+requite_db_desc = Gogs requires MySQL, PostgreSQL or SQLite3, but SQLite3.
 db_type = Database Type
 host = Host
 user = User
diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index 0c17f2d7f95..a5bccb55765 100644
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -41,7 +41,7 @@ cancel = 取消
 [install]
 install = 安装页面
 title = 首次运行安装程序
-requite_db_desc = Gogs 允许后端数据库为 MySQL、PostgreSQL 或 SQLite3，但是 SQLite3 一般只有官方二进制发行版才支持。
+requite_db_desc = Gogs 允许后端数据库为 MySQL、PostgreSQL 或 SQLite3。
 db_type = 数据库类型
 host = 数据库主机
 user = 数据库用户
diff --git a/gogs.go b/gogs.go
index 82a3ae685f3..3f66c4361b6 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.6.1025 Beta"
+const APP_VER = "0.5.6.1027 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/public/ng/css/ui.css b/public/ng/css/ui.css
index e659180d65c..a6c218ad89e 100644
--- a/public/ng/css/ui.css
+++ b/public/ng/css/ui.css
@@ -4,7 +4,7 @@
 }
 html {
   font-size: 13px;
-  font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace;
+  font-family: Helvetica, "Microsoft Yahei", Arial, sans-serif;
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
   line-height: 24px;
@@ -16,7 +16,7 @@ textarea,
 select,
 option,
 button {
-  font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace;
+  font-family: Helvetica, "Microsoft Yahei", Arial, sans-serif;
 }
 article,
 aside,
@@ -151,7 +151,7 @@ code,
 kbd,
 pre,
 samp {
-  font-family: monospace, monospace;
+  font-family: monospace;
   font-size: 1em;
 }
 .text-left {
diff --git a/public/ng/less/ui/reset.less b/public/ng/less/ui/reset.less
index 0e7a50e4082..d6abb0e5367 100644
--- a/public/ng/less/ui/reset.less
+++ b/public/ng/less/ui/reset.less
@@ -7,7 +7,7 @@
 
 html {
   font-size: @baseFontSize+1;
-  font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace;
+  font-family: Helvetica, "Microsoft Yahei", Arial, sans-serif;
   // make sure min font size
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
@@ -23,7 +23,7 @@ textarea,
 select,
 option,
 button {
-  font-family: Helvetica, "Microsoft Yahei", Menlo, Monaco, Consolas, "Courier New", monospace;
+  font-family: Helvetica, "Microsoft Yahei", Arial, sans-serif;
 }
 
 // html5 block elements
@@ -193,7 +193,7 @@ code,
 kbd,
 pre,
 samp {
-    font-family: monospace, monospace;
+    font-family: monospace;
     font-size: 1em;
 }
 
diff --git a/templates/.VERSION b/templates/.VERSION
index 3e75e45dc3e..151da6063b5 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.6.1025 Beta
\ No newline at end of file
+0.5.6.1027 Beta
\ No newline at end of file