From 104599e56657ee833957049f8298e7ebe005f658 Mon Sep 17 00:00:00 2001 From: exoego Date: Mon, 15 Jul 2019 19:36:11 +0900 Subject: [PATCH 1/3] Add language dropdown to masthead-documentation layout --- _includes/masthead-documentation.html | 28 +++++++++++++++++++++++++++ _sass/components/dropdown.scss | 11 +++++++++++ 2 files changed, 39 insertions(+) diff --git a/_includes/masthead-documentation.html b/_includes/masthead-documentation.html index a15b70e81e..0411d88942 100644 --- a/_includes/masthead-documentation.html +++ b/_includes/masthead-documentation.html @@ -1,6 +1,34 @@
+ +
+
+ Language +
    +
    +
    + + +
    {% for section in page.sections %}
    diff --git a/_sass/components/dropdown.scss b/_sass/components/dropdown.scss index 30f41cb713..6cf33e73ca 100644 --- a/_sass/components/dropdown.scss +++ b/_sass/components/dropdown.scss @@ -18,6 +18,11 @@ // } float: right; + .table-of-content & { + margin-top: 0; + margin-right: 0; + } + .wrapper-dropdown { padding: 8px 18px 8px 40px; appearance: none; @@ -25,6 +30,12 @@ border-radius: $border-radius-base; box-sizing: border-box; + .table-of-content & { + border: 1px solid rgba(128, 128, 128, 0.5); + } + .table-of-content &:focus { + } + &:focus { outline: none; background: rgba(#fff, 0.9); From 2c282bb67f99d501c3a9bf3398d57357577705b4 Mon Sep 17 00:00:00 2001 From: exoego Date: Tue, 16 Jul 2019 13:34:47 +0900 Subject: [PATCH 2/3] Add Japanese translations of root page (index.md) --- _ja/index.md | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++ index.md | 7 +++--- 2 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 _ja/index.md diff --git a/_ja/index.md b/_ja/index.md new file mode 100644 index 0000000000..12a737d4c1 --- /dev/null +++ b/_ja/index.md @@ -0,0 +1,70 @@ +--- +layout: inner-page-documentation +title: ドキュメント +language: ja +partof: documentation +discourse: true + +# Content masthead links +sections: + + - title: "最初のステップ" + links: + - title: "入門" + description: "あなたのコンピューターに Scala をインストールして、Scala コードを書きはじめよう！（英語のみ）" + icon: "fa fa-rocket" + link: /getting-started.html + - title: "Scala ツアー" + description: "コア言語機能をひと口大で紹介" + icon: "fa fa-flag" + link: /ja/tour/tour-of-scala.html + - title: "Java プログラマーのための Scala" + description: "Java 経験者向けのすばやい紹介" + icon: "fa fa-coffee" + link: /ja/tutorials/scala-for-java-programmers.html + more-resources: + - title: オンラインリソース（英語のみ） + url: /learn.html + - title: 書籍（英語のみ） + url: /books.html + + - title: "リピーター向け" + links: + - title: "API" + description: "Scala の全バージョンの API ドキュメント（英語のみ）" + icon: "fa fa-file-text" + link: /api/all.html + - title: "Overviews" + description: "Scala の多くの機能を網羅する詳細ドキュメント" + icon: "fa fa-database" + # TODO: 日本語訳はあるがリニューアル前のもの。要修正 + link: /ja/overviews/index.html + - title: "スタイルガイド" + description: "Scala らしいコードを書くための詳細なガイド（英語のみ）" + icon: "fa fa-bookmark" + link: /style/index.html + - title: "チートシート" + description: "Scala 構文の基礎を網羅する便利なチートシート" + icon: "fa fa-list" + link: /ja/cheatsheets/index.html + - title: "Scala よくある質問" + description: "Scala 言語機能についてよく聞かれる質問＆回答集（英語のみ）" + icon: "fa fa-question-circle" + link: /tutorials/FAQ/index.html + - title: "言語仕様" + description: "Scala の形式的言語仕様（英語のみ）" + icon: "fa fa-book" + link: http://scala-lang.org/files/archive/spec/2.12/ + + - title: "Scala の進化" + links: + - title: "SIP" + description: "Scala Improvement Process（Scala 改善プロセス）。言語とコンパイラの進化（英語のみ）" + icon: "fa fa-cogs" + link: sips/index.html + - title: "SPP" + description: "Scala Platform Process（Scala プラットフォームプロセス）。コミュニティ主導型のライブラリの進化（英語のみ）" + icon: "fa fa-users" + link: https://platform.scala-lang.org + +--- diff --git a/index.md b/index.md index 23ed9edcd5..7a98cad905 100644 --- a/index.md +++ b/index.md @@ -1,9 +1,10 @@ --- layout: inner-page-documentation title: Documentation -#redirect_from: -# - /what-is-scala/ -#includeTOC: true +languages: [ja] +namespace: root +partof: documentation +discourse: true # Content masthead links sections: From b0f8ffb199aa437746570840c125d6136913d4ce Mon Sep 17 00:00:00 2001 From: exoego Date: Tue, 16 Jul 2019 15:43:11 +0900 Subject: [PATCH 3/3] Fix missing directory separator. --- _ja/index.md | 2 +- index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_ja/index.md b/_ja/index.md index 12a737d4c1..4f22939227 100644 --- a/_ja/index.md +++ b/_ja/index.md @@ -61,7 +61,7 @@ sections: - title: "SIP" description: "Scala Improvement Process（Scala 改善プロセス）。言語とコンパイラの進化（英語のみ）" icon: "fa fa-cogs" - link: sips/index.html + link: /sips/index.html - title: "SPP" description: "Scala Platform Process（Scala プラットフォームプロセス）。コミュニティ主導型のライブラリの進化（英語のみ）" icon: "fa fa-users" diff --git a/index.md b/index.md index 7a98cad905..fb6d93db53 100644 --- a/index.md +++ b/index.md @@ -61,7 +61,7 @@ sections: - title: "SIPs" description: "The Scala Improvement Process. Language & compiler evolution." icon: "fa fa-cogs" - link: sips/index.html + link: /sips/index.html - title: "SPP" description: "The Scala Platform Process. Community-driven library evolution." icon: "fa fa-users"