Skip to content

Commit

Permalink
Issue #3, updated the fonts, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
chenglu committed Jul 5, 2019
1 parent 3ef952c commit 308659b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/_assets/css/_variables.scss
Expand Up @@ -68,7 +68,7 @@ $site-color-sidebar-active: #1389FD;
// Typography

$font-size-base: 0.875rem; // 14px
$font-family-base: Roboto, sans-serif;
$font-family-base: "Noto Sans SC", Roboto, "Helvetica Neue", "Helvetica", Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
$font-family-monospace: "Roboto Mono", Menlo, "Bitstream Vera Sans Mono", "DejaVu Sans Mono", Monaco, Consolas, monospace;
$google-font-family: "Product Sans", $font-family-base;

Expand Down
2 changes: 1 addition & 1 deletion src/_includes/analytics.html
Expand Up @@ -5,7 +5,7 @@
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-26406144-4', 'auto');
ga('create', 'UA-122680122-5', 'auto');
ga('send', 'pageview');

</script>
Expand Down
2 changes: 1 addition & 1 deletion src/_includes/head.html
Expand Up @@ -34,7 +34,7 @@
<meta property="og:type" content="{{og_type}}" />
{% endif -%}

<link href="https://fonts.googleapis.com/css?family=Google+Sans:300,400,500|Google+Sans+Display:400|Roboto:300,400,500|Roboto+Mono:300,400,700|Material+Icons" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Google+Sans:300,400,500|Google+Sans+Display:400|Roboto:300,400,500|Roboto+Mono:300,400,700|Material+Icons|Noto+Sans+SC" rel="stylesheet">
{% asset main.css %}
{% for css in page.css -%}
<link href="{{css}}" rel="stylesheet" type="text/css">
Expand Down
14 changes: 7 additions & 7 deletions src/_includes/navigation-main.html
Expand Up @@ -7,24 +7,24 @@
</a>
<ul class="navbar">
<li class="mainnav__get-started">
<a href="/docs" class="nav-link
{%- if page_url_path contains '/*/guides/' or page_url_path contains '/*/dart-2/' or page_url_path contains '/*/codelabs/' or page_url_path contains '/*/samples/' or page_url_path contains '/*/tools/' or page_url_path contains '/*/tutorials/' or page_url_path contains '/*/server/' or page_url_path contains '/*/web/' %} active {%- endif -%}"><span>Docs</span></a>
<a href="/guides" class="nav-link
{%- if page_url_path contains '/*/guides/' or page_url_path contains '/*/dart-2/' or page_url_path contains '/*/codelabs/' or page_url_path contains '/*/samples/' or page_url_path contains '/*/tools/' or page_url_path contains '/*/tutorials/' or page_url_path contains '/*/server/' or page_url_path contains '/*/web/' %} active {%- endif -%}"><span>文档</span></a>
</li>
<li>
<a href="/platforms" class="nav-link
{%- if page_url_path contains '/*/platforms/' %} active {%- endif -%}">Platforms</a>
{%- if page_url_path contains '/*/platforms/' %} active {%- endif -%}">平台</a>
</li>
<li>
<a href="/community" class="nav-link
{%- if page_url_path contains '/*/community/' %} active {%- endif -%}">Community</a>
{%- if page_url_path contains '/*/community/' %} active {%- endif -%}">社区</a>
</li>
<li>
<a href="https://dartpad.dartlang.org/" target="_blank" class="nav-link no-automatic-external
{%- if page_url_path contains '/*/#dartpad' %} active {%- endif -%}">Try Dart</a>
<a href="https://dartpad.cn/" target="_blank" class="nav-link no-automatic-external
{%- if page_url_path contains '/*/#dartpad' %} active {%- endif -%}">尝试 Dart</a>
</li>
<li>
<a href="/get-dart" class="nav-link
{%- if page_url_path contains '/*/get-dart/' %} active {%- endif -%}">Get Dart</a>
{%- if page_url_path contains '/*/get-dart/' %} active {%- endif -%}">获取 Dart SDK</a>
</li>
<li class="searchfield">
<form action="/search" class="site-header__search form-inline" id="cse-search-box">
Expand Down
2 changes: 2 additions & 0 deletions translator/assets/translator/css/translator.css
Expand Up @@ -4,6 +4,8 @@ body[translation-debug] [translation-result] {

[translation-origin=on] {
border-top: 1px dashed lightgray !important;
font-family: Roboto, "Helvetica Neue", "Helvetica", Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;

}

[translation-origin=off] {
Expand Down

0 comments on commit 308659b

Please sign in to comment.