diff options
| author | XhmikosR <[email protected]> | 2017-08-11 13:01:51 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-08-11 13:01:51 +0300 |
| commit | 7bfc6ab6fca519d8348dc219c536b35849ab5cf5 (patch) | |
| tree | 488ad34a7cff7effaad6b1dbc7a60e8ed08bf1c3 | |
| parent | 14cb6a649534a45705a68172311c89086f77a8fa (diff) | |
| parent | 7a9ab5bfe19e46e5b9946513a2a64af771ff9ee3 (diff) | |
| download | bootstrap-7bfc6ab6fca519d8348dc219c536b35849ab5cf5.tar.xz bootstrap-7bfc6ab6fca519d8348dc219c536b35849ab5cf5.zip | |
Merge pull request #23301 from twbs/v4-dev-html-errors
Fix HTML errors
| -rw-r--r-- | _layouts/default.html | 8 | ||||
| -rw-r--r-- | build/.htmllintrc | 2 | ||||
| -rw-r--r-- | docs/4.0/components/dropdowns.md | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/_layouts/default.html b/_layouts/default.html index 0292da9fd..0b0c214a1 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -12,9 +12,13 @@ {% include docs-navbar.html %} - <main id="content" role="main"> + {% if page.layout == "simple" %} {{ content }} - </main> + {% else %} + <main id="content" role="main"> + {{ content }} + </main> + {% endif %} {% include footer.html %} {% include scripts.html %} diff --git a/build/.htmllintrc b/build/.htmllintrc index d88560faa..c04658fb9 100644 --- a/build/.htmllintrc +++ b/build/.htmllintrc @@ -1,6 +1,6 @@ { "attr-bans": ["align", "background", "bgcolor", "border", "frameborder", "longdesc", "marginwidth", "marginheight", "scrolling"], - "attr-name-style": "dash", + "attr-name-style": false, "attr-no-unsafe-char": false, "class-style": "dash", "doctype-first": true, diff --git a/docs/4.0/components/dropdowns.md b/docs/4.0/components/dropdowns.md index 15f810be8..6ebce5f04 100644 --- a/docs/4.0/components/dropdowns.md +++ b/docs/4.0/components/dropdowns.md @@ -510,8 +510,8 @@ Put a form within a dropdown menu, or make it into a dropdown menu, and use [mar <input type="email" class="form-control" id="exampleDropdownFormEmail2" placeholder="[email protected]"> </div> <div class="form-group"> - <label for="exampleDropdownFormEmail2">Password</label> - <input type="password" class="form-control" id="exampleDropdownFormEmail2" placeholder="Password"> + <label for="exampleDropdownFormPassword2">Password</label> + <input type="password" class="form-control" id="exampleDropdownFormPassword2" placeholder="Password"> </div> <div class="form-check"> <label class="form-check-label"> |