diff options
author | Patrick H. Lauke <redux@splintered.co.uk> | 2022-07-27 10:37:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-27 10:37:36 +0300 |
commit | b40a2403321c2608eb7d6edbd31cd743ec5b35fc (patch) | |
tree | 6aafa2feac402954b2196bc1219f66f5d827facd | |
parent | f58d4dd546907fa31e7758cc3df924a4a21c348c (diff) | |
parent | 44c9c8df8d8e5be84d5bea47f8ee110b64e86e62 (diff) |
Merge branch 'main' into main-jd-fix-some-typosmain-jd-fix-some-typos
-rw-r--r-- | .github/CONTRIBUTING.md | 4 | ||||
-rw-r--r-- | .github/SUPPORT.md | 2 | ||||
-rw-r--r-- | README.md | 3 | ||||
-rw-r--r-- | config.yml | 6 | ||||
-rw-r--r-- | package-lock.json | 56 | ||||
-rw-r--r-- | package.json | 4 | ||||
-rw-r--r-- | scss/_pagination.scss | 2 | ||||
-rw-r--r-- | site/content/docs/5.2/components/offcanvas.md | 2 | ||||
-rw-r--r-- | site/content/docs/5.2/getting-started/best-practices.md | 2 | ||||
-rw-r--r-- | site/content/docs/5.2/getting-started/introduction.md | 2 | ||||
-rw-r--r-- | site/content/docs/5.2/getting-started/parcel.md | 1 | ||||
-rw-r--r-- | site/content/docs/5.2/getting-started/vite.md | 1 | ||||
-rw-r--r-- | site/content/docs/5.2/getting-started/webpack.md | 1 | ||||
-rw-r--r-- | site/content/docs/5.2/utilities/borders.md | 2 | ||||
-rw-r--r-- | site/layouts/partials/docs-navbar.html | 6 | ||||
-rw-r--r-- | site/layouts/partials/footer.html | 1 | ||||
-rw-r--r-- | site/layouts/partials/header.html | 2 | ||||
-rw-r--r-- | site/layouts/partials/icons/slack.svg | 1 | ||||
-rw-r--r-- | site/layouts/partials/social.html | 8 | ||||
-rw-r--r-- | site/static/docs/5.2/assets/brand/bootstrap-social.png | bin | 54961 -> 726245 bytes |
20 files changed, 49 insertions, 57 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 476fddb91b..c7211e689a 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 a4739f589a..26b3be42c5 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. @@ -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 5771809577..bb71b8d0ca 100644 --- a/config.yml +++ b/config.yml @@ -48,10 +48,9 @@ module: target: static/favicon.ico params: - description: "The most popular HTML, CSS, and JS library in the world." + subtitle: "The most popular HTML, CSS, and JS library in the world." + description: "Powerful, extensible, and feature-packed frontend toolkit. Build and customize with Sass, utilize prebuilt grid system and components, and bring projects to life with powerful JavaScript plugins." authors: "Mark Otto, Jacob Thornton, and Bootstrap contributors" - social_image_path: /docs/5.2/assets/brand/bootstrap-social.png - social_logo_path: /docs/5.2/assets/brand/bootstrap-social-logo.png current_version: "5.2.0" current_ruby_version: "5.2.0" @@ -60,7 +59,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/package-lock.json b/package-lock.json index 1fb0cca840..efba73ea46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "karma-jasmine": "^5.1.0", "karma-jasmine-html-reporter": "^2.0.0", "karma-rollup-preprocessor": "7.0.7", - "lockfile-lint": "^4.7.6", + "lockfile-lint": "^4.7.7", "nodemon": "^2.0.19", "npm-run-all": "^4.1.5", "postcss": "^8.4.14", @@ -59,7 +59,7 @@ "rollup": "^2.77.0", "rollup-plugin-istanbul": "^3.0.0", "rtlcss": "^3.5.0", - "sass": "^1.53.0", + "sass": "^1.54.0", "shelljs": "^0.8.5", "stylelint": "^14.9.1", "stylelint-config-twbs-bootstrap": "^5.0.0", @@ -2102,9 +2102,9 @@ "dev": true }, "node_modules/@yarnpkg/parsers": { - "version": "3.0.0-rc.12", - "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.12.tgz", - "integrity": "sha512-LEijAfCE8dMhW+tRBz9EM3Ui53SX+E6Tsvzaf7opESDARK+2HAyX+M/w73oNTXCOgMRrfMVWP5wJTj9cG96uoQ==", + "version": "3.0.0-rc.14", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.14.tgz", + "integrity": "sha512-vLwjxSdmRNF/pPsubkmpkAgRHBbBylRDn13gv2fyTkHjeT2257NBNefjR7Dx5gSy8PM93VZitnmtWCnXEsSvkA==", "dev": true, "dependencies": { "js-yaml": "^3.10.0", @@ -6685,14 +6685,14 @@ } }, "node_modules/lockfile-lint": { - "version": "4.7.6", - "resolved": "https://registry.npmjs.org/lockfile-lint/-/lockfile-lint-4.7.6.tgz", - "integrity": "sha512-vk1EgNh+fkaFWvnrQ/wDMflbkBS0zHx/z0ZjbkMiYObR9rT29AhSHLH6cH52/QG7UqHqSCa64uu8j/nXYubmkQ==", + "version": "4.7.7", + "resolved": "https://registry.npmjs.org/lockfile-lint/-/lockfile-lint-4.7.7.tgz", + "integrity": "sha512-JRB9ChNc9AtrC1sRmcSdYgCr7nVioth73Ssyq8tx3ZnBKuFymADFJDSK/aTFDt4OSdymr02lBtBNGvYs2CRFtg==", "dev": true, "dependencies": { "cosmiconfig": "^6.0.0", "debug": "^4.1.1", - "lockfile-lint-api": "^5.2.6", + "lockfile-lint-api": "^5.2.7", "yargs": "^16.0.0" }, "bin": { @@ -6703,9 +6703,9 @@ } }, "node_modules/lockfile-lint-api": { - "version": "5.2.6", - "resolved": "https://registry.npmjs.org/lockfile-lint-api/-/lockfile-lint-api-5.2.6.tgz", - "integrity": "sha512-FY9DRVKH83P5qMqepVlJDUCSstts/4mW0wpB+rC9yEHHyYn4hHaRBnCqaC9/Qk2JITIQlArrO/eBwoEOnSE84Q==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/lockfile-lint-api/-/lockfile-lint-api-5.2.7.tgz", + "integrity": "sha512-FVS5bI3xaK0fGtaogZw7q7sINqHoYASJyRdNyOHeq0NCbQZX6b3rBEdxjXjjJM+34oovh7hmdyT8UjHLnfzCnw==", "dev": true, "dependencies": { "@yarnpkg/parsers": "^3.0.0-rc.6", @@ -8895,9 +8895,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.53.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.53.0.tgz", - "integrity": "sha512-zb/oMirbKhUgRQ0/GFz8TSAwRq2IlR29vOUJZOx0l8sV+CkHUfHa4u5nqrG+1VceZp7Jfj59SVW9ogdhTvJDcQ==", + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.54.0.tgz", + "integrity": "sha512-C4zp79GCXZfK0yoHZg+GxF818/aclhp9F48XBu/+bm9vXEVAYov9iU3FBVRMq3Hx3OA4jfKL+p2K9180mEh0xQ==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -11916,9 +11916,9 @@ "dev": true }, "@yarnpkg/parsers": { - "version": "3.0.0-rc.12", - "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.12.tgz", - "integrity": "sha512-LEijAfCE8dMhW+tRBz9EM3Ui53SX+E6Tsvzaf7opESDARK+2HAyX+M/w73oNTXCOgMRrfMVWP5wJTj9cG96uoQ==", + "version": "3.0.0-rc.14", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.14.tgz", + "integrity": "sha512-vLwjxSdmRNF/pPsubkmpkAgRHBbBylRDn13gv2fyTkHjeT2257NBNefjR7Dx5gSy8PM93VZitnmtWCnXEsSvkA==", "dev": true, "requires": { "js-yaml": "^3.10.0", @@ -15388,21 +15388,21 @@ } }, "lockfile-lint": { - "version": "4.7.6", - "resolved": "https://registry.npmjs.org/lockfile-lint/-/lockfile-lint-4.7.6.tgz", - "integrity": "sha512-vk1EgNh+fkaFWvnrQ/wDMflbkBS0zHx/z0ZjbkMiYObR9rT29AhSHLH6cH52/QG7UqHqSCa64uu8j/nXYubmkQ==", + "version": "4.7.7", + "resolved": "https://registry.npmjs.org/lockfile-lint/-/lockfile-lint-4.7.7.tgz", + "integrity": "sha512-JRB9ChNc9AtrC1sRmcSdYgCr7nVioth73Ssyq8tx3ZnBKuFymADFJDSK/aTFDt4OSdymr02lBtBNGvYs2CRFtg==", "dev": true, "requires": { "cosmiconfig": "^6.0.0", "debug": "^4.1.1", - "lockfile-lint-api": "^5.2.6", + "lockfile-lint-api": "^5.2.7", "yargs": "^16.0.0" } }, "lockfile-lint-api": { - "version": "5.2.6", - "resolved": "https://registry.npmjs.org/lockfile-lint-api/-/lockfile-lint-api-5.2.6.tgz", - "integrity": "sha512-FY9DRVKH83P5qMqepVlJDUCSstts/4mW0wpB+rC9yEHHyYn4hHaRBnCqaC9/Qk2JITIQlArrO/eBwoEOnSE84Q==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/lockfile-lint-api/-/lockfile-lint-api-5.2.7.tgz", + "integrity": "sha512-FVS5bI3xaK0fGtaogZw7q7sINqHoYASJyRdNyOHeq0NCbQZX6b3rBEdxjXjjJM+34oovh7hmdyT8UjHLnfzCnw==", "dev": true, "requires": { "@yarnpkg/parsers": "^3.0.0-rc.6", @@ -16976,9 +16976,9 @@ "dev": true }, "sass": { - "version": "1.53.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.53.0.tgz", - "integrity": "sha512-zb/oMirbKhUgRQ0/GFz8TSAwRq2IlR29vOUJZOx0l8sV+CkHUfHa4u5nqrG+1VceZp7Jfj59SVW9ogdhTvJDcQ==", + "version": "1.54.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.54.0.tgz", + "integrity": "sha512-C4zp79GCXZfK0yoHZg+GxF818/aclhp9F48XBu/+bm9vXEVAYov9iU3FBVRMq3Hx3OA4jfKL+p2K9180mEh0xQ==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", diff --git a/package.json b/package.json index 3d0f59b929..8263ad3216 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ "karma-jasmine": "^5.1.0", "karma-jasmine-html-reporter": "^2.0.0", "karma-rollup-preprocessor": "7.0.7", - "lockfile-lint": "^4.7.6", + "lockfile-lint": "^4.7.7", "nodemon": "^2.0.19", "npm-run-all": "^4.1.5", "postcss": "^8.4.14", @@ -144,7 +144,7 @@ "rollup": "^2.77.0", "rollup-plugin-istanbul": "^3.0.0", "rtlcss": "^3.5.0", - "sass": "^1.53.0", + "sass": "^1.54.0", "shelljs": "^0.8.5", "stylelint": "^14.9.1", "stylelint-config-twbs-bootstrap": "^5.0.0", diff --git a/scss/_pagination.scss b/scss/_pagination.scss index e8e10a6d68..cf4db3c361 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -75,7 +75,7 @@ margin-left: $pagination-margin-start; } - @if $pagination-margin-start == (calc($pagination-border-width * -1)) { + @if $pagination-margin-start == ($pagination-border-width * -1) { &:first-child { .page-link { @include border-start-radius(var(--#{$prefix}pagination-border-radius)); diff --git a/site/content/docs/5.2/components/offcanvas.md b/site/content/docs/5.2/components/offcanvas.md index ffe69a8986..a7384f978b 100644 --- a/site/content/docs/5.2/components/offcanvas.md +++ b/site/content/docs/5.2/components/offcanvas.md @@ -81,6 +81,8 @@ You can use a link with the `href` attribute, or a button with the `data-bs-targ ### Dark offcanvas +{{< added-in "5.2.0" >}} + Change the appearance of offcanvases with utilities to better match them to different contexts like dark navbars. Here we add `.text-bg-dark` to the `.offcanvas` and `.btn-close-white` to `.btn-close` for proper styling with a dark offcanvas. If you have dropdowns within, consider also adding `.dropdown-menu-dark` to `.dropdown-menu`. {{< example class="bd-example-offcanvas p-0 bg-light overflow-hidden" >}} 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 e17fc1290a..449d02a85a 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 21e36886e1..579e04b2f4 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/content/docs/5.2/getting-started/parcel.md b/site/content/docs/5.2/getting-started/parcel.md index 674a39837b..d28f92384f 100644 --- a/site/content/docs/5.2/getting-started/parcel.md +++ b/site/content/docs/5.2/getting-started/parcel.md @@ -4,6 +4,7 @@ title: "Bootstrap & Parcel" description: The official guide for how to include and bundle Bootstrap's CSS and JavaScript in your project using Parcel. group: getting-started toc: true +thumbnail: guides/bootstrap-parcel@2x.png --- <img class="mb-4 img-fluid rounded-3" srcset="/docs/{{< param docs_version >}}/assets/img/guides/bootstrap-parcel.png, /docs/{{< param docs_version >}}/assets/img/guides/bootstrap-parcel@2x.png 2x" src="/docs/{{< param docs_version >}}/assets/img/guides/bootstrap-parcel.png" width="2000" height="1000" alt=""> diff --git a/site/content/docs/5.2/getting-started/vite.md b/site/content/docs/5.2/getting-started/vite.md index ca71bbe31d..ee08379a7c 100644 --- a/site/content/docs/5.2/getting-started/vite.md +++ b/site/content/docs/5.2/getting-started/vite.md @@ -4,6 +4,7 @@ title: "Bootstrap & Vite" description: The official guide for how to include and bundle Bootstrap's CSS and JavaScript in your project using Vite. group: getting-started toc: true +thumbnail: guides/bootstrap-vite@2x.png --- <img class="mb-4 img-fluid rounded-3" srcset="/docs/{{< param docs_version >}}/assets/img/guides/bootstrap-vite.png, /docs/{{< param docs_version >}}/assets/img/guides/bootstrap-vite@2x.png 2x" src="/docs/{{< param docs_version >}}/assets/img/guides/bootstrap-vite.png" width="2000" height="1000" alt=""> diff --git a/site/content/docs/5.2/getting-started/webpack.md b/site/content/docs/5.2/getting-started/webpack.md index e314ecf6a2..ca104f98c1 100644 --- a/site/content/docs/5.2/getting-started/webpack.md +++ b/site/content/docs/5.2/getting-started/webpack.md @@ -4,6 +4,7 @@ title: "Bootstrap & Webpack" description: The official guide for how to include and bundle Bootstrap's CSS and JavaScript in your project using Webpack. group: getting-started toc: true +thumbnail: guides/bootstrap-webpack@2x.png --- <img class="mb-4 img-fluid rounded-3" srcset="/docs/{{< param docs_version >}}/assets/img/guides/bootstrap-webpack.png, /docs/{{< param docs_version >}}/assets/img/guides/bootstrap-webpack@2x.png 2x" src="/docs/{{< param docs_version >}}/assets/img/guides/bootstrap-webpack.png" width="2000" height="1000" alt=""> diff --git a/site/content/docs/5.2/utilities/borders.md b/site/content/docs/5.2/utilities/borders.md index 64913bbc91..8d850a214b 100644 --- a/site/content/docs/5.2/utilities/borders.md +++ b/site/content/docs/5.2/utilities/borders.md @@ -143,6 +143,8 @@ Use the scaling classes for larger or smaller rounded corners. Sizes range from ### Variables +{{< added-in "5.2.0" >}} + {{< scss-docs name="root-border-var" file="scss/_root.scss" >}} ### Sass variables diff --git a/site/layouts/partials/docs-navbar.html b/site/layouts/partials/docs-navbar.html index e4f6eaaa7d..1b9a45ff7f 100644 --- a/site/layouts/partials/docs-navbar.html +++ b/site/layouts/partials/docs-navbar.html @@ -65,12 +65,6 @@ </a> </li> <li class="nav-item col-6 col-lg-auto"> - <a class="nav-link py-2 px-0 px-lg-2" href="{{ .Site.Params.slack }}" target="_blank" rel="noopener"> - {{ partial "icons/slack.svg" (dict "class" "navbar-nav-svg" "width" "16" "height" "16") }} - <small class="d-lg-none ms-2">Slack</small> - </a> - </li> - <li class="nav-item col-6 col-lg-auto"> <a class="nav-link py-2 px-0 px-lg-2" href="{{ .Site.Params.opencollective }}" target="_blank" rel="noopener"> {{ partial "icons/opencollective.svg" (dict "class" "navbar-nav-svg" "width" "16" "height" "16") }} <small class="d-lg-none ms-2">Open Collective</small> diff --git a/site/layouts/partials/footer.html b/site/layouts/partials/footer.html index 78febb2048..336032ab1f 100644 --- a/site/layouts/partials/footer.html +++ b/site/layouts/partials/footer.html @@ -51,7 +51,6 @@ <li class="mb-2"><a href="{{ .Site.Params.github_org }}/bootstrap/discussions">Discussions</a></li> <li class="mb-2"><a href="https://github.com/sponsors/twbs">Corporate sponsors</a></li> <li class="mb-2"><a href="{{ .Site.Params.opencollective }}">Open Collective</a></li> - <li class="mb-2"><a href="{{ .Site.Params.slack }}">Slack</a></li> <li class="mb-2"><a href="https://stackoverflow.com/questions/tagged/bootstrap-5">Stack Overflow</a></li> </ul> </div> diff --git a/site/layouts/partials/header.html b/site/layouts/partials/header.html index a592cdccb8..ceeb8b546d 100644 --- a/site/layouts/partials/header.html +++ b/site/layouts/partials/header.html @@ -7,7 +7,7 @@ <meta name="docsearch:language" content="en"> <meta name="docsearch:version" content="{{ .Site.Params.docs_version }}"> -<title>{{ if .IsHome }}{{ .Site.Title | markdownify }} · {{ .Site.Params.description | markdownify }}{{ else }}{{ .Title | markdownify }} · {{ .Site.Title | markdownify }} v{{ .Site.Params.docs_version }}{{ end }}</title> +<title>{{ if .IsHome }}{{ .Site.Title | markdownify }} · {{ .Site.Params.subtitle | markdownify }}{{ else }}{{ .Title | markdownify }} · {{ .Site.Title | markdownify }} v{{ .Site.Params.docs_version }}{{ end }}</title> <link rel="canonical" href="{{ .Permalink }}"> diff --git a/site/layouts/partials/icons/slack.svg b/site/layouts/partials/icons/slack.svg deleted file mode 100644 index e3c995cc71..0000000000 --- a/site/layouts/partials/icons/slack.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg"{{ with .width }} width="{{ . }}"{{ end }}{{ with .height }} height="{{ . }}"{{ end }}{{ with .class }} class="{{ . }}"{{ end }} viewBox="0 0 512 512" role="img"><title>{{ with .title }}{{ . }}{{ else }}Slack{{ end }}</title><path fill="currentColor" d="M210.787 234.832l68.31-22.883 22.1 65.977-68.309 22.882z"/><path fill="currentColor" d="M490.54 185.6C437.7 9.59 361.6-31.34 185.6 21.46S-31.3 150.4 21.46 326.4 150.4 543.3 326.4 490.54 543.34 361.6 490.54 185.6zM401.7 299.8l-33.15 11.05 11.46 34.38c4.5 13.92-2.87 29.06-16.78 33.56-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18l-11.46-34.38-68.36 22.92 11.46 34.38c4.5 13.92-2.87 29.06-16.78 33.56-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18l-11.46-34.43-33.15 11.05c-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18c-4.5-13.92 2.87-29.06 16.78-33.56l33.12-11.03-22.1-65.9-33.15 11.05c-2.87.82-6.14 1.64-9 1.23a27.32 27.32 0 0 1-24.56-18c-4.48-13.93 2.89-29.07 16.81-33.58l33.15-11.05-11.46-34.38c-4.5-13.92 2.87-29.06 16.78-33.56s29.06 2.87 33.56 16.78l11.46 34.38 68.36-22.92-11.46-34.38c-4.5-13.92 2.87-29.06 16.78-33.56s29.06 2.87 33.56 16.78l11.47 34.42 33.15-11.05c13.92-4.5 29.06 2.87 33.56 16.78s-2.87 29.06-16.78 33.56L329.7 194.6l22.1 65.9 33.15-11.05c13.92-4.5 29.06 2.87 33.56 16.78s-2.88 29.07-16.81 33.57z"/></svg>
\ No newline at end of file diff --git a/site/layouts/partials/social.html b/site/layouts/partials/social.html index a63f6caee8..2226c386c4 100644 --- a/site/layouts/partials/social.html +++ b/site/layouts/partials/social.html @@ -1,17 +1,15 @@ -{{ "<!-- Twitter -->" | safeHTML }} -<meta name="twitter:card" content="{{ if .IsHome }}summary_large_image{{ else }}summary{{ end }}"> +<meta name="twitter:card" content="summary_large_image"> <meta name="twitter:site" content="@{{ .Site.Params.twitter }}"> <meta name="twitter:creator" content="@{{ .Site.Params.twitter }}"> <meta name="twitter:title" content="{{ .Title | markdownify }}"> <meta name="twitter:description" content="{{ .Page.Params.description | default .Site.Params.description | markdownify }}"> -<meta name="twitter:image" content="{{ if .IsHome }}{{ .Site.Params.social_logo_path | absURL }}{{ else }}{{ .Site.Params.social_image_path | absURL }}{{ end }}"> +<meta name="twitter:image" content="/docs/{{ .Site.Params.docs_version }}/assets/{{ if .Page.Params.thumbnail }}img/{{ .Page.Params.thumbnail }}{{else}}brand/bootstrap-social.png{{end}}"> -{{ "<!-- Facebook -->" | safeHTML }} <meta property="og:url" content="{{ .Permalink }}"> <meta property="og:title" content="{{ .Title | markdownify }}"> <meta property="og:description" content="{{ .Page.Params.description | default .Site.Params.description | markdownify }}"> <meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}"> -<meta property="og:image" content="{{ .Site.Params.social_image_path | absURL }}"> <meta property="og:image:type" content="image/png"> <meta property="og:image:width" content="1000"> <meta property="og:image:height" content="500"> +<meta property="og:image" content="/docs/{{ .Site.Params.docs_version }}/assets/{{ if .Page.Params.thumbnail }}img/{{ .Page.Params.thumbnail }}{{else}}brand/bootstrap-social.png{{end}}"> diff --git a/site/static/docs/5.2/assets/brand/bootstrap-social.png b/site/static/docs/5.2/assets/brand/bootstrap-social.png Binary files differindex c7adc6f85b..f027ee8e6b 100644 --- a/site/static/docs/5.2/assets/brand/bootstrap-social.png +++ b/site/static/docs/5.2/assets/brand/bootstrap-social.png |