diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
| commit | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (patch) | |
| tree | 2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f /docs/examples/offcanvas/index.html | |
| parent | 353e0a49a97c24d89f6cdb95014419d4137dee6e (diff) | |
| parent | b811f8cf9628dbcbfe994f71588c5a0c921a092d (diff) | |
| download | bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.tar.xz bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
Diffstat (limited to 'docs/examples/offcanvas/index.html')
| -rw-r--r-- | docs/examples/offcanvas/index.html | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index 5e963d0be..6dc7c044c 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -16,30 +16,17 @@ <!-- Custom styles for this template --> <link href="offcanvas.css" rel="stylesheet"> - - <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> - <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> </head> <body> - <nav class="navbar navbar-fixed-top navbar-inverse"> + <nav class="navbar navbar-fixed-top navbar-dark bg-inverse"> <div class="container"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="#">Project name</a> - </div> - <div id="navbar" class="collapse navbar-collapse"> - <ul class="nav navbar-nav"> - <li class="active"><a href="#">Home</a></li> - <li><a href="#about">About</a></li> - <li><a href="#contact">Contact</a></li> - </ul> - </div><!-- /.nav-collapse --> + <a class="navbar-brand" href="#">Project name</a> + <ul class="nav navbar-nav"> + <li class="nav-item active"><a class="nav-link" href="#">Home</a></li> + <li class="nav-item"><a class="nav-link" href="#about">About</a></li> + <li class="nav-item"><a class="nav-link" href="#contact">Contact</a></li> + </ul> </div><!-- /.container --> </nav><!-- /.navbar --> @@ -48,8 +35,8 @@ <div class="row row-offcanvas row-offcanvas-right"> <div class="col-xs-12 col-sm-9"> - <p class="pull-right visible-xs"> - <button type="button" class="btn btn-primary btn-xs" data-toggle="offcanvas">Toggle nav</button> + <p class="pull-right hidden-sm-up"> + <button type="button" class="btn btn-primary btn-sm" data-toggle="offcanvas">Toggle nav</button> </p> <div class="jumbotron"> <h1>Hello, world!</h1> |