aboutsummaryrefslogtreecommitdiff
path: root/docs/4.0
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2018-01-11 10:49:38 +0200
committerGitHub <[email protected]>2018-01-11 10:49:38 +0200
commit4a1bc75152ce3bbe829a5dd4d8d2e7fa1562b154 (patch)
tree8db22e985e429b756e70df81bceb069e6e9d1314 /docs/4.0
parentec307bdf4b37449fd0355c344d83cf2850cf8f27 (diff)
parentbfceedc84a75a97b1b5b26316c6368a3a5d2014a (diff)
downloadbootstrap-4a1bc75152ce3bbe829a5dd4d8d2e7fa1562b154.tar.xz
bootstrap-4a1bc75152ce3bbe829a5dd4d8d2e7fa1562b154.zip
Merge branch 'v4-dev' into custom-check-disabled
Diffstat (limited to 'docs/4.0')
-rw-r--r--docs/4.0/components/forms.md2
-rw-r--r--docs/4.0/utilities/display.md2
-rw-r--r--docs/4.0/utilities/position.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/4.0/components/forms.md b/docs/4.0/components/forms.md
index 3830f5a9f..4735bd9a5 100644
--- a/docs/4.0/components/forms.md
+++ b/docs/4.0/components/forms.md
@@ -711,7 +711,7 @@ Here's how form validation works with Bootstrap:
- Bootstrap scopes the `:invalid` and `:valid` styles to parent `.was-validated` class, usually applied to the `<form>`. Otherwise, any required field without a value shows up as invalid on page load. This way, you may choose when to activate them (typically after form submission is attempted).
- As a fallback, `.is-invalid` and `.is-valid` classes may be used instead of the pseudo-classes for [server side validation](#server-side). They do not require a `.was-validated` parent class.
- Due to constraints in how CSS works, we cannot (at present) apply styles to a `<label>` that comes before a form control in the DOM without the help of custom JavaScript.
-- All modern browsers support the [constraint validation API](https://www.w3.org/TR/html5/forms.html#the-constraint-validation-api), a series of JavaScript methods for validating form controls.
+- All modern browsers support the [constraint validation API](https://www.w3.org/TR/html5/sec-forms.html#the-constraint-validation-api), a series of JavaScript methods for validating form controls.
- Feedback messages may utilize the [browser defaults](#browser-defaults) (different for each browser, and unstylable via CSS) or our custom feedback styles with additional HTML and CSS.
- You may provide custom validity messages with `setCustomValidity` in JavaScript.
diff --git a/docs/4.0/utilities/display.md b/docs/4.0/utilities/display.md
index fd6dbe42b..f48d0a538 100644
--- a/docs/4.0/utilities/display.md
+++ b/docs/4.0/utilities/display.md
@@ -19,7 +19,7 @@ As such, the classes are named using the format:
* `.d-{value}` for `xs`
* `.d-{breakpoint}-{value}` for `sm`, `md`, `lg`, and `xl`.
-Where *display* is one of:
+Where *value* is one of:
* `none`
* `inline`
diff --git a/docs/4.0/utilities/position.md b/docs/4.0/utilities/position.md
index 9cf952452..b19488626 100644
--- a/docs/4.0/utilities/position.md
+++ b/docs/4.0/utilities/position.md
@@ -38,7 +38,7 @@ Position an element at the bottom of the viewport, from edge to edge. Be sure yo
Position an element at the top of the viewport, from edge to edge, but only after you scroll past it. The `.sticky-top` utility uses CSS's `position: sticky`, which isn't fully supported in all browsers.
-**Microsoft Edge and IE11 will render `position: sticky` as `position: relative`.** As such, we wrap the styles in a `@supports` query, limiting the stickiness to only browsers that properly can render it.
+**IE11 and IE10 will render `position: sticky` as `position: relative`.** As such, we wrap the styles in a `@supports` query, limiting the stickiness to only browsers that can render it properly.
{% highlight html %}
<div class="sticky-top">...</div>