From 2037f2de586e329587399f06c50de3ebfea49334 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Wed, 8 Jun 2022 17:42:04 +0200 Subject: [PATCH 01/23] merge navbars --- _data/doc-nav-header.yml | 28 +++++++++++++++++++--------- _data/scala3-doc-nav-header.yml | 24 ------------------------ _includes/navbar-inner.html | 9 +-------- 3 files changed, 20 insertions(+), 41 deletions(-) delete mode 100644 _data/scala3-doc-nav-header.yml diff --git a/_data/doc-nav-header.yml b/_data/doc-nav-header.yml index 52b66be1da..63e6db5534 100644 --- a/_data/doc-nav-header.yml +++ b/_data/doc-nav-header.yml @@ -1,11 +1,20 @@ - title: Getting Started url: "/getting-started/index.html" +- title: Migration + url: "#" + submenu: + - title: New in Scala 3 + url: "/scala3/new-in-scala3.html" + - title: Scala 3 Migration Guide + url: "/scala3/guides/migration/compatibility-intro.html" - title: Learn url: "#" submenu: - title: Tour of Scala url: "/tour/tour-of-scala.html" - - title: Scala Book + - title: Scala 3 Book + url: "/scala3/book/introduction.html" + - title: Scala 2 Book url: "/overviews/scala-book/introduction.html" - title: Online Courses url: "/online-courses.html" @@ -29,14 +38,20 @@ submenu: - title: "Guides & Overviews" url: "/overviews/index.html" + - title: Scala 3 Guides + url: '/scala3/guides.html' - title: Books url: "/books.html" - title: Scala FAQ url: "/tutorials/FAQ/index.html" - - title: Language Specification + - title: Scala Language Specification url: http://scala-lang.org/files/archive/spec/2.13/ - - title: Contribution Guide + - title: Scala 3 Language Reference + url: "https://docs.scala-lang.org/scala3/reference" + - title: Scala Contribution Guide url: "/contribute/" + - title: Scala 3 Compiler Contributing Guide + url: "/scala3/guides/contribution/contribution-intro.html" - title: Style Guide url: "/style/index.html" - title: Cheatsheet @@ -44,11 +59,6 @@ - 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" + url: "/api/all.html" - title: SIPs url: "/sips/index.html" diff --git a/_data/scala3-doc-nav-header.yml b/_data/scala3-doc-nav-header.yml deleted file mode 100644 index 3493bd4de3..0000000000 --- a/_data/scala3-doc-nav-header.yml +++ /dev/null @@ -1,24 +0,0 @@ -- title: Getting Started - url: "/scala3/getting-started.html" -- title: Learn - url: "#" - submenu: - - title: New in Scala 3 - url: "/scala3/new-in-scala3.html" - - title: Scala 3 Book - url: "/scala3/book/introduction.html" - - title: Online Courses - url: "/online-courses.html" -- title: Migrate - url: "/scala3/guides/migration/compatibility-intro.html" -- title: Reference - url: '#' - submenu: - - title: Guides - url: '/scala3/guides.html' - - title: Language Specification - url: "https://docs.scala-lang.org/scala3/reference" - - title: Scala Library API - url: "https://scala-lang.org/api/3.x/" -- title: Contributing Guide - url: "/scala3/guides/contribution/contribution-intro.html" diff --git a/_includes/navbar-inner.html b/_includes/navbar-inner.html index 171d00924e..8ce1227e62 100644 --- a/_includes/navbar-inner.html +++ b/_includes/navbar-inner.html @@ -1,8 +1,4 @@ -{% if page.scala3 %} - {% assign navdata = site.data.scala3-doc-nav-header %} -{% else %} - {% assign navdata = site.data.doc-nav-header %} -{% endif %} +{% assign navdata = site.data.doc-nav-header %} {% include site-header.html %} @@ -18,9 +14,6 @@ docs - - — Scala {% if page.scala3 %} 3 {% else %} 2 {% endif %} -
From c18b6dab6218a2c207f00f402bf3aa3ae5dfc02e Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Wed, 8 Jun 2022 17:42:24 +0200 Subject: [PATCH 02/23] single get-started page --- _getting-started/index.md | 4 +++- _ja/getting-started/index.md | 2 ++ _ja/scala3/getting-started.md | 8 -------- 3 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 _ja/scala3/getting-started.md diff --git a/_getting-started/index.md b/_getting-started/index.md index a26af28495..5db17b403c 100644 --- a/_getting-started/index.md +++ b/_getting-started/index.md @@ -5,7 +5,9 @@ partof: getting-started languages: [fr, ja, uk] includeTOC: true -redirect_from: "/getting-started.html" +redirect_from: + - /getting-started.html + - /scala3/getting-started.html # we deleted the scala 3 version of this page --- {% include getting-started.md %} diff --git a/_ja/getting-started/index.md b/_ja/getting-started/index.md index 3a20db86c6..e1d4101870 100644 --- a/_ja/getting-started/index.md +++ b/_ja/getting-started/index.md @@ -4,6 +4,8 @@ title: 入門 partof: getting-started language: ja includeTOC: true +redirect_from: + - /ja/scala3/getting-started.html # we deleted the scala 3 version of this page --- {% include _ja/getting-started.md %} diff --git a/_ja/scala3/getting-started.md b/_ja/scala3/getting-started.md deleted file mode 100644 index 120647c4c2..0000000000 --- a/_ja/scala3/getting-started.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -layout: singlepage-overview -title: Getting Started with Scala 3 -scala3: true -language: ja ---- - -{% include _ja/getting-started.md %} From 9a932fe6d0a8a852c14252da28ea47c3ec76dd9d Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Wed, 8 Jun 2022 20:29:39 +0200 Subject: [PATCH 03/23] ensure only books do not have sticky toc --- _includes/sidebar-toc-multipage-overview.html | 15 +++++++-------- _sass/layout/toc.scss | 10 +++++----- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/_includes/sidebar-toc-multipage-overview.html b/_includes/sidebar-toc-multipage-overview.html index 168f4b5950..e82f7bc8d5 100644 --- a/_includes/sidebar-toc-multipage-overview.html +++ b/_includes/sidebar-toc-multipage-overview.html @@ -1,13 +1,12 @@ +{% assign pagetype = page.type %}
-
+
Contents
- {% assign type = page.type %} - {% if type %} -