Overhaul navigation menus

_data/doc-nav-header.yml

@@ -1,25 +1,27 @@
-- title: API
-  url: "#"
-  submenu:
-    - title: Current
-      url: https://www.scala-lang.org/api/current/
-    - title: All Versions
-      url: "/api/all.html"
+- title: Getting Started
+  url: "/getting-started/index.html"
 - title: Learn
   url: "#"
   submenu:
-    - title: Getting Started
-      url: "/getting-started/index.html"
     - title: Tour of Scala
       url: "/tour/tour-of-scala.html"
     - title: Scala Book
       url: "/overviews/scala-book/introduction.html"
+    - title: Online Resources
+      url: "/learn.html"
+- title: Tutorials
+  url: "#"
+  submenu:
+    - title: Getting Started with Scala in IntelliJ
+      url: "/getting-started/intellij-track/getting-started-with-scala-in-intellij.html"
+    - title: Getting Started with Scala and sbt
+      url: "/getting-started/sbt-track/getting-started-with-scala-and-sbt-on-the-command-line.html"
     - title: Scala for Java Programmers
       url: "/tutorials/scala-for-java-programmers.html"
     - title: Scala on Android
       url: "/tutorials/scala-on-android.html"
-    - title: Online Resources
-      url: "/learn.html"
+    - title: Scala with Maven
+      url: "/tutorials/scala-with-maven.html"
 - title: Reference
   url: "#"
   submenu:
@@ -29,13 +31,20 @@
       url: "/books.html"
     - title: Scala FAQ
       url: "/tutorials/FAQ/index.html"
-    - title: Language Spec
+    - title: Language Specification
       url: http://scala-lang.org/files/archive/spec/2.13/
-- title: Style Guide
-  url: "/style/index.html"
-- title: Cheatsheet
-  url: "/cheatsheets/index.html"
-- title: Glossary
-  url: "/glossary/index.html"
+    - title: Style Guide
+      url: "/style/index.html"
+    - title: Cheatsheet
+      url: "/cheatsheets/index.html"
+    - title: Glossary
+      url: "/glossary/index.html"
+- title: API
+  url: "#"
+  submenu:
+    - title: Current
+      url: https://www.scala-lang.org/api/current/
+    - title: All Versions
+      url: "/api/all.html"
 - title: SIPs
   url: "/sips/index.html"

_data/overviews-ja.yml

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

_data/overviews-ru.yml

@@ -60,7 +60,7 @@
   description: "Руководства и обзоры, охватывающие функционал языка Scala."
   overviews:
     - title: Строковая интерполяция
-      icon: usd
+      icon: dollar-sign
       url: "core/string-interpolation.html"
       description: >
         Строковая интерполяция позволяет пользователям встраивать данные из переменных непосредственно в обрабатываемые строковые литералы. Вот пример:
@@ -74,7 +74,7 @@
     - title: Вычислительные Классы и Универсальные Трейты
       by: Mark Harrah
       description: "Вычислительные-Классы - это новый механизм в Scala, позволяющий избежать создания объектов во время исполнения, которое достигается за счет объявления класса в качестве подкласса AnyVal."
-      icon: diamond
+      icon: gem
       url: "core/value-classes.html"
 
 - category: Создание своих библиотек

_data/overviews.yml

@@ -61,7 +61,7 @@
   description: "Guides and overviews covering features in the Scala language."
   overviews:
     - title: String Interpolation
-      icon: usd
+      icon: dollar-sign
       url: "core/string-interpolation.html"
       description: >
         String Interpolation allows users to embed variable references directly in processed string literals. Here’s an example:
@@ -75,7 +75,7 @@
     - title: Value Classes and Universal Traits
       by: Mark Harrah
       description: "Value classes are a new mechanism in Scala to avoid allocating runtime objects. This is accomplished through the definition of new AnyVal subclasses."
-      icon: diamond
+      icon: gem
       url: "core/value-classes.html"
 
 - category: Authoring Libraries

_data/scala3-doc-nav-header.yml

@@ -1,21 +1,22 @@
+- title: Getting Started
+  url: "/scala3/getting-started.html"
 - title: Learn
   url: "#"
   submenu:
     - title: New in Scala 3
       url: "/scala3/new-in-scala3.html"
-    - title: Getting Started
-      url: "/scala3/getting-started.html"
     - title: Scala 3 Book
       url: "/scala3/book/introduction.html"
-    - title: Contributing Guide
-      url: "/scala3/guides/contribution/contribution-intro.html"
-    - title: Macro Tutorial
-      url: "/scala3/guides/macros/index.html"
 - title: Migrate
   url: "/scala3/guides/migration/compatibility-intro.html"
 - title: Reference
-  url: "/scala3/reference/overview.html"
-- title: API
-  url: "https://scala-lang.org/api/3.x/"
+  url: '#'
+  submenu:
+    - title: Guides
+      url: '/scala3/guides.html'
+    - title: Language Specification
+      url: "/scala3/reference/overview.html"
+    - title: Scala Library API
+      url: "https://scala-lang.org/api/3.x/"
 - title: Contributing Guide
   url: "/scala3/guides/contribution/contribution-intro.html"

_includes/headertop.html

@@ -39,7 +39,7 @@
     <meta name="msapplication-TileColor" content="#15a9ce">
     <meta name="theme-color" content="#ffffff">
 
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
+    <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" />
 
     <!-- Custom stylesheet -->
     <link href="{{ site.baseurl }}/resources/css/unslider-dots.css" rel="stylesheet" type="text/css">

_includes/tutorial-list.html

@@ -2,6 +2,6 @@
 {% for tutorial in site.data.tutorials limit: 6 %}
 	{% assign loopindex = forloop.index | modulo: 2 %}
 	{% if loopindex == include.column %}
-	  <li><a href="{{tutorial.url}}"><i class="fa fa-file-text-o"></i>{{tutorial.title | truncate: 60}}</a></li>
+	  <li><a href="{{tutorial.url}}"><i class="fa fa-file-alt-o"></i>{{tutorial.title | truncate: 60}}</a></li>
 	{% endif %}
 {% endfor %}

_ja/index.md

@@ -34,7 +34,7 @@ scala3-sections:
         link: /ja/scala3/guides.html
       - title: "API"
         description: "Scala 3 の全バージョンのAPIドキュメント"
-        icon: "fa fa-file-text"
+        icon: "fa fa-file-alt"
         link: https://scala-lang.org/api/3.x/
       - title: "Language Reference"
         description: "Scala 3 の言語仕様"
@@ -67,7 +67,7 @@ scala2-sections:
     links:
       - title: "API"
         description: "Scala の全バージョンの API ドキュメント（英語のみ）"
-        icon: "fa fa-file-text"
+        icon: "fa fa-file-alt"
         link: /api/all.html
       - title: "Overviews"
         description: "Scala の多くの機能を網羅する詳細ドキュメント"
@@ -97,9 +97,4 @@ scala2-sections:
         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
-
 ---

_ja/scala3/index.md

@@ -35,7 +35,7 @@ sections:
         link: /ja/scala3/guides.html
       - title: "API"
         description: "Scala 3 の全バージョンのAPIドキュメント"
-        icon: "fa fa-file-text"
+        icon: "fa fa-file-alt"
         link: https://scala-lang.org/api/3.x/
       - title: "Language Reference"
         description: "Scala 3 の言語仕様"

_ru/index.md

@@ -33,7 +33,7 @@ sections:
     links:
       - title: "API"
         description: "API документация для всех версий Scala."
-        icon: "fa fa-file-text"
+        icon: "fa fa-file-alt"
         link: /api/all.html
       - title: "Обзоры"
         description: "Подробная документация, охватывающая возможности Scala."
@@ -62,9 +62,4 @@ sections:
         description: "Процесс улучшения Scala (Scala Improvement Process). Эволюция языка и компилятора."
         icon: "fa fa-cogs"
         link: /sips/index.html
-      - title: "SPP"
-        description: "Развитие платформы Scala. Развитие библиотек, движимое сообществом."
-        icon: "fa fa-users"
-        link: https://platform.scala-lang.org
-
 ---

_zh-cn/index.md

@@ -35,7 +35,7 @@ scala3-sections:
       link: /scala3/guides.html
     - title: "API"
       description: "Scala 3 各个版本的API"
-      icon: "fa fa-file-text"
+      icon: "fa fa-file-alt"
       link: https://scala-lang.org/api/3.x/
     - title: "语言参考手册"
       description: "Scala 3 语言参考手册"
@@ -68,7 +68,7 @@ scala2-sections:
     links:
       - title: "API"
         description: "各个Scala版本的API文档"
-        icon: "fa fa-file-text"
+        icon: "fa fa-file-alt"
         link: /api/all.html
       - title: "总览"
         description: "涵盖Scala各种特性的深度分析文档"
@@ -97,9 +97,4 @@ scala2-sections:
         description: "Scala改进过程（Scala Improvement Process），语言及编译器进展"
         icon: "fa fa-cogs"
         link: /sips/index.html
-      - title: "SPP"
-        description: "Scala平台进程（Scala Platform Process）， 社区驱动代码库的进展"
-        icon: "fa fa-users"
-        link: https://platform.scala-lang.org
-
 ---

index.md

@@ -19,8 +19,8 @@ scala3-sections:
         icon: "fa fa-rocket"
         link: /scala3/getting-started.html
       - title: "Scala 3 Book"
-        description: "An online book introducing the main language features."
-        icon: "fa fa-book"
+        description: "Learn Scala by reading a series of short lessons."
+        icon: "fa fa-book-open"
         link: /scala3/book/introduction.html
   - title: "More detailed information"
     links:
@@ -32,17 +32,17 @@ scala3-sections:
         description: "Detailed guides about particular aspects of the language."
         icon: "fa fa-map"
         link: /scala3/guides.html
-      - title: "API"
-        description: "API documentation for every version of Scala 3."
-        icon: "fa fa-file-text"
+      - title: "Scala Library API"
+        description: "API documentation for every version of the Scala 3 standard library."
+        icon: "fa fa-file-alt"
         link: https://scala-lang.org/api/3.x/
       - title: "Language Reference"
         description: "The Scala 3 language reference."
         icon: "fa fa-book"
         link: /scala3/reference/overview.html
       - title: "Contribution Guide"
         description: "Guide to the Scala 3 Compiler and fixing an issue"
-        icon: "fa fa-gears"
+        icon: "fa fa-cogs"
         link: /scala3/guides/contribution/contribution-intro.html
       - title: "All new Scaladoc for Scala 3"
         description: "Highlights of new features for Scaladoc"
@@ -65,22 +65,29 @@ scala2-sections:
         icon: "fa fa-flag"
         link: /tour/tour-of-scala.html
       - title: "Scala Book"
-        description: "An online book introducing the main language features."
-        icon: "fa fa-book"
+        description: "Learn Scala by reading a series of short lessons."
+        icon: "fa fa-book-open"
         link: /overviews/scala-book/introduction.html
-    more-resources:
-      - title: Online Courses, Exercises, & Blogs
-        url: /learn.html
+      - title: Online Resources
+        description: "Online Courses, Exercises, & Blogs."
+        icon: "fa fa-cloud"
+        link: /learn.html
       - title: Books
-        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: "Returning Users"
     links:
       - title: "API"
         description: "API documentation for every version of Scala."
-        icon: "fa fa-file-text"
+        icon: "fa fa-file-alt"
         link: /api/all.html
-      - title: "Overviews"
+      - title: "Guides & Overviews"
         description: "In-depth documentation covering many of Scala's features."
         icon: "fa fa-database"
         link: /overviews/index.html
@@ -107,8 +114,4 @@ scala2-sections:
         description: "The Scala Improvement Process. Language & compiler evolution."
         icon: "fa fa-cogs"
         link: /sips/index.html
-      - title: "SPP"
-        description: "The Scala Platform Process. Community-driven library evolution."
-        icon: "fa fa-users"
-        link: https://platform.scala-lang.org
 ---

scala3/guides.md

@@ -20,7 +20,7 @@ guides:
     description: "An overview over the TASTy format aimed at end-users of the Scala language."
   - title: "Contribution Guide"
     by: Jamie Thompson, Anatolii Kmetiuk
-    icon: gears
+    icon: cogs
     url: "/scala3/guides/contribution/contribution-intro.html"
     description: "Guide to the Scala 3 Compiler and fixing an issue"
   - title: Scaladoc

scala3/index.md

@@ -34,15 +34,15 @@ sections:
         link: /scala3/guides.html
       - title: "API"
         description: "API documentation for every version of Scala 3."
-        icon: "fa fa-file-text"
+        icon: "fa fa-file-alt"
         link: https://scala-lang.org/api/3.x/
       - title: "Language Reference"
         description: "The Scala 3 language reference."
         icon: "fa fa-book"
         link: /scala3/reference/overview.html
       - title: "Contribution Guide"
         description: "Guide to the Scala 3 Compiler and fixing an issue"
-        icon: "fa fa-gears"
+        icon: "fa fa-cogs"
         link: /scala3/guides/contribution/contribution-intro.html
       - title: "All new Scaladoc for Scala 3"
         description: "Highlights of new features for Scaladoc"