From 507bab488b8fe5b4ea397d2858aefac7dd573cec Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Mon, 22 May 2023 14:24:57 +0200 Subject: [PATCH 1/8] Governance block draft --- _data/governance.yml | 35 +++++++++++++++++++++ _includes/masthead-community.html | 51 +++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 _data/governance.yml diff --git a/_data/governance.yml b/_data/governance.yml new file mode 100644 index 000000000..3ac9e948c --- /dev/null +++ b/_data/governance.yml @@ -0,0 +1,35 @@ +cards: + - title: "Scala Improvement Process" + description: "SIPs are the primary mechanism for proposing new features, collecting community feedback, and building consensus around future development." + links: + - name: SIP Committee Members + url: https://docs.scala-lang.org/sips/process-specification.html#the-sip-committee + - name: SIP Process Specification + url: https://docs.scala-lang.org/sips/process-specification.html + - title: "Scala 3 Maintenance" + description: "Who maintains the Scala 3 compiler?" + links: + - name: People + url: https://github.com/lampepfl/dotty/blob/main/MAINTENANCE.md#compiler + - name: Process + url: https://github.com/lampepfl/dotty/blob/main/MAINTENANCE.md + - title: "Tooling" + description: "Learn about who maintains the Scala tooling. Process and people are TBD, stay tuned." + links: + - name: "Scala Tooling Summit of March 2023" + url: https://www.scala-lang.org/blog/2023/04/11/march-2023-scala-tooling-summit.html + - title: "Moderation" + description: "Learn about how is the Scala community moderated." + links: + - name: Code of Conduct + url: https://www.scala-lang.org/conduct/ + - name: "Moderation Team" + url: https://www.scala-lang.org/conduct/#contact + - name: "Inclusive Language Guide" + url: https://docs.scala-lang.org/contribute/inclusive-language-guide.html + - name: "Communication Channels" + url: https://docs.scala-lang.org/community/ + - title: "Update Frequency" + description: "This page is updated every 6 months by the Scala Center." + dontExpand: true + links: [] diff --git a/_includes/masthead-community.html b/_includes/masthead-community.html index ecc0d6946..5acb6af35 100644 --- a/_includes/masthead-community.html +++ b/_includes/masthead-community.html @@ -1,3 +1,54 @@ +
+
+
+
+

Governance

+
+
+
+
+ {% for scalaItem in site.data.governance.cards %} + {% assign loopIndexMod = forloop.index | minus: 1 | modulo: 3 %} + + {% if loopIndexMod == 0 %} + {% assign codeSnippets = '' | split: ',' %} +
+ {% endif %} + + + {% unless scalaItem.dontExpand %} + {% capture box_content %} + + {% endcapture %} + {% assign codeSnippets = codeSnippets | push: box_content %} + {% endunless %} +
+

{{scalaItem.title}}

+

{{scalaItem.description}}

+ {% unless scalaItem.dontExpand %} +
More...
+ {% endunless %} +
+ {% if loopIndexMod == 2 or forloop.last %} +
+
+ {% for snippet in codeSnippets %} +
{{snippet}}
+ {% endfor %} +
+ {% endif %} + {% endfor %} +
+
+
+
+
+
+
From 85eeed6c5e104873a82f37dceeaa4c32dc33001e Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Tue, 23 May 2023 16:53:40 +0200 Subject: [PATCH 2/8] Improve styling, adjust text. --- _data/governance.yml | 19 ++++--- _includes/masthead-community.html | 36 ++++++++------ _layouts/frontpage.html | 2 +- _sass/layout/governance.scss | 80 ++++++++++++++++++++++++++++++ _sass/layout/table-of-content.scss | 10 +++- _sass/utils/_variables.scss | 1 + resources/css/style.scss | 1 + resources/js/functions.js | 30 ++++++----- 8 files changed, 143 insertions(+), 36 deletions(-) create mode 100755 _sass/layout/governance.scss diff --git a/_data/governance.yml b/_data/governance.yml index 3ac9e948c..b68b7bb06 100644 --- a/_data/governance.yml +++ b/_data/governance.yml @@ -1,30 +1,35 @@ cards: - title: "Scala Improvement Process" - description: "SIPs are the primary mechanism for proposing new features, collecting community feedback, and building consensus around future development." + description: "The SIP is the primary mechanism for evolving the Scala language." + expandText: "Process & People" links: - name: SIP Committee Members url: https://docs.scala-lang.org/sips/process-specification.html#the-sip-committee - name: SIP Process Specification url: https://docs.scala-lang.org/sips/process-specification.html - title: "Scala 3 Maintenance" - description: "Who maintains the Scala 3 compiler?" + description: "Managing the Scala 3 compiler, standard library and documentation." + expandText: "Process & People" links: - - name: People + - name: Core Maintainers url: https://github.com/lampepfl/dotty/blob/main/MAINTENANCE.md#compiler - - name: Process + - name: Maintenance Procedures url: https://github.com/lampepfl/dotty/blob/main/MAINTENANCE.md - title: "Tooling" - description: "Learn about who maintains the Scala tooling. Process and people are TBD, stay tuned." + description: "Managing build tools, linters, IDEs, and other tools." + expandText: "Process & People" links: + - text: "Process and People are TBD, please stay tuned! However you can read below about the Scala Tooling Summit:" - name: "Scala Tooling Summit of March 2023" url: https://www.scala-lang.org/blog/2023/04/11/march-2023-scala-tooling-summit.html - title: "Moderation" description: "Learn about how is the Scala community moderated." + expandText: "Process & People" links: - - name: Code of Conduct - url: https://www.scala-lang.org/conduct/ - name: "Moderation Team" url: https://www.scala-lang.org/conduct/#contact + - name: Code of Conduct + url: https://www.scala-lang.org/conduct/ - name: "Inclusive Language Guide" url: https://docs.scala-lang.org/contribute/inclusive-language-guide.html - name: "Communication Channels" diff --git a/_includes/masthead-community.html b/_includes/masthead-community.html index 5acb6af35..f1e4b0370 100644 --- a/_includes/masthead-community.html +++ b/_includes/masthead-community.html @@ -1,8 +1,8 @@ -
+
-

Governance

+

Governance

@@ -18,19 +18,27 @@

Governance

{% unless scalaItem.dontExpand %} {% capture box_content %} - +
+
    + {% for link in scalaItem.links %} + {% if link.text %} +

  • {{ link.text }}

    • + {% else %} +
  • {{ link.name }}
    • + {% endif %} + {% endfor %} +
+
{% endcapture %} {% assign codeSnippets = codeSnippets | push: box_content %} {% endunless %} -
-

{{scalaItem.title}}

-

{{scalaItem.description}}

+
+
+

{{scalaItem.title}}

+

{{scalaItem.description}}

+
{% unless scalaItem.dontExpand %} -
More...
+
{{scalaItem.expandText}}
{% endunless %}
{% if loopIndexMod == 2 or forloop.last %} @@ -54,7 +62,7 @@

{{scalaItem.title}}

-

Discourse

+

Discourse

Forums
    {% for forum in site.data.chats-forums.discourseForums %} @@ -69,7 +77,7 @@

    {{forum.title}}

-

Discord

+

Discord

Real-time chat
    {% for server in site.data.chats-forums.discordServers %} @@ -91,7 +99,7 @@

    {{server.name}}

    -

    Upcoming Events and Trainings

    +

    Upcoming Events and Trainings

    {% assign upcomingEvents = '' | split: ',' %} diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html index ad5c544cd..ee21569e9 100644 --- a/_layouts/frontpage.html +++ b/_layouts/frontpage.html @@ -123,7 +123,7 @@

    Scala in a Nutshell

    {{scalaItem.shortTitle}}

    {{scalaItem.shortDescription}}

    -
    More...
    +
    More...
    {% if loopIndexMod == 2 or forloop.last %}
    diff --git a/_sass/layout/governance.scss b/_sass/layout/governance.scss new file mode 100755 index 000000000..6a6e8dbf2 --- /dev/null +++ b/_sass/layout/governance.scss @@ -0,0 +1,80 @@ +// GOVERNANCE +//------------------------------------------------ +//------------------------------------------------ + +.governance { + // background: $gray-nutshell; + + .vertical-buttons-list { + @include display(flex); + @include flex-direction(column); + @include justify-content(space-between); + padding: 15px 0; + li { + margin-bottom: 10px; + } + // @include align-items(center); + // @include justify-content(flex-start); + } + + .button-expand { + text-align: center; + display: block; + } + + .button-more { + font-size: $font-size-small; + padding: 5px; + cursor: pointer; + } + + .scala-items-list { + .items-menu { + .scala-item { + @include span-columns(4); + @include omega(3n); + + @include display(flex); + @include flex-direction(column); + // @include align-items(center); + @include justify-content(space-between); + padding: 15px 10px; + text-align: center; + transition: $base-transition; + // border: 1px solid $gray-light; + margin-top: 15px; + @include bp(large) { + @include span-columns(12); + } + + min-height: 150px; + + h4 { + font-size: $font-size-h3; + color: #000; + text-transform: uppercase; + font-family: $base-font-family; + margin-bottom: 10px; + } + + p { + font-size: $font-size-medium; + } + + &.active { + background: $gray-light; + } + } + + .items-content { + background: $gray-light; + transition: $base-transition; + + .items-code { + display: none; + padding: 5px 0; + } + } + } + } +} diff --git a/_sass/layout/table-of-content.scss b/_sass/layout/table-of-content.scss index ea89df826..01c75c5e1 100755 --- a/_sass/layout/table-of-content.scss +++ b/_sass/layout/table-of-content.scss @@ -18,6 +18,13 @@ padding-bottom: 0; } } + .governance { + margin-bottom: $padding-medium; + + .inner-box { + padding-bottom: 0; + } + } } .documentation { @@ -81,8 +88,9 @@ padding-bottom: $padding-small; .discourse, .discord { - h3 { + h2 { margin-top: 0; + font-size: $font-size-title; } @include span-columns(6); diff --git a/_sass/utils/_variables.scss b/_sass/utils/_variables.scss index 0fa38b101..d50b1f3af 100755 --- a/_sass/utils/_variables.scss +++ b/_sass/utils/_variables.scss @@ -53,6 +53,7 @@ $base-font-size: $em-base; //------------------------------------------------ $font-size-carousel-arrow: 1.8rem; $font-size-logo-btn: 1.4rem; +$font-size-title: 1.5rem; // 25px $font-size-large: 1.063rem; // 17px $font-size-medium: 0.9375rem; // 15px $font-size-small: 0.875rem; // 14px diff --git a/resources/css/style.scss b/resources/css/style.scss index 2fa134f89..50ac31885 100755 --- a/resources/css/style.scss +++ b/resources/css/style.scss @@ -34,6 +34,7 @@ @import 'layout/twitter-feed'; @import 'layout/ides'; @import 'layout/nutshell'; +@import 'layout/governance'; @import 'layout/community-frontpage'; @import 'layout/courses'; @import 'layout/upcoming-events'; diff --git a/resources/js/functions.js b/resources/js/functions.js index 5ad0b4ed4..2a67448ca 100644 --- a/resources/js/functions.js +++ b/resources/js/functions.js @@ -20,20 +20,24 @@ $(document).ready(function() { items.each(function(index2, button) { var jButton = $(button); - jButton.click(function(event) { - var activeCode = contents.eq(index2); - var others = allContents.not(activeCode); - allButtons.removeClass('active'); - others.hide(); - - if (activeCode.is(":visible")) { - activeCode.hide(); - } else { - jButton.addClass('active') - activeCode.show(); - } + var expandButton = jButton.children('.button-more'); + if (expandButton.length > 0) { + var target = jButton.is('.scala-item__governance') ? expandButton : jButton; + target.click(function(event) { + var activeCode = contents.eq(index2); + var others = allContents.not(activeCode); + allButtons.removeClass('active'); + others.hide(); + + if (activeCode.is(":visible")) { + activeCode.hide(); + } else { + jButton.addClass('active') + activeCode.show(); + } - }); + }); + } }); }); }); From 188aa5cfd62dc8e3f68a5e511617d98eec2fcde5 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Thu, 25 May 2023 11:39:03 +0200 Subject: [PATCH 3/8] Update _data/governance.yml Co-authored-by: Seth Tisue --- _data/governance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/governance.yml b/_data/governance.yml index b68b7bb06..cdd5a6b2d 100644 --- a/_data/governance.yml +++ b/_data/governance.yml @@ -23,7 +23,7 @@ cards: - name: "Scala Tooling Summit of March 2023" url: https://www.scala-lang.org/blog/2023/04/11/march-2023-scala-tooling-summit.html - title: "Moderation" - description: "Learn about how is the Scala community moderated." + description: "Learn how the Scala community is moderated." expandText: "Process & People" links: - name: "Moderation Team" From d880f4c7b2c1959e84cff344ce19f7c32fa02f6a Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Thu, 25 May 2023 13:29:44 +0200 Subject: [PATCH 4/8] move update frequency to into paragraph --- _data/governance.yml | 5 +---- _includes/masthead-community.html | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/_data/governance.yml b/_data/governance.yml index cdd5a6b2d..0913d42a6 100644 --- a/_data/governance.yml +++ b/_data/governance.yml @@ -1,3 +1,4 @@ +introText: This section is updated every 6 months by the Scala Center. cards: - title: "Scala Improvement Process" description: "The SIP is the primary mechanism for evolving the Scala language." @@ -34,7 +35,3 @@ cards: url: https://docs.scala-lang.org/contribute/inclusive-language-guide.html - name: "Communication Channels" url: https://docs.scala-lang.org/community/ - - title: "Update Frequency" - description: "This page is updated every 6 months by the Scala Center." - dontExpand: true - links: [] diff --git a/_includes/masthead-community.html b/_includes/masthead-community.html index f1e4b0370..f6a36b18b 100644 --- a/_includes/masthead-community.html +++ b/_includes/masthead-community.html @@ -3,6 +3,7 @@

    Governance

    +

    {{site.data.governance.introText}}

    From ae403d9190d37c97ce81d6b6d3d82c0ca757c893 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 31 May 2023 14:06:25 +0200 Subject: [PATCH 5/8] Add more info about SIP, the moderation, the Scala Center and Scala 2. --- _data/governance.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/_data/governance.yml b/_data/governance.yml index 0913d42a6..fc202f013 100644 --- a/_data/governance.yml +++ b/_data/governance.yml @@ -4,6 +4,9 @@ cards: description: "The SIP is the primary mechanism for evolving the Scala language." expandText: "Process & People" links: + - text: "This process aims to evolve Scala openly and collaboratively. Anyone from the community is welcome to submit a Scala Improvement Proposal (SIP), which is then reviewed and discussed by a Committee. Every month, the Committee votes on the proposals to accept in the language." + - name: SIP Homepage + url: https://docs.scala-lang.org/sips/index.html - name: SIP Committee Members url: https://docs.scala-lang.org/sips/process-specification.html#the-sip-committee - name: SIP Process Specification @@ -27,6 +30,7 @@ cards: description: "Learn how the Scala community is moderated." expandText: "Process & People" links: + - text: "The Scala community is moderated by the Moderation Team over all the official communication channels. The moderation is governed by the Code of Conduct" - name: "Moderation Team" url: https://www.scala-lang.org/conduct/#contact - name: Code of Conduct @@ -35,3 +39,23 @@ cards: url: https://docs.scala-lang.org/contribute/inclusive-language-guide.html - name: "Communication Channels" url: https://docs.scala-lang.org/community/ + - title: "Scala Center" + description: "The organization fostering the Scala community, education, and OSS library development." + expandText: "Learn More" + links: + - name: "Homepage" + url: https://scala.epfl.ch/ + - name: Team + url: https://scala.epfl.ch/team.html + - name: "Advisory Board" + url: https://github.com/scalacenter/advisoryboard#the-scala-center-advisory-board + - name: "5 Year Report" + url: https://scala.epfl.ch/records/first-five-years/ + - title: "Scala 2 Maintenance" + description: "Who maintains the Scala 2 compiler?" + expandText: "Process & People" + links: + - name: "Contribution Process" + url: "https://github.com/scala/scala#how-to-contribute" + - name: "Core Maintainers" + url: "https://github.com/scala/scala#get-in-touch" From 2f282c0cdf9632d1e8e69ee610d927737e074dad Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 31 May 2023 16:09:01 +0200 Subject: [PATCH 6/8] Update _data/governance.yml Co-authored-by: Julien Richard-Foy --- _data/governance.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/governance.yml b/_data/governance.yml index fc202f013..98afc7d0d 100644 --- a/_data/governance.yml +++ b/_data/governance.yml @@ -30,7 +30,7 @@ cards: description: "Learn how the Scala community is moderated." expandText: "Process & People" links: - - text: "The Scala community is moderated by the Moderation Team over all the official communication channels. The moderation is governed by the Code of Conduct" + - text: "The Scala community is moderated by the Moderation Team over all the official communication channels. The moderation is governed by the Code of Conduct." - name: "Moderation Team" url: https://www.scala-lang.org/conduct/#contact - name: Code of Conduct From 540d41e1964fcf3caea853fdbed8dd6849b7d199 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Wed, 31 May 2023 16:24:58 +0200 Subject: [PATCH 7/8] Remove intro block --- _data/governance.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/_data/governance.yml b/_data/governance.yml index 98afc7d0d..36bf66ff4 100644 --- a/_data/governance.yml +++ b/_data/governance.yml @@ -1,4 +1,3 @@ -introText: This section is updated every 6 months by the Scala Center. cards: - title: "Scala Improvement Process" description: "The SIP is the primary mechanism for evolving the Scala language." From e9839856fb225bc308b8cd0fcb8cf15e47bb39f6 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Fri, 2 Jun 2023 11:11:38 +0200 Subject: [PATCH 8/8] Add WIP disclaimer to the governance page --- _data/governance.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_data/governance.yml b/_data/governance.yml index 36bf66ff4..656dd87de 100644 --- a/_data/governance.yml +++ b/_data/governance.yml @@ -1,3 +1,4 @@ +introText: The development of this page is in progress. cards: - title: "Scala Improvement Process" description: "The SIP is the primary mechanism for evolving the Scala language."