From cb32243c541333144ee90aece4186532f5fa7f28 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Thu, 17 Nov 2022 15:36:59 +0100 Subject: [PATCH] japanese homepage uses regular layout --- _data/overviews-ja.yml | 29 +++++++-- _ja/index.md | 91 +++++++++++++-------------- _ja/overviews/index.md | 2 + _ja/scala3/guides.md | 38 ----------- _layouts/landing-page-deprecated.html | 84 ------------------------- _sass/layout/documentation.scss | 64 ------------------- 6 files changed, 71 insertions(+), 237 deletions(-) delete mode 100644 _ja/scala3/guides.md delete mode 100644 _layouts/landing-page-deprecated.html diff --git a/_data/overviews-ja.yml b/_data/overviews-ja.yml index a76dd2bf72..60277bd90c 100644 --- a/_data/overviews-ja.yml +++ b/_data/overviews-ja.yml @@ -58,6 +58,30 @@ - category: 言語 description: "Scala 言語の機能をカバーするガイドと概要" overviews: + - title: "Scala 2 から Scala 3 への移行" + icon: suitcase + root: "scala3/guides/" + url: "migration/compatibility-intro.html" + description: "Scala 3 との互換性と移行について知っておくべきことすべて" + - title: "Scala 3 マクロ" + by: Nicolas Stucki + icon: magic + root: "scala3/guides/" + url: "macros" + description: "Scala 3 のマクロの書き方に関係する全ての機能をカバーする詳しいチュートリアル" + label-text: new in Scala 3 + - title: 値クラスと汎用トレイト + by: Mark Harrah + description: "値クラスは Scala で実行時のオブジェクトアロケーションを避ける新しい仕組みだ。これは新しい AnyVal サブクラスを定義することで達成できる。" + icon: gem + url: "core/value-classes.html" + - title: TASTyの概要 + by: Alvin Alexander + icon: birthday-cake + root: "scala3/guides/" + url: "tasty-overview.html" + description: "Scala のエンドユーザー向けの TASTy のフォーマットの概要" + label-text: new in Scala 3 - title: 文字列補間 icon: dollar-sign url: "core/string-interpolation.html" @@ -70,11 +94,6 @@ by: Josh Suereth description: "Scala 2.10 は暗黙クラス（implicit class）と呼ばれる新しい機能を導入した。暗黙クラスは implicit キーワードでマークされたクラスだ。このキーワードはそのクラスがスコープ内にあるとき、そのプライマリコンストラクターが暗黙変換に利用可能にする。" url: "core/implicit-classes.html" - - title: 値クラスと汎用トレイト - by: Mark Harrah - description: "値クラスは Scala で実行時のオブジェクトアロケーションを避ける新しい仕組みだ。これは新しい AnyVal サブクラスを定義することで達成できる。" - icon: gem - url: "core/value-classes.html" - category: ライブラリの作成 description: "Scala エコシステム向けのオープンソースライブラリの貢献方法のガイド" diff --git a/_ja/index.md b/_ja/index.md index fccb29750e..b94f171774 100644 --- a/_ja/index.md +++ b/_ja/index.md @@ -1,6 +1,6 @@ --- -layout: landing-page-deprecated -title: ドキュメント +layout: landing-page +title: Learn Scala language: ja partof: documentation more-resources-label: その他のリソース @@ -8,42 +8,7 @@ more-resources-label: その他のリソース # Content masthead links -scala3-sections: - - title: "First steps" - links: - - title: "Scala 3 の新機能" - description: "Scala 3 で追加されたさまざまな新機能の概要" - icon: "fa fa-star" - link: /ja/scala3/new-in-scala3.html - - title: "Scala 3 をはじめる" - description: "あなたのコンピューターに Scala 3 をインストールしてScalaコードを書きはじめよう!" - icon: "fa fa-rocket" - link: /ja/scala3/getting-started.html - - title: "Scala 3 Book" - description: "主要な言語仕様のイントロダクションをオンラインブックで読む" - icon: "fa fa-book" - link: /scala3/book/introduction.html - - title: "More detailed information" - links: - - title: "Migration Guide" - description: "Scala 2 から Scala 3 へ移行するためのガイド" - icon: "fa fa-suitcase" - link: /scala3/guides/migration/compatibility-intro.html - - title: "Guides" - description: "Scala 3 の言語仕様からピックアップして解説" - icon: "fa fa-map" - link: /ja/scala3/guides.html - - title: "API" - description: "Scala 3 の全バージョンのAPIドキュメント" - icon: "fa fa-file-alt" - link: https://scala-lang.org/api/3.x/ - - title: "Language Reference" - description: "Scala 3 の言語仕様" - icon: "fa fa-book" - link: https://docs.scala-lang.org/scala3/reference - -scala2-sections: - +sections: - title: "最初のステップ" links: - title: "入門" @@ -54,15 +19,22 @@ scala2-sections: 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: "Scala 3 Book" + description: "主要な言語仕様のイントロダクションをオンラインブックで読む" + icon: "fa fa-book" + link: /scala3/book/introduction.html + - title: Online Courses + description: "MOOCs to learn Scala, for beginners and experienced programmers." + icon: "fa fa-cloud" + link: /online-courses.html - title: 書籍（英語のみ） - url: /books.html + description: "Printed and digital books about Scala." + icon: "fa fa-book" + link: /books.html + - title: Tutorials + description: "Take you by the hand through a series of steps to create Scala applications." + icon: "fa fa-tasks" + link: /tutorials.html - title: "リピーター向け" links: @@ -91,6 +63,29 @@ scala2-sections: description: "Scala の形式的言語仕様（英語のみ）" icon: "fa fa-book" link: https://scala-lang.org/files/archive/spec/2.13/ + - title: "Language Reference" + description: "Scala 3 の言語仕様" + icon: "fa fa-book" + link: https://docs.scala-lang.org/scala3/reference + + - title: "Explore Scala 3" + links: + - title: "Migration Guide" + description: "Scala 2 から Scala 3 へ移行するためのガイド" + icon: "fa fa-suitcase" + link: /scala3/guides/migration/compatibility-intro.html + - title: "Scala 3 の新機能" + description: "Scala 3 で追加されたさまざまな新機能の概要" + icon: "fa fa-star" + link: /ja/scala3/new-in-scala3.html + - title: "All new Scaladoc for Scala 3" + description: "Highlights of new features for Scaladoc" + icon: "fa fa-star" + link: /scala3/scaladoc.html + - title: "Talks" + description: "Talks about Scala 3 that can be watched online" + icon: "fa fa-play-circle" + link: /scala3/talks.html - title: "Scala の進化" links: @@ -98,4 +93,8 @@ scala2-sections: description: "Scala Improvement Process（Scala 改善プロセス）。言語とコンパイラの進化（英語のみ）" icon: "fa fa-cogs" link: /sips/index.html + - title: "Become a Scala OSS Contributor" + description: "From start to finish: discover how you can help Scala's open-source ecosystem" + icon: "fa fa-code-branch" + link: /contribute/ --- diff --git a/_ja/overviews/index.md b/_ja/overviews/index.md index 5358fa7343..77e9d1b8d6 100644 --- a/_ja/overviews/index.md +++ b/_ja/overviews/index.md @@ -3,6 +3,8 @@ layout: overviews partof: overviews title: ガイドと概要 language: ja +redirect_from: + - "/ja/scala3/guides.html" --- diff --git a/_ja/scala3/guides.md b/_ja/scala3/guides.md deleted file mode 100644 index 0bffcc5146..0000000000 --- a/_ja/scala3/guides.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -layout: root-index-layout -title: Scala 3 のガイド -language: ja -scala3: true - - -guides: - - title: "Scala 2 から Scala 3 への移行" - icon: suitcase - url: "/scala3/guides/migration/compatibility-intro.html" - description: "Scala 3 との互換性と移行について知っておくべきことすべて" - - title: マクロ - by: Nicolas Stucki - icon: magic - url: "/scala3/guides/macros" - description: "Scala 3 のマクロの書き方に関係する全ての機能をカバーする詳しいチュートリアル" - label-text: feature - - title: TASTyの概要 - by: Alvin Alexander - icon: birthday-cake - url: "/scala3/guides/tasty-overview.html" - description: "Scala のエンドユーザー向けの TASTy のフォーマットの概要" ---- - -
-
-
-
-

概要とガイド

-

- Scala 3 とその機能についての詳しいガイド -

-{% include scala3-guides-card-group.html %} -
-
-
-
diff --git a/_layouts/landing-page-deprecated.html b/_layouts/landing-page-deprecated.html deleted file mode 100644 index 929cb01207..0000000000 --- a/_layouts/landing-page-deprecated.html +++ /dev/null @@ -1,84 +0,0 @@ ---- ---- - -{% include headertop.html %} {% include headerbottom.html %} -{% if page.new-version %}This page has a new version.{% endif %} - -
- -{% include site-header.html %} - -
- -
-
-
- -

{{page.title}}

-
-
- -
- - -
-
-
-
- -
-
-
-

Scala 2

-
-
-
-
- Language -
    -
    -
    - - - - {% include documentation-sections.html sections=page.scala2-sections %} -
    -
    - -
    -
    -

    Scala 3

    -
    -
    -
    - We are still in the process of writing the documentation for Scala 3. - You can help us to improve the documentation. -
    - {% include documentation-sections.html sections=page.scala3-sections %} -
    -
    -
    - - {{content}} - -
    - -{% include footer.html %} diff --git a/_sass/layout/documentation.scss b/_sass/layout/documentation.scss index 73945ba628..66d4d33c7a 100644 --- a/_sass/layout/documentation.scss +++ b/_sass/layout/documentation.scss @@ -74,67 +74,3 @@ a.new-version-notice { font-size: large; text-align: center; } - -// Styles for the index of docs.scala-lang.org -.landing-page .title-page { - background: $gray-li; - - h1 { - color: rgb(134,161,166); - } -} - -.landing-page .table-of-content .wrap { - - position: relative; - - h5 { - margin: 0; - } - - .language-header { - padding: 30px; - background: $brand-tertiary; - - h1 { - font-size: 1.875rem; - font-family: $base-font-family; - text-transform: uppercase; - text-shadow: $text-shadow; - color: #fff; - } - } - - .language-footer { - bottom: 0; - width: 100%; - - .go-btn { - display: block; - padding: 20px; - height: 66px; - background: #fff; - border-top: 1px solid lighten($base-font-color-light, 35%); - color: lighten($base-font-color-light, 10%); - font-weight: $font-regular; - font-size: $font-regular; - text-decoration: none; - - &:hover { - cursor: pointer; - background: #E5EAEA; - color: rgba(0, 0, 0, 0.4); - } - } - } - - &:first-of-type { - margin-bottom: 20px; - } -} - -.landing-page .table-of-content .wrap.scala3 { - .language-header { - background: $brand-tertiary-dotty; - } -}