From 991b0798dfb3da550480cb421249928641cd75cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 23 Jul 2022 11:09:21 -0600 Subject: [PATCH 1/2] Remove Slack from site and repo docs --- .github/CONTRIBUTING.md | 4 +--- .github/SUPPORT.md | 2 +- README.md | 3 +-- config.yml | 1 - site/content/docs/5.2/getting-started/best-practices.md | 2 +- site/content/docs/5.2/getting-started/introduction.md | 2 +- site/layouts/partials/docs-navbar.html | 6 ------ site/layouts/partials/footer.html | 1 - site/layouts/partials/icons/slack.svg | 1 - 9 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 site/layouts/partials/icons/slack.svg diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 476fddb91bc0..2b9522d0c124 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -18,9 +18,7 @@ the preferred channel for [bug reports](#bug-reports), [features requests](#feat and [submitting pull requests](#pull-requests), but please respect the following restrictions: -* Please **do not** use the issue tracker for personal support requests. Stack - Overflow ([`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag), - [Slack](https://bootstrap-slack.herokuapp.com/) or [IRC](/README.md#community) are better places to get help. +* Please **do not** use the issue tracker for personal support requests. Stack Overflow ([`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag), [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions). or [IRC](/README.md#community) are better places to get help. * Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others. diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md index a4739f589a4f..26b3be42c5b5 100644 --- a/.github/SUPPORT.md +++ b/.github/SUPPORT.md @@ -6,6 +6,6 @@ See the [contributing guidelines](CONTRIBUTING.md) for sharing bug reports. For general troubleshooting or help getting started: -- Join [the official Slack room](https://bootstrap-slack.herokuapp.com/). +- Ask and explore [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions). - Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel. - Ask and explore Stack Overflow with the [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag. diff --git a/README.md b/README.md index 5e557c499b1e..ed88ec28caba 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,6 @@ Read the [Getting started page](https://getbootstrap.com/docs/5.2/getting-starte ## Status -[![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com/) [![Build Status](https://img.shields.io/github/workflow/status/twbs/bootstrap/JS%20Tests/main?label=JS%20Tests&logo=github)](https://github.com/twbs/bootstrap/actions?query=workflow%3AJS+Tests+branch%3Amain) [![npm version](https://img.shields.io/npm/v/bootstrap)](https://www.npmjs.com/package/bootstrap) [![Gem version](https://img.shields.io/gem/v/bootstrap)](https://rubygems.org/gems/bootstrap) @@ -178,7 +177,7 @@ Get updates on Bootstrap's development and chat with the project maintainers and - Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap). - Read and subscribe to [The Official Bootstrap Blog](https://blog.getbootstrap.com/). -- Join [the official Slack room](https://bootstrap-slack.herokuapp.com/). +- Ask and explore [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions). - Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel. - Implementation help may be found at Stack Overflow (tagged [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5)). - Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability. diff --git a/config.yml b/config.yml index 577180957722..744c9f095be8 100644 --- a/config.yml +++ b/config.yml @@ -60,7 +60,6 @@ params: github_org: "https://github.com/twbs" repo: "https://github.com/twbs/bootstrap" twitter: "getbootstrap" - slack: "https://bootstrap-slack.herokuapp.com/" opencollective: "https://opencollective.com/bootstrap" blog: "https://blog.getbootstrap.com/" themes: "https://themes.getbootstrap.com/" diff --git a/site/content/docs/5.2/getting-started/best-practices.md b/site/content/docs/5.2/getting-started/best-practices.md index e17fc1290a4d..446c54e98ac6 100644 --- a/site/content/docs/5.2/getting-started/best-practices.md +++ b/site/content/docs/5.2/getting-started/best-practices.md @@ -17,4 +17,4 @@ We've designed and developed Bootstrap to work in a number of environments. Here - Working with Sass files - Building new CSS components - Working with flexbox -- Ask in [Slack](https://bootstrap-slack.herokuapp.com/) +- Ask in [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions). diff --git a/site/content/docs/5.2/getting-started/introduction.md b/site/content/docs/5.2/getting-started/introduction.md index 4eaf5d6f8a93..0167427fc34c 100644 --- a/site/content/docs/5.2/getting-started/introduction.md +++ b/site/content/docs/5.2/getting-started/introduction.md @@ -154,7 +154,7 @@ For improved cross-browser rendering, we use [Reboot]({{< docsref "/content/rebo Stay up to date on the development of Bootstrap and reach out to the community with these helpful resources. - Read and subscribe to [The Official Bootstrap Blog]({{< param blog >}}). -- Join [the official Slack room]({{< param slack >}}). +- Ask and explore [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions). - Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel. - Implementation help may be found at Stack Overflow (tagged [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5)). - Developers should use the keyword `bootstrap` on packages that modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/search?q=keywords:bootstrap) or similar delivery mechanisms for maximum discoverability. diff --git a/site/layouts/partials/docs-navbar.html b/site/layouts/partials/docs-navbar.html index e4f6eaaa7df8..1b9a45ff7fe3 100644 --- a/site/layouts/partials/docs-navbar.html +++ b/site/layouts/partials/docs-navbar.html @@ -64,12 +64,6 @@
Bootstrap
Twitter -
  • - - {{ partial "icons/slack.svg" (dict "class" "navbar-nav-svg" "width" "16" "height" "16") }} - Slack - -
  • {{ partial "icons/opencollective.svg" (dict "class" "navbar-nav-svg" "width" "16" "height" "16") }} diff --git a/site/layouts/partials/footer.html b/site/layouts/partials/footer.html index 78febb2048b8..336032ab1f80 100644 --- a/site/layouts/partials/footer.html +++ b/site/layouts/partials/footer.html @@ -51,7 +51,6 @@
    Community
  • Discussions
  • Corporate sponsors
  • Open Collective
    • -
  • Slack
  • Stack Overflow
    • diff --git a/site/layouts/partials/icons/slack.svg b/site/layouts/partials/icons/slack.svg deleted file mode 100644 index e3c995cc710a..000000000000 --- a/site/layouts/partials/icons/slack.svg +++ /dev/null @@ -1 +0,0 @@ -{{ with .title }}{{ . }}{{ else }}Slack{{ end }} \ No newline at end of file From 9a8791e7eae8aacb4c3d462f6bc29b95126e370e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 25 Jul 2022 15:07:51 -0700 Subject: [PATCH 2/2] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Julien Déramond --- .github/CONTRIBUTING.md | 2 +- site/content/docs/5.2/getting-started/best-practices.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2b9522d0c124..c7211e689a37 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -18,7 +18,7 @@ the preferred channel for [bug reports](#bug-reports), [features requests](#feat and [submitting pull requests](#pull-requests), but please respect the following restrictions: -* Please **do not** use the issue tracker for personal support requests. Stack Overflow ([`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag), [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions). or [IRC](/README.md#community) are better places to get help. +* Please **do not** use the issue tracker for personal support requests. Stack Overflow ([`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag), [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions) or [IRC](/README.md#community) are better places to get help. * Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others. diff --git a/site/content/docs/5.2/getting-started/best-practices.md b/site/content/docs/5.2/getting-started/best-practices.md index 446c54e98ac6..449d02a85a98 100644 --- a/site/content/docs/5.2/getting-started/best-practices.md +++ b/site/content/docs/5.2/getting-started/best-practices.md @@ -17,4 +17,4 @@ We've designed and developed Bootstrap to work in a number of environments. Here - Working with Sass files - Building new CSS components - Working with flexbox -- Ask in [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions). +- Ask in [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions)