8000 Merge pull request #2206 from scalacenter/navigation-bar · magdzikk/docs.scala-lang@ded870e · GitHub
[go: up one dir, main page]
Skip to content< 8000 /a>

Commit ded870e

Browse files
julienrfjulienrf
authored
Merge pull request scala#2206 from scalacenter/navigation-bar
Overhaul navigation menus
2 parents 4f0a349 + ea0a74b commit ded870e

File tree

15 files changed

+137
-77
lines changed

15 files changed

+137
-77
lines changed

‎_data/doc-nav-header.yml

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
1-
- title: API
2-
url: "#"
3-
submenu:
4-
- title: Current
5-
url: https://www.scala-lang.org/api/current/
6-
- title: All Versions
7-
url: "/api/all.html"
1+
- title: Getting Started
2+
url: "/getting-started/index.html"
83
- title: Learn
94
url: "#"
105
submenu:
11-
- title: Getting Started
12-
url: "/getting-started/index.html"
136
- title: Tour of Scala
147
url: "/tour/tour-of-scala.html"
158
- title: Scala Book
169
url: "/overviews/scala-book/introduction.html"
10+
- title: Online Resources
11+
url: "/learn.html"
12+
- title: Tutorials
13+
url: "#"
14+
submenu:
15+
- title: Getting Started with Scala in IntelliJ
16+
url: "/getting-started/intellij-track/getting-started-with-scala-in-intellij.html"
17+
- title: Getting Started with Scala and sbt
18+
url: "/getting-started/sbt-track/getting-started-with-scala-and-sbt-on-the-command-line.html"
1719
- title: Scala for Java Programmers
1820
url: "/tutorials/scala-for-java-programmers.html"
1921
- title: Scala on Android
2022
url: "/tutorials/scala-on-android.html"
21-
- title: Online Resources
22-
url: "/learn.html"
23+
- title: Scala with Maven
24+
url: "/tutorials/scala-with-maven.html"
2325
- title: Reference
2426
url: "#"
2527
submenu:
@@ -29,13 +31,20 @@
2931
url: "/books.html"
3032
- title: Scala FAQ
3133
url: "/tutorials/FAQ/index.html"
32-
- title: Language Spec
34+
- title: Language Specification
3335
url: http://scala-lang.org/files/archive/spec/2.13/
34-
- title: Style Guide
35-
url: "/style/index.html"
36-
- title: Cheatsheet
37-
url: "/cheatsheets/index.html"
38-
- title: Glossary
39-
url: "/glossary/index.html"
36+
- title: Style Guide
37+
url: "/style/index.html"
38+
- title: Cheatsheet
39+
url: "/cheatsheets/index.html"
40+
- title: Glossary
41+
url: "/glossary/index.html"
42+
- title: API
43+
url: "#"
44+
submenu:
45+
- title: Current
46+
url: https://www.scala-lang.org/api/current/
47+
- title: All Versions
48+
url: "/api/all.html"
4049
- title: SIPs
4150
url: "/sips/index.html"

‎_data/overviews-ja.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
description: "Scala 言語の機能をカバーするガイドと概要"
6060
overviews:
6161
- title: 文字列補間
62-
icon: usd
62+
icon: dollar-sign
6363
url: "core/string-interpolation.html"
6464
description: >
6565
文字列補間は、ユーザーが加工文字列リテラル（processed string literal）に変数参照を直接埋め込めるようにしてくれる。以下例。
@@ -73,7 +73,7 @@
7373
- title: 値クラスと汎用トレイト
7474
by: Mark Harrah
7575
description: "値クラスは Scala で実行時のオブジェクトアロケーションを避ける新しい仕組みだ。これは新しい AnyVal サブクラスを定義することで達成できる。"
76-
icon: diamond
76+
icon: gem
7777
url: "core/value-classes.html"
7878

7979
- category: ライブラリの作成

‎_data/overviews-ru.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
description: "Руководства и обзоры, охватывающие функционал языка Scala."
6161
overviews:
6262
- title: Строковая интерполяция
63-
icon: usd
63+
icon: dollar-sign
6464
url: "core/string-interpolation.html"
6565
description: >
6666
Строковая интерполяция позволяет пользователям встраивать данные из переменных непосредственно в обрабатываемые строковые литералы. Вот пример:
@@ -74,7 +74,7 @@
7474
- title: Вычислительные Классы и Универсальные Трейты
7575
by: Mark Harrah
7676
description: "Вычислительные-Классы - это новый механизм в Scala, позволяющий избежать создания объектов во время исполнения, которое достигается за счет объявления класса в качестве подкласса AnyVal."
77-
icon: diamond
77+
icon: gem
7878
url: "core/value-classes.html"
7979

8080
- category: Создание своих библиотек

‎_data/overviews.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
description: "Guides and overviews covering features in the Scala language."
6262
overviews:
6363
- title: String Interpolation
64-
icon: usd
64+
icon: dollar-sign
6565
url: "core/string-interpolation.html"
6666
description: >
6767
String Interpolation allows users to embed variable references directly in processed string literals. Here’s an example:
@@ -75,7 +75,7 @@
7575
- title: Value Classes and Universal Traits
7676
by: Mark Harrah
7777
description: "Value classes are a new mechanism in Scala to avoid allocating runtime objects. This is accomplished through the definition of new AnyVal subclasses."
78-
icon: diamond
78+
icon: gem
7979
url: "core/value-classes.html"
8080

8181
- category: Authoring Libraries

‎_data/scala3-doc-nav-header.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1+
- title: Getting Started
2+
url: "/scala3/getting-started.html"
13
- title: Learn
24
url: "#"
35
submenu:
46
- title: New in Scala 3
57
url: "/scala3/new-in-scala3.html"
6-
- title: Getting Started
7-
url: "/scala3/getting-started.html"
88
- title: Scala 3 Book
99
url: "/scala3/book/introduction.html"
10-
- title: Contributing Guide
11-
url: "/scala3/guides/contribution/contribution-intro.html"
12-
- title: Macro Tutorial
13-
url: "/scala3/guides/macros/index.html"
1410
- title: Migrate
1511
url: "/scala3/guides/migration/compatibility-intro.html"
1612
- title: Reference
17-
url: "/scala3/reference/overview.html"
18-
- title: API
19-
url: "https://scala-lang.org/api/3.x/"
13+
url: '#'
14+
submenu:
15+
- title: Guides
16+
url: '/scala3/guides.html'
17+
- title: Language Specification
18+
url: "/scala3/reference/overview.html"
19+
- title: Scala Library API
20+
url: "https://scala-lang.org/api/3.x/"
2021
- title: Contributing Guide
2122
url: "/scala3/guides/contribution/contribution-intro.html"

‎_includes/headertop.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<meta name="msapplication-TileColor" content="#15a9ce">
4040
<meta name="theme-color" content="#ffffff">
4141

42-
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
42+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" integrity="sha512-1ycn6IcaQQ40/MKBW2W4Rhis/DbILU74C1vSrLJxCq57o941Ym01SwNsOMqvEBFlcgUa6xLiPY/NS5R+E6ztJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
4343

4444
<!-- Custom stylesheet -->
4545
<link href="{{ site.baseurl }}/resources/css/unslider-dots.css" rel="stylesheet" type="text/css">

‎_includes/tutorial-list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
{% for tutorial in site.data.tutorials limit: 6 %}
33
{% assign loopindex = forloop.index | modulo: 2 %}
44
{% if loopindex == include.column %}
5-
<li><a href="{{tutorial.url}}"><i class="fa fa-file-text-o"></i>{{tutorial.title | truncate: 60}}</a></li>
5+
<li><a href="{{tutorial.url}}"><i class="fa fa-file-alt-o"></i>{{tutorial.title | truncate: 60}}</a></li>
66
{% endif %}
77
{% endfor %}

‎_ja/index.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ scala3-sections:
3434
link: /ja/scala3/guides.html
3535
- title: "API"
3636
description: "Scala 3 の全バージョンのAPIドキュメント"
37-
icon: "fa fa-file-text"
37+
icon: "fa fa-file-alt"
3838
link: https://scala-lang.org/api/3.x/
3939
- title: "Language Reference"
4040
description: "Scala 3 の言語仕様"
@@ -67,7 +67,7 @@ scala2-sections:
6767
links:
6868
- title: "API"
6969
description: "Scala の全バージョンの API ドキュメント（英語のみ）"
70-
icon: "fa fa-file-text"
70+
icon: "fa fa-file-alt"
7171
link: /api/all.html
7272
- title: "Overviews"
7373
description: "Scala の多くの機能を網羅する詳細ドキュメント"
@@ -97,9 +97,4 @@ scala2-sections:
9797
description: "Scala Improvement Process（Scala 改善プロセス）。言語とコンパイラの進化（英語のみ）"
9898
icon: "fa fa-cogs"
9999
link: /sips/index.html
100-
- title: "SPP"
101-
description: "Scala Platform Process（Scala プラットフォームプロセス）。コミュニティ主導型のライブラリの進化（英語のみ）"
102-
icon: "fa fa-users"
103-
link: https://platform.scala-lang.org
104-
105100
---

‎_ja/scala3/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ sections:
3535
link: /ja/scala3/guides.html
3636
- title: "API"
3737
description: "Scala 3 の全バージョンのAPIドキュメント"
38-
icon: "fa fa-file-text"
38+
icon: "fa fa-file-alt"
3939
link: https://scala-lang.org/api/3.x/
4040
- title: "Language Reference"
4141
description: "Scala 3 の言語仕様"

‎_ru/index.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ sections:
3333
links:
3434
- title: "API"
3535
description: "API документация для всех версий Scala."
36-
icon: "fa fa-file-text"
36+
icon: "fa fa-file-alt"
3737
link: /api/all.html
3838
- title: "Обзоры"
3939
description: "Подробная документация, охватывающая возможности Scala."
@@ -62,9 +62,4 @@ sections:
6262
description: "Процесс улучшения Scala (Scala Improvement Process). Эволюция языка и компилятора."
6363
icon: "fa fa-cogs"
6464
link: /sips/index.html
65-
- title: "SPP"
66-
description: "Развитие платформы Scala. Развитие библиотек, движимое сообществом."
67-
icon: "fa fa-users"
68-
link: https://platform.scala-lang.org
69-
7065
---

0 commit comments

Comments
 (0)
0