diff --git a/.editorconfig b/.editorconfig index c193ae0715..9d5248e86f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,6 +12,3 @@ trim_trailing_whitespace = true [*.md] trim_trailing_whitespace = false - -[*.py] -indent_size = 4 diff --git a/README.md b/README.md index 37e1d86929..0a79e97330 100644 --- a/README.md +++ b/README.md @@ -38,11 +38,11 @@ Several quick start options are available: -- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.0.0-beta.zip) +- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.0.0-beta.2.zip) - Clone the repo: `git clone https://github.com/twbs/bootstrap.git` -- Install with [npm](https://www.npmjs.com/): `npm install bootstrap@4.0.0-beta` -- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@4.0.0-beta` -- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:4.0.0-beta` +- Install with [npm](https://www.npmjs.com/): `npm install bootstrap@4.0.0-beta.2` +- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@4.0.0-beta.2` +- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:4.0.0-beta.2` - Install with [NuGet](https://www.nuget.org/): CSS: `Install-Package bootstrap -Pre` Sass: `Install-Package bootstrap.sass -Pre` (`-Pre` is only required until Bootstrap v4 has a stable release). Read the [Getting started page](https://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more. @@ -109,7 +109,7 @@ Documentation search is powered by [Algolia's DocSearch](https://community.algol 2. Run `npm install` to install Node.js dependencies. 3. Run `npm run test` (or a specific NPM script) to rebuild distributed CSS and JavaScript files, as well as our docs assets. 4. From the root `/bootstrap` directory, run `npm run docs-serve` in the command line. -5. Open in your browser, and voilà. +5. Open `http://localhost:9001` in your browser, and voilà. Learn more about using Jekyll by reading its [documentation](https://jekyllrb.com/docs/home/). diff --git a/_config.yml b/_config.yml index b056a7b052..074ec2da44 100644 --- a/_config.yml +++ b/_config.yml @@ -49,25 +49,26 @@ social_image_path: /assets/brand/bootstrap-social.png social_logo_path: /assets/brand/bootstrap-social-logo.png # Custom variables -current_version: 4.0.0-beta -docs_version: 4.0 -repo: "https://github.com/twbs/bootstrap" -slack: "https://bootstrap-slack.herokuapp.com" -blog: "https://blog.getbootstrap.com" -expo: "https://expo.getbootstrap.com" -jobs: "https://jobs.getbootstrap.com" -themes: "https://themes.getbootstrap.com" +current_version: 4.0.0-beta.2 +current_ruby_version: 4.0.0.beta2 +docs_version: 4.0 +repo: "https://github.com/twbs/bootstrap" +slack: "https://bootstrap-slack.herokuapp.com" +blog: "https://blog.getbootstrap.com" +expo: "https://expo.getbootstrap.com" +jobs: "https://jobs.getbootstrap.com" +themes: "https://themes.getbootstrap.com" download: - source: "https://github.com/twbs/bootstrap/archive/v4.0.0-beta.zip" - dist: "https://github.com/twbs/bootstrap/releases/download/v4.0.0-beta/bootstrap-4.0.0-beta-dist.zip" + source: "https://github.com/twbs/bootstrap/archive/v4.0.0-beta.2.zip" + dist: "https://github.com/twbs/bootstrap/releases/download/v4.0.0-beta.2/bootstrap-4.0.0-beta.2-dist.zip" cdn: # See https://www.srihash.org for info on how to generate the hashes - css: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" - css_hash: "sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" - js: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" - js_hash: "sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" + css: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/css/bootstrap.min.css" + css_hash: "sha384-PsH8R72JQ3SOdhVi3uxftmaW6Vc51MKb0q5P2rRUpPvrszuE4W1povHYgTpBfshb" + js: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.2/js/bootstrap.min.js" + js_hash: "sha384-alpBpkh1PFOepccYVYDB4do5UnbKysX5WZXm3XxPqe5iKTfUKjNkCk9SaVuEZflJ" jquery: "https://code.jquery.com/jquery-3.2.1.slim.min.js" jquery_hash: "sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js" diff --git a/_data/showcase.yml b/_data/showcase.yml deleted file mode 100644 index 2643e1ed0e..0000000000 --- a/_data/showcase.yml +++ /dev/null @@ -1,19 +0,0 @@ -- name: Lyft - url: https://www.lyft.com - expo_url: https://expo.getbootstrap.com/2014/10/29/lyft/ - img: lyft - -- name: Vogue - url: http://www.vogue.com - expo_url: https://expo.getbootstrap.com/2014/09/30/vogue/ - img: vogue - -- name: Riot Design - url: https://riot.design/en/ - expo_url: https://expo.getbootstrap.com/2014/03/13/riot-design/ - img: riot - -- name: Newsweek - url: http://www.newsweek.com/ - expo_url: https://expo.getbootstrap.com/2014/02/12/newsweek/ - img: newsweek diff --git a/_data/translations.yml b/_data/translations.yml index 3681ddf560..4b30427945 100644 --- a/_data/translations.yml +++ b/_data/translations.yml @@ -11,4 +11,4 @@ - name: Brazilian Portuguese code: pt-BR description: Bootstrap 4 Português do Brasil - url: https://bootstrapbrasil.github.io/v4/ + url: http://getbootstrap.com.br/v4/ diff --git a/_includes/docs-navbar.html b/_includes/docs-navbar.html index ecedf7c4d6..4f3e68738d 100644 --- a/_includes/docs-navbar.html +++ b/_includes/docs-navbar.html @@ -37,7 +37,7 @@
Latest (4.x) v4 Alpha 6 - v3.3.7 + v3.3.7 v2.3.2
diff --git a/_includes/docs-sidebar.html b/_includes/docs-sidebar.html index 24c1a8b2aa..34a5989a4b 100644 --- a/_includes/docs-sidebar.html +++ b/_includes/docs-sidebar.html @@ -36,7 +36,7 @@ {{ doc.title }} - {% comment %} + {%- comment -%} {% unless doc.sections == nil %} {% endunless %} - {% endcomment %} + {%- endcomment -%} {%- endfor -%} diff --git a/_includes/header.html b/_includes/header.html index 048867bddf..50606564da 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,20 +1,22 @@ + + {%- if page.title -%} - {{ page.title }} · {{ site.title }} + {{ page.title }} · {{ site.title }} {%- else -%} - {{ site.title }} · {{ site.description }} + {{ site.title }} · {{ site.description }} {%- endif -%} {% if site.github %} - + {% else %} - + {% endif %} diff --git a/_includes/scripts.html b/_includes/scripts.html index 0af5f5c695..98ba3b41ff 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -3,25 +3,25 @@ -{% if site.github %} +{%- if site.github -%} -{% else %} +{%- else -%} -{% endif %} +{%- endif -%} -{% if site.github %} +{%- if site.github -%} -{% else %} +{%- else -%} -{% endif %} +{%- endif -%} -{% if page.layout == "docs" %} +{%- if page.layout == "docs" -%} -{% endif %} +{%- endif -%}