From 9c1620d49cd67fcbe06dbe40cdd76c383e4f55c9 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 31 Mar 2017 14:13:25 -0400 Subject: [PATCH] css: font-family fixes for Chinese --- README_ZH.md | 2 +- public/css/gogs.css | 10 +++++++++- public/less/_base.less | 6 +++++- templates/org/home.tmpl | 4 ++-- templates/user/auth/signup.tmpl | 4 ++-- templates/user/dashboard/dashboard.tmpl | 12 ++++++------ 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/README_ZH.md b/README_ZH.md index 0deb3a3b7..eae7a0190 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -9,7 +9,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自 ## 项目概览 -- 有关基本用法和变更日志，请通过 [使用手册](https://gogs.io/docs/intro/) 查看。 +- 有关基本用法和变更日志，请通过 [使用手册](https://gogs.io/docs/intro) 查看。 - 想要先睹为快？直接去 [在线体验](https://try.gogs.io/gogs/gogs) 。 - 使用过程中遇到问题？尝试从 [故障排查](https://gogs.io/docs/intro/troubleshooting.html) 页面或 [用户论坛](https://discuss.gogs.io/) 获取帮助。 - 希望帮助多国语言界面的翻译吗？请立即访问 [详情页面](https://gogs.io/docs/features/i18n.html)！ diff --git a/public/css/gogs.css b/public/css/gogs.css index ad6b682bb..e5f1d0b58 100644 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -5,10 +5,18 @@ background-size: contain; } body { - font-family: "Helvetica Neue", "Microsoft YaHei", Arial, Helvetica, sans-serif !important; + font-family: "Helvetica Neue", "Microsoft YaHei", SimSun, Arial, Helvetica, sans-serif !important; background-color: #fff; overflow-y: scroll; } +h1, +h2, +h3, +h4, +h5, +.ui.header { + font-family: "Hiragino Sans GB", "Helvetica Neue", "Microsoft YaHei", SimSun, Arial, Helvetica, sans-serif !important; +} img { border-radius: 3px; } diff --git a/public/less/_base.less b/public/less/_base.less index 1f04f569b..407bad826 100644 --- a/public/less/_base.less +++ b/public/less/_base.less @@ -1,10 +1,14 @@ @footer-margin: 40px; body { - font-family: "Helvetica Neue", "Microsoft YaHei", Arial, Helvetica, sans-serif !important; + font-family: "Helvetica Neue", "Microsoft YaHei", SimSun, Arial, Helvetica, sans-serif !important; background-color: #fff; overflow-y: scroll; } +h1, h2, h3, h4, h5, +.ui.header { + font-family: "Hiragino Sans GB", "Helvetica Neue", "Microsoft YaHei", SimSun, Arial, Helvetica, sans-serif !important; +} img { border-radius: 3px; } diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 17b0ade8c..9ac0eae98 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -36,14 +36,14 @@
-

+
{{.i18n.Tr "org.people"}} {{if .IsOrganizationMember}}
{{.Org.NumMembers}}
{{end}} -

+
{{$isMember := .IsOrganizationMember}} {{range .Members}} diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl index 86c020d6b..6b59e72db 100644 --- a/templates/user/auth/signup.tmpl +++ b/templates/user/auth/signup.tmpl @@ -5,7 +5,7 @@
{{.CsrfTokenHtml}}

- {{if .IsSocialLogin}}{{.i18n.Tr "social_sign_in" | Str2html}}{{else}}{{.i18n.Tr "sign_up"}}{{end}} + {{.i18n.Tr "sign_up"}}

{{template "base/alert" .}} @@ -45,7 +45,7 @@
- {{if .IsSocialLogin}}{{.i18n.Tr "auth.social_register_hepler_msg"}}{{else}}{{.i18n.Tr "auth.register_hepler_msg"}}{{end}} + {{.i18n.Tr "auth.register_hepler_msg"}}
{{end}}
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index 978b0bc73..74af8801f 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -18,7 +18,7 @@ {{.i18n.Tr "mirror"}}
-

+
{{.i18n.Tr "home.my_repos"}} {{.RepoCount}}
@@ -26,7 +26,7 @@ {{.i18n.Tr "new_repo"}}
-

+