Skip to content

Commit

Permalink
Documentation updates
Browse files Browse the repository at this point in the history
  • Loading branch information
MartijnCuppens committed Sep 21, 2019
1 parent 962524a commit 80f1bc3
Show file tree
Hide file tree
Showing 14 changed files with 177 additions and 97 deletions.
4 changes: 2 additions & 2 deletions bundlesize.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"files": [
{
"path": "./dist/css/bootstrap-grid.css",
"maxSize": "7 kB"
"maxSize": "7.1 kB"
},
{
"path": "./dist/css/bootstrap-grid.min.css",
"maxSize": "6.2 kB"
"maxSize": "6.3 kB"
},
{
"path": "./dist/css/bootstrap-reboot.css",
Expand Down
3 changes: 3 additions & 0 deletions scss/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@
@each $key, $value in $gutters {
.g#{$infix}-#{$key},
.gx#{$infix}-#{$key} {
margin-right: -$value / 2;
margin-left: -$value / 2;

> * {
padding-right: $value / 2;
padding-left: $value / 2;
Expand Down
103 changes: 72 additions & 31 deletions site/content/docs/4.3/components/navbar.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Navbars come with built-in support for a handful of sub-components. Choose from
- `.navbar-brand` for your company, product, or project name.
- `.navbar-nav` for a full-height and lightweight navigation (including support for dropdowns).
- `.navbar-toggler` for use with our collapse plugin and other [navigation toggling](#responsive-behaviors) behaviors.
- `.form-inline` for any form controls and actions.
- `.row`s for grid content or any form controls and actions.
- `.navbar-text` for adding vertically centered strings of text.
- `.collapse.navbar-collapse` for grouping and hiding navbar contents by a parent breakpoint.

Expand Down Expand Up @@ -65,9 +65,13 @@ Here's an example of all the sub-components included in a responsive light-theme
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
<form class="row g-2 mt-3 mt-lg-0 pl-lg-2">
<div class="col-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-auto">
<button class="btn btn-outline-success" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand Down Expand Up @@ -198,13 +202,18 @@ You may also utilize dropdowns in your navbar nav. Dropdown menus require a wrap

### Forms

Place various form controls and components within a navbar with `.form-inline`.
Place various form controls and components within a navbar with `.row`.

{{< example >}}
<nav class="navbar navbar-light bg-light">
<form class="form-inline">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
<form class="row g-2">
<div class="col-md-auto">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
</div>

<div class="col-md-auto">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
</div>
</form>
</nav>
{{< /example >}}
Expand All @@ -214,9 +223,14 @@ Immediate children elements in `.navbar` use flex layout and will default to `ju
{{< example >}}
<nav class="navbar navbar-light bg-light">
<a class="navbar-brand">Navbar</a>
<form class="form-inline">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
<form class="row g-2">
<div class="col-md-auto">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
</div>

<div class="col-md-auto">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
</div>
</form>
</nav>
{{< /example >}}
Expand All @@ -225,7 +239,7 @@ Input groups work, too:

{{< example >}}
<nav class="navbar navbar-light bg-light">
<form class="form-inline">
<form>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">@</span>
Expand All @@ -240,7 +254,7 @@ Various buttons are supported as part of these navbar forms, too. This is also a

{{< example >}}
<nav class="navbar navbar-light bg-light">
<form class="form-inline">
<form>
<button class="btn btn-outline-success" type="button">Main button</button>
<button class="btn btn-sm btn-outline-secondary" type="button">Smaller button</button>
</form>
Expand Down Expand Up @@ -312,9 +326,14 @@ Theming the navbar has never been easier thanks to the combination of theming cl
<a class="nav-link" href="#">About</a>
</li>
</ul>
<form class="form-inline">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-info my-2 my-sm-0" type="submit">Search</button>

<form class="row g-2">
<div class="col-md-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-md-auto">
<button class="btn btn-outline-info" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand All @@ -340,9 +359,14 @@ Theming the navbar has never been easier thanks to the combination of theming cl
<a class="nav-link" href="#">About</a>
</li>
</ul>
<form class="form-inline">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-light my-2 my-sm-0" type="submit">Search</button>

<form class="row g-2">
<div class="col-md-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-md-auto">
<button class="btn btn-outline-light" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand All @@ -368,9 +392,14 @@ Theming the navbar has never been easier thanks to the combination of theming cl
<a class="nav-link" href="#">About</a>
</li>
</ul>
<form class="form-inline">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-primary my-2 my-sm-0" type="submit">Search</button>

<form class="row g-2">
<div class="col-md-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-md-auto">
<button class="btn btn-outline-primary" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand Down Expand Up @@ -472,9 +501,13 @@ With no `.navbar-brand` shown in lowest breakpoint:
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
<form class="row g-2">
<div class="col-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-auto">
<button class="btn btn-outline-success" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand All @@ -501,9 +534,13 @@ With a brand name shown on the left and toggler on the right:
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="search" placeholder="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
<form class="row g-2">
<div class="col-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-auto">
<button class="btn btn-outline-success" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand All @@ -530,9 +567,13 @@ With a toggler on the left and brand name on the right:
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
<form class="row g-2">
<div class="col-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-auto">
<button class="btn btn-outline-success" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand Down
10 changes: 7 additions & 3 deletions site/content/docs/4.3/examples/carousel/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,13 @@
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</li>
</ul>
<form class="form-inline mt-2 mt-md-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
<form class="row gx-2 mt-2 mt-md-0">
<div class="col-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-auto">
<button class="btn btn-outline-success" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand Down
10 changes: 7 additions & 3 deletions site/content/docs/4.3/examples/navbar-fixed/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</li>
</ul>
<form class="form-inline mt-2 mt-md-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
<form class="row gx-2 mt-2 mt-lg-0">
<div class="col-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-auto">
<button class="btn btn-outline-success" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand Down
10 changes: 7 additions & 3 deletions site/content/docs/4.3/examples/navbar-static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,13 @@
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</li>
</ul>
<form class="form-inline mt-2 mt-md-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
<form class="row gx-2 mt-2 mt-lg-0">
<div class="col-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-auto">
<button class="btn btn-outline-success" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand Down
18 changes: 9 additions & 9 deletions site/content/docs/4.3/examples/navbars/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</div>
</li>
</ul>
<form class="form-inline my-2 my-md-0">
<form class="my-2 my-md-0">
<input class="form-control" type="text" placeholder="Search" aria-label="Search">
</form>
</div>
Expand All @@ -52,7 +52,7 @@
<a class="nav-link" href="#">Link</a>
</li>
</ul>
<form class="form-inline my-2 my-md-0">
<form class="my-2 my-md-0">
<input class="form-control" type="text" placeholder="Search">
</form>
</div>
Expand Down Expand Up @@ -84,7 +84,7 @@
</div>
</li>
</ul>
<form class="form-inline my-2 my-md-0">
<form class="my-2 my-md-0">
<input class="form-control" type="text" placeholder="Search">
</form>
</div>
Expand Down Expand Up @@ -116,7 +116,7 @@
</div>
</li>
</ul>
<form class="form-inline my-2 my-md-0">
<form class="my-2 my-md-0">
<input class="form-control" type="text" placeholder="Search">
</form>
</div>
Expand Down Expand Up @@ -148,7 +148,7 @@
</div>
</li>
</ul>
<form class="form-inline my-2 my-md-0">
<form class="my-2 my-md-0">
<input class="form-control" type="text" placeholder="Search">
</form>
</div>
Expand Down Expand Up @@ -180,7 +180,7 @@
</div>
</li>
</ul>
<form class="form-inline my-2 my-md-0">
<form class="my-2 my-md-0">
<input class="form-control" type="text" placeholder="Search">
</form>
</div>
Expand Down Expand Up @@ -213,7 +213,7 @@
</div>
</li>
</ul>
<form class="form-inline my-2 my-md-0">
<form class="my-2 my-md-0">
<input class="form-control" type="text" placeholder="Search" aria-label="Search">
</form>
</div>
Expand Down Expand Up @@ -247,7 +247,7 @@
</div>
</li>
</ul>
<form class="form-inline my-2 my-md-0">
<form class="my-2 my-md-0">
<input class="form-control" type="text" placeholder="Search" aria-label="Search">
</form>
</div>
Expand Down Expand Up @@ -313,7 +313,7 @@
</div>
</li>
</ul>
<form class="form-inline my-2 my-md-0">
<form class="my-2 my-md-0">
<input class="form-control" type="text" placeholder="Search" aria-label="Search">
</form>
</div>
Expand Down
10 changes: 7 additions & 3 deletions site/content/docs/4.3/examples/offcanvas/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,13 @@
</div>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
<form class="row gx-2">
<div class="col-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-auto">
<button class="btn btn-outline-success" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand Down
10 changes: 7 additions & 3 deletions site/content/docs/4.3/examples/starter-template/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,13 @@
</div>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">
<button class="btn btn-secondary my-2 my-sm-0" type="submit">Search</button>
<form class="row gx-2 mt-2 mt-lg-0">
<div class="col-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-auto">
<button class="btn btn-outline-success" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand Down
10 changes: 7 additions & 3 deletions site/content/docs/4.3/examples/sticky-footer-navbar/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,13 @@
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
</li>
</ul>
<form class="form-inline mt-2 mt-md-0">
<input class="form-control mr-sm-2" type="text" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
<form class="row g-2 mt-2 mt-md-0">
<div class="col-auto">
<input class="form-control" type="search" placeholder="Search" aria-label="Search">
</div>
<div class="col-auto">
<button class="btn btn-outline-success" type="submit">Search</button>
</div>
</form>
</div>
</nav>
Expand Down
Loading

0 comments on commit 80f1bc3

Please sign in to comment.