go-gitea · techknowlogick · Mar 18, 2019 · Feb 8, 2019 · Feb 9, 2019 · Feb 9, 2019
diff --git a/modules/context/context.go b/modules/context/context.go
@@ -193,6 +193,7 @@ func Contexter() macaron.Handler {
 			},
 			Org: &Organization{},
 		}
+		ctx.Data["Language"] = ctx.Locale.Language()
 		c.Data["Link"] = ctx.Link
 		ctx.Data["PageStartTime"] = time.Now()
 		// Quick responses appropriate go-get meta with status 200

diff --git a/package-lock.json b/package-lock.json
diff --git a/public/css/index.css b/public/css/index.css
diff --git a/public/less/_base.less b/public/less/_base.less
@@ -1,11 +1,85 @@
 @footer-margin: 40px;
 
+@default-fonts: "Segoe UI", "Microsoft YaHei", Arial, Helvetica, sans-serif;
+
+.override-fonts(@fonts) {
+    body {
+        font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, @fonts;
+    }
+
+    .markdown:not(code) {
+        font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, @fonts;
+    }
+
+    /* We're going to just override the semantic fonts here */
+    h1, h2, h3, h4, h5 {
+        font-family: "Lato", @fonts;
+    }
+
+    .home .hero h1, .home .hero h2 {
+        font-family: 'PT Sans Narrow', "Lato", @fonts;
+    }
+
+    .ui.accordion .title:not(.ui),
+    .ui.button,
+    .ui.card > .content > .header.ui.card > .content > .header,
+    .ui.category.search > .results .category > .name,
+    .ui.form input:not([type]), .ui.form input[type=date], .ui.form input[type=datetime-local], .ui.form input[type=email], .ui.form input[type=file], .ui.form input[type=number], .ui.form input[type=password], .ui.form input[type=search], .ui.form input[type=tel], .ui.form input[type=text], .ui.form input[type=time], .ui.form input[type=url],
+    .ui.header,
+    .ui.items > .item > .content > .header,
+    .ui.list .list > .item .header,
+    .ui.list > .item .header,
+    .ui.menu,
+    .ui.message .header,
+    .ui.modal > .header,
+    .ui.popup > .header,
+    .ui.search > .results .result .title,
+    .ui.search > .results > .message .header,
+    body,
+    .ui.input>input, .ui.input input,
+    .ui.statistics .statistic > .value,
+    .ui.statistic > .value,
+    .ui.statistics .statistic > .label,
+    .ui.statistic > .label,
+    .ui.steps .step .title,
+    .ui.text.container
+    {
+        font-family: "Lato", @fonts;
+    }
+}
+
 body {
-    font-family: "Lato", "Segoe UI", "Microsoft YaHei", Arial, Helvetica, sans-serif !important;
+    .override-fonts(@default-fonts);
     background-color: #fff;
     overflow-y: scroll;
     -webkit-font-smoothing: antialiased;
 }
+
+@ja-fonts: "Segoe UI", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", Meiryo, "ＭＳ Ｐゴシック", "MS PGothic", Roboto, Noto, "Noto Sans CJK JP", Arial, Helvetica, sans-serif;
+:lang(ja) {
+    .override-fonts(@ja-fonts);
+}
+
+@zh-CN-fonts: "Segoe UI", "Microsoft YaHei New", "Microsoft Yahei", "微软雅黑", "方体", "PingFang SC", "黑体", "Heiti SC", STXihei, "华文细黑", Roboto, Noto, "Noto Sans CJK SC", Arial, Helvetica, sans-serif;
+:lang(zh-CN) {
+    .override-fonts(@zh-CN-fonts);
+}
+
+@zh-TW-fonts: "Segoe UI", "方體", "PingFang TC", "黑體", "Heiti TC", "Microsoft JhengHei New", "Microsoft JhengHei", "微軟正黑體", "宋体", MingLiu, Roboto, Noto, "Noto Sans CJK TC", Arial, Helvetica, sans-serif;
+:lang(zh-TW) {
+    .override-fonts(@zh-TW-fonts);
+}
+
+@zh-HK-fonts: "Segoe UI", "方體", "PingFang HK", "方體", "PingFang TC", "黑體", "Heiti TC", "Microsoft JhengHei New", "Microsoft JhengHei", "微軟正黑體", "宋体", MingLiu, Roboto, Noto, "Noto Sans CJK TC", Arial, Helvetica, sans-serif;
+:lang(zh-HK) {
+    .override-fonts(@zh-HK-fonts);
+}
+
+@ko-fonts: "Segoe UI", 'Apple SD Gothic Neo', 'NanumBarunGothic', '맑은 고딕', 'Malgun Gothic', '굴림', 'Gulim', '돋움', 'Dotum', "Nanum Gothic", "Apple SD Gothic Neo", "Malgun Gothic", Roboto, Noto, "Noto Sans CJK KR", 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
+:lang(ko) {
+    .override-fonts(@ko-fonts);
+}
+
 img {
     border-radius: 3px;
 }
@@ -338,7 +412,7 @@ pre, code {
     }
 
     .sha.label {
-        font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace;
+        font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace, inherit;
         font-size: 13px;
         padding: 6px 10px 4px 10px;
         font-weight: normal;

diff --git a/public/less/_dashboard.less b/public/less/_dashboard.less
@@ -100,7 +100,7 @@
             }
         }
         .commit-id {
-            font-family: Consolas, monospace;
+            font-family: Consolas, monospace, inherit;
         }
         code {
             padding: 1px;

diff --git a/public/less/_form.less b/public/less/_form.less
@@ -192,7 +192,7 @@
 
 .githook {
     textarea {
-        font-family: monospace;
+        font-family: monospace, inherit;
     }
 }
 

diff --git a/public/less/_markdown.less b/public/less/_markdown.less
@@ -1,6 +1,5 @@
 .markdown:not(code) {
     overflow: hidden;
-    font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif;
     font-size: 16px;
     line-height: 1.6 !important;
     word-wrap: break-word;

diff --git a/public/less/_repository.less b/public/less/_repository.less
@@ -331,7 +331,7 @@
             .code-view {
                 * {
                     font-size: 12px;
-                    font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+                    font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace, inherit;
                     line-height: 20px;
                 }
 
@@ -700,7 +700,7 @@
                     }
                     textarea {
                         height: 200px;
-                        font-family: "Consolas", monospace;
+                        font-family: "Consolas", monospace, inherit;
                     }
                 }
 
@@ -803,7 +803,7 @@
             }
             textarea {
                 height: 200px;
-                                font-family: "Consolas", monospace;
+                                font-family: "Consolas", monospace, inherit;
             }
         }
     }
@@ -1347,7 +1347,7 @@
         &.new {
             .CodeMirror {
                 .CodeMirror-code {
-                    font-family: "Consolas", monospace;
+                    font-family: "Consolas", monospace, inherit;
                     .cm-comment {
                         background: inherit;
                     }

diff --git a/templates/base/footer_content.tmpl b/templates/base/footer_content.tmpl
@@ -12,7 +12,7 @@
 				<div class="text">{{.LangName}}</div>
 				<div class="menu">
 					{{range .AllLangs}}
-						<a class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
+						<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
 					{{end}}
 				</div>
 			</div>

diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="{{.Language}}">
 <head data-suburl="{{AppSubUrl}}">
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">