Skip to content

Commit

Permalink
Merge branch 'master' into disabled-form-file
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR committed Jul 14, 2019
2 parents 6f84be3 + 6a9fd74 commit 741c0fd
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 33 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -210,4 +210,4 @@ Support this project by becoming a sponsor. Your logo will show up here with a l

## Copyright and license

Code and documentation copyright 2011-2019 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).
Code and documentation copyright 2011-2019 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors) and [Twitter, Inc.](https://twitter.com) Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
4 changes: 0 additions & 4 deletions scss/_root.scss
Expand Up @@ -8,10 +8,6 @@
--#{$color}: #{$value};
}

@each $bp, $value in $grid-breakpoints {
--breakpoint-#{$bp}: #{$value};
}

// Use `inspect` for lists so that quoted items keep the quotes.
// See https://github.com/sass/sass/issues/2383#issuecomment-336349172
--font-family-sans-serif: #{inspect($font-family-sans-serif)};
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/4.3/components/collapse.md
Expand Up @@ -123,7 +123,7 @@ Using the [card]({{< docsref "/components/card" >}}) component, you can extend t

## Accessibility

Be sure to add `aria-expanded` to the control element. This attribute explicitly conveys the current state of the collapsible element tied to the control to screen readers and similar assistive technologies. If the collapsible element is closed by default, the attribute on the control element should have a value of `aria-expanded="false"`. If you've set the collapsible element to be open by default using the `show` class, set `aria-expanded="true"` on the control instead. The plugin will automatically toggle this attribute on the control based on whether or not the collapsible element has been opened or closed (via JavaScript, or because the user triggered another control element also tied to the same collapsbile element). If the control element's HTML element is not a button (e.g., an `<a>` or `<div>`), the attribute `role="button"` should be added to the element.
Be sure to add `aria-expanded` to the control element. This attribute explicitly conveys the current state of the collapsible element tied to the control to screen readers and similar assistive technologies. If the collapsible element is closed by default, the attribute on the control element should have a value of `aria-expanded="false"`. If you've set the collapsible element to be open by default using the `show` class, set `aria-expanded="true"` on the control instead. The plugin will automatically toggle this attribute on the control based on whether or not the collapsible element has been opened or closed (via JavaScript, or because the user triggered another control element also tied to the same collapsible element). If the control element's HTML element is not a button (e.g., an `<a>` or `<div>`), the attribute `role="button"` should be added to the element.

If your control element is targeting a single collapsible element – i.e. the `data-target` attribute is pointing to an `id` selector – you should add the `aria-controls` attribute to the control element, containing the `id` of the collapsible element. Modern screen readers and similar assistive technologies make use of this attribute to provide users with additional shortcuts to navigate directly to the collapsible element itself.

Expand Down
27 changes: 0 additions & 27 deletions site/content/docs/4.3/getting-started/theming.md
Expand Up @@ -404,11 +404,6 @@ Here are the variables we include (note that the `:root` is required). They're l
--danger: #dc3545;
--light: #f8f9fa;
--dark: #343a40;
--breakpoint-xs: 0;
--breakpoint-sm: 576px;
--breakpoint-md: 768px;
--breakpoint-lg: 992px;
--breakpoint-xl: 1200px;
--font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
--font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
}
Expand All @@ -426,25 +421,3 @@ a {
color: var(--blue);
}
{{< /highlight >}}

### Breakpoint variables

While we originally included breakpoints in our CSS variables (e.g., `--breakpoint-md`), **these are not supported in media queries**, but they can still be used _within_ rulesets in media queries. These breakpoint variables remain in the compiled CSS for backward compatibility given they can be utilized by JavaScript. [Learn more in the spec](https://www.w3.org/TR/css-variables-1/#using-variables).

Here's an example of **what's not supported:**

{{< highlight css >}}
@media (min-width: var(--breakpoint-sm)) {
...
}
{{< /highlight >}}

And here's an example of **what is supported:**

{{< highlight css >}}
@media (min-width: 768px) {
.custom-element {
color: var(--primary);
}
}
{{< /highlight >}}

0 comments on commit 741c0fd

Please sign in to comment.