From bc4272531b8aae5f5d3a005ec3fd101f570463d8 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 24 Nov 2020 21:05:11 +0200 Subject: [PATCH] Revert v5.getbootstrap.com changes --- README.md | 12 ++++++------ config.yml | 2 +- site/assets/js/search.js | 2 +- site/data/docs-versions.yml | 2 +- site/layouts/robots.txt | 4 +++- site/static/CNAME | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index ceefe97dd7..8a470260a5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

- - Bootstrap logo + + Bootstrap logo

@@ -9,7 +9,7 @@

Sleek, intuitive, and powerful front-end framework for faster and easier web development.
- Explore Bootstrap docs » + Explore Bootstrap docs »

Report bug @@ -53,7 +53,7 @@ Several quick start options are available: - Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:5.0.0-beta1` - Install with [NuGet](https://www.nuget.org/): CSS: `Install-Package bootstrap` Sass: `Install-Package bootstrap.sass` -Read the [Getting started page](https://v5.getbootstrap.com/docs/5.0/getting-started/introduction/) for information on the framework contents, templates and examples, and more. +Read the [Getting started page](https://getbootstrap.com/docs/5.0/getting-started/introduction/) for information on the framework contents, templates and examples, and more. ## Status @@ -141,7 +141,7 @@ Have a bug or a feature request? Please first read the [issue guidelines](https: ## Documentation -Bootstrap's documentation, included in this repo in the root directory, is built with [Hugo](https://gohugo.io/) and publicly hosted on GitHub Pages at . The docs may also be run locally. +Bootstrap's documentation, included in this repo in the root directory, is built with [Hugo](https://gohugo.io/) and publicly hosted on GitHub Pages at . The docs may also be run locally. Documentation search is powered by [Algolia's DocSearch](https://community.algolia.com/docsearch/). Working on our search? Be sure to set `debug: true` in `site/assets/js/search.js`. @@ -156,7 +156,7 @@ Learn more about using Hugo by reading its [documentation](https://gohugo.io/doc ### Documentation for previous releases -You can find all our previous releases docs on . +You can find all our previous releases docs on . [Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download. diff --git a/config.yml b/config.yml index 504d33350a..5ec8d73651 100644 --- a/config.yml +++ b/config.yml @@ -1,6 +1,6 @@ languageCode: "en" title: "Bootstrap" -baseURL: "https://v5.getbootstrap.com" +baseURL: "https://getbootstrap.com" enableInlineShortcodes: true markup: diff --git a/site/assets/js/search.js b/site/assets/js/search.js index e198eddb32..d88263d3f3 100644 --- a/site/assets/js/search.js +++ b/site/assets/js/search.js @@ -29,7 +29,7 @@ }, transformData: function (hits) { return hits.map(function (hit) { - var liveUrl = 'https://v5.getbootstrap.com/' + var liveUrl = 'https://getbootstrap.com/' hit.url = window.location.origin.startsWith(liveUrl) ? // On production, return the result as is diff --git a/site/data/docs-versions.yml b/site/data/docs-versions.yml index c10c7c8fb8..5ddde79a02 100644 --- a/site/data/docs-versions.yml +++ b/site/data/docs-versions.yml @@ -46,7 +46,7 @@ - v: "4.5" - group: v5.x - baseurl: "https://v5.getbootstrap.com/docs" + baseurl: "https://getbootstrap.com/docs" description: "Current major release. Last update was v5.0.0-beta1." versions: - v: "5.0" diff --git a/site/layouts/robots.txt b/site/layouts/robots.txt index 79dddec829..271b4f1b7b 100644 --- a/site/layouts/robots.txt +++ b/site/layouts/robots.txt @@ -1,6 +1,8 @@ # www.robotstxt.org -{{- $allowCrawling := false -}} +{{- $isProduction := eq hugo.Environment "production" -}} +{{- $isNetlify := eq (getenv "NETLIFY") "true" -}} +{{- $allowCrawling := and (not $isNetlify) $isProduction -}} {{ if $allowCrawling }} # Allow crawling of all content diff --git a/site/static/CNAME b/site/static/CNAME index cc5f2f034a..52c853392c 100644 --- a/site/static/CNAME +++ b/site/static/CNAME @@ -1 +1 @@ -v5.getbootstrap.com +getbootstrap.com