Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge scala 2 and scala 3 themes and guides #2430

Merged
merged 23 commits into from Jun 22, 2022

Conversation

bishabosha
Copy link
Member

Reverse splitting the documentation website into two distinct themes.

  • merge the two navigation bars
  • use only a single colour for the theme
  • remove the "Work in Progress" notice from scala 3 pages
  • merge the scala 3 guides with the "guides and overviews"
  • add notices to a limited number of pages that are "version specific" to either scala 2 or scala 3.
  • merge the "Scala 2" and "Scala 3" sections of the index page.
  • set up "new-version" metadata for every page in scala 2 book, add a new theme for outdated pages
  • move scala 2 book to "guides and overviews"
  • add notice to scala 3 and scala 2 book that we are in process of merging them.

Copy link
Contributor

@julienrf julienrf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you Jamie!

I think it would be good to always show the navbar, like it was the case before the Scala 2 / Scala 3 split (see here).

_data/doc-nav-header.yml Outdated Show resolved Hide resolved
_data/overviews.yml Outdated Show resolved Hide resolved
_overviews/scala-book/control-structures.md Outdated Show resolved Hide resolved
_overviews/scala-book/for-expressions.md Outdated Show resolved Hide resolved
_overviews/scala-book/for-loops.md Outdated Show resolved Hide resolved
_overviews/scala-book/if-then-else-construct.md Outdated Show resolved Hide resolved
_overviews/scala-book/where-next.md Outdated Show resolved Hide resolved
_data/overviews.yml Outdated Show resolved Hide resolved
@bishabosha bishabosha force-pushed the merge-scala2-scala3 branch 2 times, most recently from b0ffd87 to 4f5bcda Compare June 22, 2022 09:42
Copy link
Contributor

@julienrf julienrf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for addressing all the comments! The result looks good to me, I only left a couple of minor comments.

_overviews/scala3-book/taste-intro.md Outdated Show resolved Hide resolved
_overviews/scala3-book/where-next.md Outdated Show resolved Hide resolved
@kazanzhy
Copy link
Contributor

Just subscribing to receive the notification and prepare a Ukrainian translation of these changes

@bishabosha bishabosha merged commit 323df5e into scala:main Jun 22, 2022
@bishabosha bishabosha deleted the merge-scala2-scala3 branch November 8, 2022 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Display Scala 3 doc above Scala 2 doc and remove WIP message
3 participants