Skip to content

Commit

Permalink
Merge Bootstrap v4.1 do repositório oficial
Browse files Browse the repository at this point in the history
  • Loading branch information
adammacias committed Apr 12, 2018
2 parents 7eb9a37 + c3caf7e commit bb1e143
Show file tree
Hide file tree
Showing 284 changed files with 43,445 additions and 10,112 deletions.
10 changes: 5 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ restrictions:
respect the opinions of others.

* Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments)
Use [GitHub's "reactions" feature](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
instead. We reserve the right to delete comments which violate this rule.

* Please **do not** open issues regarding the official themes offered on <https://themes.getbootstrap.com/>.
Expand Down Expand Up @@ -105,8 +105,8 @@ When feasible, we aim to report such upstream bugs to the relevant browser vendo
| Vendor(s) | Browser(s) | Rendering engine | Bug reporting website(s) | Notes |
| ------------- | ---------------------------- | ---------------- | ------------------------------------------------------------------------------------- | -------------------------------------------------------- |
| Mozilla | Firefox | Gecko | https://bugzilla.mozilla.org/enter_bug.cgi | "Core" is normally the right product option to choose. |
| Apple | Safari | WebKit | https://bugs.webkit.org/enter_bug.cgi?product=WebKit <br> https://bugreport.apple.com | In Apple's bug reporter, choose "Safari" as the product. |
| Google, Opera | Chrome, Chromium, Opera v15+ | Blink | https://code.google.com/p/chromium/issues/list | Click the "New issue" button. |
| Apple | Safari | WebKit | https://bugs.webkit.org/enter_bug.cgi?product=WebKit <br> https://bugreport.apple.com/ | In Apple's bug reporter, choose "Safari" as the product. |
| Google, Opera | Chrome, Chromium, Opera v15+ | Blink | https://bugs.chromium.org/p/chromium/issues/list | Click the "New issue" button. |
| Microsoft | Edge | EdgeHTML | https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/ | |

### Issues bots
Expand Down Expand Up @@ -178,7 +178,7 @@ included in the project:
```

4. Commit your changes in logical chunks. Please adhere to these [git commit
message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
message guidelines](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
or your code is unlikely be merged into the main project. Use Git's
[interactive rebase](https://help.github.com/articles/about-git-rebase/)
feature to tidy up your commits before making them public.
Expand Down Expand Up @@ -229,7 +229,7 @@ includes code changes) and under the terms of the
[Adhere to the Code Guide.](http://codeguide.co/#css)

- When feasible, default color palettes should comply with [WCAG color contrast guidelines](https://www.w3.org/TR/WCAG20/#visual-audio-contrast).
- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](http://a11yproject.com/posts/never-remove-css-outlines/) for more details.
- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](https://a11yproject.com/posts/never-remove-css-outlines/) for more details.
### JS
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ twbsconfig.yml

# Folders to ignore
node_modules
js/coverage
7 changes: 5 additions & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,8 @@ determinadas por outros membros da liderança do projeto.

## Atribuição

Este Código de Conduta é adaptado do [Contributor Covenant](https://www.contributor-covenant.org),
versão 1.4, disponível em https://www.contributor-covenant.org/pt-br/version/1/4/code-of-conduct.html
Este Código de Conduta é adaptado do [Contributor Covenant][homepage],
versão 1.4, disponível em [https://www.contributor-covenant.org/pt-br/version/1/4/code-of-conduct.html][version]

[homepage]: https://www.contributor-covenant.org/
[version]: https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ GEM
http_parser.rb (~> 0.6.0)
eventmachine (1.2.5)
eventmachine (1.2.5-x64-mingw32)
ffi (1.9.18)
ffi (1.9.18-x64-mingw32)
ffi (1.9.23)
ffi (1.9.23-x64-mingw32)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (0.9.3)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.7.2)
jekyll (3.7.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
Expand Down Expand Up @@ -53,14 +53,14 @@ GEM
mini_portile2 (~> 2.3.0)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (3.0.1)
rb-fsevent (0.10.2)
public_suffix (3.0.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (3.1.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.5.5)
sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand Down
18 changes: 11 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,13 @@
<a href="https://getbootstrap.com/docs/4.0/"><strong>Explore Bootstrap docs »</strong></a>
<br>
<br>
<a href="https://themes.getbootstrap.com/">Bootstrap Themes</a>
<a href="https://github.com/twbs/bootstrap/issues/new?template=bug.md">Report bug</a>
·
<a href="https://jobs.getbootstrap.com/">Job Board</a>
<a href="https://github.com/twbs/bootstrap/issues/new?template=feature.md&labels=feature">Request feature</a>
·
<a href="https://themes.getbootstrap.com/">Themes</a>
·
<a href="https://jobs.getbootstrap.com/">Jobs</a>
·
<a href="https://blog.getbootstrap.com/">Blog</a>
</p>
Expand All @@ -38,11 +42,11 @@

Several quick start options are available:

- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.0.0.zip)
- [Download the latest release.](https://github.com/twbs/bootstrap/archive/v4.1.0.zip)
- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`
- Install with [npm](https://www.npmjs.com/): `npm install bootstrap`
- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@4.0.0`
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:4.0.0`
- Install with [yarn](https://yarnpkg.com/): `yarn add bootstrap@4.1.0`
- Install with [Composer](https://getcomposer.org/): `composer require twbs/bootstrap:4.1.0`
- Install with [NuGet](https://www.nuget.org/): CSS: `Install-Package bootstrap` Sass: `Install-Package bootstrap.sass`

Read the [Getting started page](https://getbootstrap.com/docs/4.0/getting-started/introduction/) for information on the framework contents, templates and examples, and more.
Expand Down Expand Up @@ -101,7 +105,7 @@ Have a bug or a feature request? Please first read the [issue guidelines](https:

Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](https://jekyllrb.com/) and publicly hosted on GitHub Pages at <https://getbootstrap.com/>. 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 the `_scripts.html` include.
Documentation search is powered by [Algolia's DocSearch](https://community.algolia.com/docsearch/). Working on our search? Be sure to set `debug: true` in `assets/js/application.js` file.

### Running documentation locally

Expand Down Expand Up @@ -144,7 +148,7 @@ Get updates on Bootstrap's development and chat with the project maintainers and

## Versioning

For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under [the Semantic Versioning guidelines](http://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible.
For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under [the Semantic Versioning guidelines](https://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible.

See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap. Release announcement posts on [the official Bootstrap blog](https://blog.getbootstrap.com/) contain summaries of the most noteworthy changes made in each release.

Expand Down
22 changes: 11 additions & 11 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ social_image_path: /assets/brand/bootstrap-social.png
social_logo_path: /assets/brand/bootstrap-social-logo.png

# Custom variables
current_version: 4.0.0
current_ruby_version: 4.0.0
docs_version: 4.0
current_version: 4.1.0
current_ruby_version: 4.1.0
docs_version: 4.1
repo: "https://github.com/bootstrapbrasil/bootstrap"
slack: "http://bootstrapbrasil-slack.herokuapp.com"
blog: "http://blog.getbootstrap.com.br"
Expand All @@ -62,19 +62,19 @@ jobs: "https://github.com/frontendbr/vagas"
themes: "https://themes.getbootstrap.com"

download:
source: "https://github.com/twbs/bootstrap/archive/v4.0.0.zip"
dist: "https://github.com/twbs/bootstrap/releases/download/v4.0.0/bootstrap-4.0.0-dist.zip"
source: "https://github.com/twbs/bootstrap/archive/v4.1.0.zip"
dist: "https://github.com/twbs/bootstrap/releases/download/v4.1.0/bootstrap-4.1.0-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/css/bootstrap.min.css"
css_hash: "sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
js: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
js_hash: "sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
css: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/css/bootstrap.min.css"
css_hash: "sha384-9gVQ4dYFwwWSjIDZnLEWnxCjeSWFphJiwGPXr1jddIhOegiu1FwO5qRGvFXOdJZ4"
js: "https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js"
js_hash: "sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm"
jquery: "https://code.jquery.com/jquery-3.3.1.slim.min.js"
jquery_hash: "sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
popper_hash: "sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
popper: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"
popper_hash: "sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"

toc:
min_level: 2
Expand Down
110 changes: 54 additions & 56 deletions _data/nav.yml
Original file line number Diff line number Diff line change
@@ -1,88 +1,86 @@
- title: Ponto de partida
- title: Getting started
pages:
- title: Introdução
- title: Introduction
- title: Download
- title: Conteúdo
- title: Navegadores & dispositivos
- title: Contents
- title: Browsers & devices
- title: JavaScript
- title: Customização de tema
- title: Ferramentas de Build
# - title: Boas práticas # TODO: Write this content
- title: Theming
- title: Build tools
# - title: Best practices # TODO: Write this content
- title: Webpack
- title: Acessibilidade
- title: Accessibility

- title: Layout
slug: Layout
pages:
- title: Visão geral
- title: Overview
- title: Grid
- title: Objeto de mídia
- title: Utilitários de layout
- title: Media object
- title: Utilities for layout

- title: Conteúdo
- title: Content
pages:
- title: Reinicialização
- title: Tipografia
- title: Código
- title: Imagens
- title: Tabelas
- title: Figuras
- title: Reboot
- title: Typography
- title: Code
- title: Images
- title: Tables
- title: Figures

- title: Componentes
- title: Components
pages:
- title: Alertas
- title: Badges (Indicadores)
- title: Breadcrumb (Rastro de navegação)
- title: Botões
- title: Grupo de botões
- title: Cartão
- title: Alerts
- title: Badge
- title: Breadcrumb
- title: Buttons
- title: Button group
- title: Card
- title: Carousel
slug: Carousel
- title: Collapse
slug: Collapse
- title: Dropdowns
- title: Formulários
- title: Grupo de inputs (Campos)
- title: Jumbotron (Telão)
- title: Lista em grupos
- title: Forms
- title: Input group
- title: Jumbotron
- title: List group
- title: Modal
- title: Navegações
- title: Barra de navegação
- title: Páginação
- title: Navs
- title: Navbar
- title: Pagination
- title: Popovers
- title: Barra de Progresso
- title: Progress
- title: Scrollspy
- title: Tooltips

- title: Utilities
pages:
- title: Bordas
- title: Borders
- title: Clearfix
- title: Ícone de fechar
- title: Cores
- title: Close icon
- title: Colors
- title: Display
- title: Embed
- title: Flex
- title: Float (Flutuar)
- title: Substituição de imagem
- title: Posicionamentos
- title: Leitores de telas
- title: Tamanhos
- title: Espaçamentos
- title: Texto
- title: Alinhamento vertical
- title: Visibilidade
- title: Float
- title: Image replacement
- title: Position
- title: Screenreaders
- title: Shadows
- title: Sizing
- title: Spacing
- title: Text
- title: Vertical align
- title: Visibility

- title: Extendendo
- title: Extend
pages:
- title: Abordagem
- title: Ícones
- title: Approach
- title: Icons

- title: Migração
- title: Migration

- title: About
pages:
- title: Visão geral
- title: Manual de identidade visual
- title: Licença
- title: Traduções
- title: Overview
- title: Brand
- title: License
- title: Translations
4 changes: 2 additions & 2 deletions _data/translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
- name: Chinese
code: zh
description: Bootstrap 4 · 全球最流行的 HTML、CSS 和 JS 工具库。
url: http://code.z01.com/v4
url: https://code.z01.com/v4

- name: Chinese
code: zh
description: Bootstrap 4 中文文档教程
url: http://wiki.jikexueyuan.com/project/bootstrap4/
url: https://wiki.jikexueyuan.com/project/bootstrap4/

- name: Brazilian Portuguese
code: pt-BR
Expand Down
42 changes: 42 additions & 0 deletions _includes/bugify.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{%- comment -%}
Usage: {% include bugify.html content=text %},
where content is a string that contains a bug reference name and id.
e.g. Bootstrap#19984
{%- endcomment -%}

{%- assign words = include.content | split: " " -%}

{%- for word in words -%}
{% if word contains "#" %}
{% if word contains "," %}{% assign separator = true %}{% else %}{% assign separator = false %}{% endif %}
{%- assign data = word | split: "#" -%}
{%- assign bug_cat = data[0] | strip_newlines -%}
{%- assign bug_id = data[1] | strip_newlines | remove: "," -%}

{%- case bug_cat -%}
{%- when "Bootstrap" -%}
<a href="https://github.com/twbs/bootstrap/issues/{{ bug_id }}">#{{ bug_id }}</a>
{%- when "Edge" -%}
<a href="https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/{{ bug_id }}">Edge issue #{{ bug_id }}</a>
{%- when "A11yUserVoice" -%}
<a href="https://microsoftaccessibility.uservoice.com/forums/307429-microsoft-accessibility-feedback/suggestions/{{ bug_id }}">Microsoft A11y UserVoice idea #{{ bug_id }}</a>
{%- when "UserVoice" -%}
<a href="https://wpdev.uservoice.com/forums/257854-microsoft-edge-developer/suggestions/{{ bug_id }}">Edge UserVoice idea #{{ bug_id }}</a>
{%- when "Mozilla" -%}
<a href="https://bugzilla.mozilla.org/show_bug.cgi?id={{ bug_id }}">Mozilla bug #{{ bug_id }}</a>
{%- when "Chromium" -%}
<a href="https://bugs.chromium.org/p/chromium/issues/detail?id={{ bug_id }}">Chromium issue #{{ bug_id }}</a>
{%- when "WebKit" -%}
<a href="https://bugs.webkit.org/show_bug.cgi?id={{ bug_id }}">WebKit bug #{{ bug_id }}</a>
{%- when "Safari" -%}
<a href="https://openradar.appspot.com/{{ bug_id }}">Apple Safari Radar #{{ bug_id }}</a>
{%- when "Normalize" -%}
<a href="https://github.com/necolas/normalize.css/issues/{{ bug_id }}">Normalize #{{ bug_id }}</a>
{%- else -%}
<strong>parse error</strong>
{%- endcase -%}{% if separator %}, {% endif %}

{% else %}
{{ word }}
{%- endif -%}
{%- endfor -%}
5 changes: 3 additions & 2 deletions _includes/callout-danger-async-methods.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{% callout danger %}
{% capture callout %}
#### Asynchronous methods and transitions

All API methods are **asynchronous** and start a **transition**. They return to the caller as soon as the transition is started but **before it ends**. In addition, a method call on a **transitioning component will be ignored**.

[See our JavaScript documentation for more information.]({{ site.baseurl }}/docs/{{ site.docs_version }}/getting-started/javascript/)
{% endcallout %}
{% endcapture %}
{% include callout.html content=callout type="danger" %}
5 changes: 3 additions & 2 deletions _includes/callout-info-mediaqueries-breakpoints.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% callout info %}
{% capture callout %}
Note that since browsers do not currently support [range context queries](https://www.w3.org/TR/mediaqueries-4/#range-context), we work around the limitations of [`min-` and `max-` prefixes](https://www.w3.org/TR/mediaqueries-4/#mq-min-max) and viewports with fractional widths (which can occur under certain conditions on high-dpi devices, for instance) by using values with higher precision for these comparisons.
{% endcallout %}
{% endcapture %}
{% include callout.html content=callout type="info" %}
Loading

0 comments on commit bb1e143

Please sign in to comment.