diff options
| author | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
|---|---|---|
| committer | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
| commit | e481c8fff268a1cce1fe0d60dc85d4f6b85e855e (patch) | |
| tree | 361d07f1cbe685332826d6cb6b291243a939df30 /docs/examples | |
| parent | 026682bf0dc828d8d689cb01e623eb311de0c013 (diff) | |
| parent | 232469549c9a9b6082b311f568556d99ea03af2f (diff) | |
| download | bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.tar.xz bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.zip | |
Merge branch 'v4-dev' into v4-media-breakpoint-between
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/dashboard/index.html | 20 | ||||
| -rw-r--r-- | docs/examples/jumbotron/index.html | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index 13ad8598f..0e513788c 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -31,15 +31,17 @@ <span class="icon-bar"></span> </button> <a class="navbar-brand" href="#">Project name</a> - <nav class="nav navbar-nav pull-left"> - <a class="nav-item nav-link" href="#">Dashboard</a> - <a class="nav-item nav-link" href="#">Settings</a> - <a class="nav-item nav-link" href="#">Profile</a> - <a class="nav-item nav-link" href="#">Help</a> - </nav> - <form class="navbar-form pull-right"> - <input type="text" class="form-control" placeholder="Search..."> - </form> + <div id="navbar"> + <nav class="nav navbar-nav pull-left"> + <a class="nav-item nav-link" href="#">Dashboard</a> + <a class="nav-item nav-link" href="#">Settings</a> + <a class="nav-item nav-link" href="#">Profile</a> + <a class="nav-item nav-link" href="#">Help</a> + </nav> + <form class="navbar-form pull-right"> + <input type="text" class="form-control" placeholder="Search..."> + </form> + </div> </nav> <div class="container-fluid"> diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html index efc545bbc..37ddabf4b 100644 --- a/docs/examples/jumbotron/index.html +++ b/docs/examples/jumbotron/index.html @@ -70,7 +70,7 @@ <hr> <footer> - <p>© Company 2014</p> + <p>© Company 2015</p> </footer> </div> <!-- /container --> |