Skip to content

Commit

Permalink
Merge branch 'main' into v5-docs-sr-visibility
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickhlauke committed Jul 3, 2020
2 parents f0ff0df + dca5ad0 commit c58bed8
Show file tree
Hide file tree
Showing 14 changed files with 91 additions and 74 deletions.
2 changes: 1 addition & 1 deletion config.yml
Expand Up @@ -50,7 +50,7 @@ params:
current_version: "5.0.0-alpha1"
current_ruby_version: "5.0.0-alpha1"
docs_version: "5.0"
rfs_version: "9.0.2"
rfs_version: "9.0.3"
github_org: "https://github.com/twbs"
repo: "https://github.com/twbs/bootstrap"
twitter: "getbootstrap"
Expand Down
50 changes: 24 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Expand Up @@ -103,8 +103,8 @@
"clean-css-cli": "^4.3.0",
"cross-env": "^7.0.2",
"eslint": "^7.3.1",
"eslint-config-xo": "^0.31.0",
"eslint-plugin-import": "^2.21.2",
"eslint-config-xo": "^0.32.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-unicorn": "^20.1.0",
"find-unused-sass-variables": "^2.0.0",
"glob": "^7.1.6",
Expand All @@ -128,14 +128,14 @@
"npm-run-all": "^4.1.5",
"popper.js": "^1.16.0",
"postcss-cli": "^7.1.1",
"rollup": "^2.18.0",
"rollup": "^2.18.1",
"rollup-plugin-istanbul": "^2.0.1",
"shelljs": "^0.8.4",
"sirv-cli": "^1.0.1",
"sirv-cli": "^1.0.3",
"stylelint": "^13.6.1",
"stylelint-config-twbs-bootstrap": "^2.0.3",
"terser": "^4.8.0",
"vnu-jar": "20.5.29"
"vnu-jar": "20.6.30"
},
"files": [
"dist/{css,js}/*.{css,js,map}",
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.0/components/toasts.md
Expand Up @@ -100,7 +100,7 @@ When you have multiple toasts, we default to vertically stacking them in a reada

### Custom content

Customize your toasts by removing sub-components, tweaking with [utilities]({{< docsref "/utilities/api" >}}), or adding your own markup. Here we've created a simpler toast by removing the default `.toast-header`, adding a custom hide icon from [Bootstrap Icons](https://icons.getbootstrap.com), and using some [flexbox utilities]({{< docsref "/utilities/flex" >}}) to adjust the layout.
Customize your toasts by removing sub-components, tweaking with [utilities]({{< docsref "/utilities/api" >}}), or adding your own markup. Here we've created a simpler toast by removing the default `.toast-header`, adding a custom hide icon from [Bootstrap Icons]({{< param icons >}}), and using some [flexbox utilities]({{< docsref "/utilities/flex" >}}) to adjust the layout.

{{< example class="bg-light" >}}
<div class="toast d-flex" role="alert" aria-live="assertive" aria-atomic="true">
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.0/extend/icons.md
Expand Up @@ -15,7 +15,7 @@ Bootstrap Icons is a growing library of SVG icons that are designed by [@mdo](ht

Oh, and did we mention they're completely open source? Licensed under MIT, just like Bootstrap, our icon set is available to everyone.

[Learn more about Bootstrap Icons](https://icons.getbootstrap.com/), including how to install them and recommended usage.
[Learn more about Bootstrap Icons]({{< param icons >}}), including how to install them and recommended usage.

## Alternatives

Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.0/getting-started/rfs.md
Expand Up @@ -31,7 +31,7 @@ The `rfs()` mixin has shorthands for `font-size`, `margin`, `margin-top`, `margi
font-size: calc(1.525rem + 3.3vw);
}

@media (max-width: 1200px) {
@media (min-width: 1200px) {
.title {
font-size: 4rem;
}
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.0/layout/containers.md
@@ -1,7 +1,7 @@
---
layout: docs
title: Containers
description: Containers are a fundamental building block of Bootstrap that contain, pad, and align your content withing a given device or viewport.
description: Containers are a fundamental building block of Bootstrap that contain, pad, and align your content within a given device or viewport.
group: layout
toc: true
---
Expand Down
81 changes: 50 additions & 31 deletions site/content/docs/5.0/migration.md
Expand Up @@ -7,18 +7,35 @@ aliases: "/migration/"
toc: true
---

## Browser support
## v5.0.0-alpha2

### Components

#### Popovers

- Renamed `whiteList` option to `allowList`

#### Tooltips

- Renamed `whiteList` option to `allowList`

---

## v5.0.0-alpha1

### Browser support

See the browser and devices page for details on what is currently supported in Bootstrap 5. Since v4, here's what's changed to our browser support:

- Dropped support for Internet Explorer 10 and 11
- Dropped support for Firefox NN - MM
- Dropped support for Safari NN
- Dropped support for iOS Safari NN
- Dropped support for Chrome NN
- Dropped support for Android NN
- Dropped support for Microsoft Edge < 16
- Dropped support for Firefox < 60
- Dropped support for Safari < 10
- Dropped support for iOS Safari < 10
- Dropped support for Chrome < 60
- Dropped support for Android < 6

## Sass
### Sass

Changes to our source Sass files and compiled CSS.

Expand Down Expand Up @@ -51,22 +68,22 @@ Changes to our source Sass files and compiled CSS.
- The `media-breakpoint-down()` uses the breakpoint itself instead of the next breakpoint. Use `media-breakpoint-down(lg)` instead of `media-breakpoint-down(md)` to target viewports smaller than the `lg` breakpoint.
- The `media-breakpoint-between()` mixin's second parameter also uses the breakpoint itself instead of the next breakpoint. Use `media-between(sm, lg)` instead of `media-breakpoint-between(sm, md)` to target viewports between the `sm` and `lg` breakpoints.

## JavaScript
### JavaScript

Changes to our source and compiled JavaScript files.

- Dropped jQuery dependency and rewrote plugins to be in regular JavaScript.
- Removed underscore from public static methods like `_getInstance()``getInstance()`.

## Color system
### Color system

We've updated the color system that powers Bootstrap to improve color contrast and provide a much more extensive set of colors.

- Updated blue and pink base colors (`-500`) to ensure AA contrast.
- Updated blue and pink base colors (`-500`) to ensure WCAG 2.1 AA contrast.
- Added new tints and shades for every color, providing nine separate colors for each base color, as new Sass variables.
- To support our color system, we've added new custom `tint-color()` and `shade-color()` functions to mix our colors appropriately.

## Grid and layout
### Grid and layout

Changes to any layout tools and our grid system.

Expand All @@ -79,7 +96,7 @@ Changes to any layout tools and our grid system.
- The gutter width is now set in `rem` and decreased from `30px` to `1.5rem` (24px).
- `bootstrap-grid.css` now only applies `box-sizing: border-box` to the column instead of resetting the global box-sizing. This way the grid system can be used, even if `box-sizing: border-box` is not applied to each element.

## Content, Reboot, etc
### Content, Reboot, etc

Changes to Reboot, typography, tables, and more.

Expand All @@ -94,14 +111,14 @@ Changes to Reboot, typography, tables, and more.
- `.text-*` utilities do not add hover and focus states to links anymore. `.link-*` helper classes can be used instead. [See #29267](https://github.com/twbs/bootstrap/pull/29267)
- Drop `.text-justify` class. [See #229793](https://github.com/twbs/bootstrap/pull/29793)

## Typography
### Typography

- Removed `$display-*` variables for a new `$display-font-sizes` Sass map.
- Removed individual `$display-*-weight` variables for a single `$display-font-weight`.
- Added two new `.display-*` heading styles, `.display-5` and `.display-6`.
- Resized existing display headings for a slightly more consistent set of `font-size`s.

## Forms
### Forms

- Rearranged form documentation under its own top-level section.
- Split out old Forms page into several subpages
Expand All @@ -128,62 +145,60 @@ Changes to Reboot, typography, tables, and more.
- Dropped `.input-group-append` and `.input-group-prepend`. You can now just add buttons and `.input-group-text` as direct children of the input groups.
- Form labels now require the `.form-label` class. Sass variables are now available to style form labels to your needs. [See #30476](https://github.com/twbs/bootstrap/pull/30476)

## Components
### Components

- Unified `padding` values for alerts, breadcrumbs, cards, dropdowns, list groups, modals, popovers, and tooltips to be based on our `$spacer` variable. [See #30564](https://github.com/twbs/bootstrap/pull/30564).

### Disabled states
#### Disabled states

- Disabled states of the buttons, close button, pagination link & form range now have `pointer-events: none` added. This simplifies our codebase and makes it easier to override active states in CSS. [#29296](https://github.com/twbs/bootstrap/pull/29296).

### Alerts
#### Alerts

- **Todo:** Remove auto-darkening of `<hr>` elements in `.alert-*` class variants. `<hr>`s use `rgba()` for their color, so these should naturally blend anyway.

### Badges
#### Badges

Badges were overhauled to better differentiate themselves from buttons and to better utilize utility classes.

- **Todo:** Removed and replaced `.badge` modifier classes with background utility classes (e.g., use `.bg-primary` instead of `.badge-primary`)
- **Todo:** Removed `.badge-pill` for the `.rounded-pill` utility class
- **Todo:** Removed badge's hover and focus styles for `a.badge` and `button.badge`.

### Buttons
#### Buttons

- The checkbox/radio toggle is removed from the button plugin in favour of a CSS only solution, which is documented in the [form checks and radios]({{< docsref "/forms/checks-radios#toggle-buttons" >}}) docs. The `.btn-check` class can be added to inputs, any label with `.btn` and modifier class can be used to theme the labels. [See #30650](https://github.com/twbs/bootstrap/pull/30650).

### Cards
#### Cards

- Removed the card columns in favor of a Masonry grid [See #28922](https://github.com/twbs/bootstrap/pull/28922).
- Removed card decks in favor of the grid which adds more flexibility over responsive behavior.

### Jumbotron
#### Jumbotron

- The jumbotron component is removed in favor of utility classes like `.bg-light` for the background color and `.p-*` classes to control padding.

### Navbars
#### Navbars

- All navbars now require a container within. This drastically simplifies spacing requirements and removes the need for extensive CSS overrides we added for responsive containers in v4.

### Pagination
#### Pagination

- Pagination links now have customizable `margin-left` that are dynamically rounded on all corners when separated from one another.

### Popovers
#### Popovers

- Renamed `.arrow` to `.popover-arrow`
- Renamed `whiteList` option to `allowList`

### Tooltips
#### Tooltips

- Renamed `.arrow` to `.tooltip-arrow`
- Renamed `whiteList` option to `allowList`

## Accessibility
### Accessibility

- `.sr-only-focusable` does not require `.sr-only` anymore. [See #28720](https://github.com/twbs/bootstrap/pull/28720).

## Utilities
### Utilities

- Renamed `.text-monospace` to `.font-monospace`
- Decreased the number of responsive order utilities per breakpoint. The highest order utility with a number now is `.order-5` instead of `.order-12`. [See #28874](https://github.com/twbs/bootstrap/pull/28874).
Expand All @@ -193,8 +208,12 @@ Badges were overhauled to better differentiate themselves from buttons and to be
- **Todo:** Split utilities into property-value utility classes and helpers
- Negative margin utilities are disabled by default. You can re-enable them by setting `$enable-negative-margins: true`, but keep in mind this can increase the file size quite a lot.

## Docs
### Docs

- Removed "Wall of browser bugs" page because it has become obsolete
- Switched from Jekyll to Hugo

### Build tools

## Build tools
- Updated all devDependencies
- We support only the latest Node.js LTS releases which are 10 and 12 at the time of writing
4 changes: 2 additions & 2 deletions site/layouts/partials/home/masthead-followup.html
Expand Up @@ -36,8 +36,8 @@ <h2 class="display-5 font-weight-normal">BootstrapCDN</h2>
<link rel="stylesheet" href="%s" integrity=%q crossorigin="anonymous">`) .Site.Params.cdn.css (.Site.Params.cdn.css_hash | safeHTMLAttr)) "html" "" }}
{{ highlight (printf (`<!-- JavaScript and dependencies -->
<script src="%s" integrity=%q crossorigin="anonymous"></script>
<script src="%s" integrity=%q crossorigin="anonymous"></script>
`) .Site.Params.cdn.popper (.Site.Params.cdn.popper_hash | safeHTMLAttr) .Site.Params.cdn.js (.Site.Params.cdn.js_hash | safeHTMLAttr)) "html" "" }}
<script src="%s" integrity=%q crossorigin="anonymous"></script>
`) .Site.Params.cdn.popper (.Site.Params.cdn.popper_hash | safeHTMLAttr) .Site.Params.cdn.js (.Site.Params.cdn.js_hash | safeHTMLAttr)) "html" "" }}
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion site/layouts/partials/icons/circle-square.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion site/layouts/partials/icons/cloud-fill.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion site/layouts/partials/icons/code.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion site/layouts/partials/icons/droplet-fill.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c58bed8

Please sign in to comment.