Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markdotto@gmail.com>2014-12-04 12:04:07 +0300
committerMark Otto <markdotto@gmail.com>2014-12-04 12:04:07 +0300
commit471e5969accee94540b4027886aa779ce8752831 (patch)
tree950ab7517b3693640b69d60c310ac1f413f64e67 /docs/examples/jumbotron
parentd0cffbb6803f39e8ac64c6f97d692f0026089862 (diff)
convert jumbotron example to new navbar, fix container, and use rems in css
Diffstat (limited to 'docs/examples/jumbotron')
-rw-r--r--docs/examples/jumbotron/index.html34
-rw-r--r--docs/examples/jumbotron/jumbotron.css4
2 files changed, 14 insertions, 24 deletions
diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html
index 2ea7f0b055..23c39ab976 100644
--- a/docs/examples/jumbotron/index.html
+++ b/docs/examples/jumbotron/index.html
@@ -23,28 +23,18 @@
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
- <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="navbar-collapse collapse">
- <form class="navbar-form navbar-right">
- <div class="form-group">
- <input type="text" placeholder="Email" class="form-control">
- </div>
- <div class="form-group">
- <input type="password" placeholder="Password" class="form-control">
- </div>
- <button type="submit" class="btn btn-success">Sign in</button>
- </form>
- </div><!--/.navbar-collapse -->
- </div>
+ <a class="navbar-brand" href="#">Project name</a>
+ <ul class="nav nav-pills">
+ <li class="nav-item active">
+ <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="#">About</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="#">Contact</a>
+ </li>
+ </ul>
</nav>
<!-- Main jumbotron for a primary marketing message or call to action -->
diff --git a/docs/examples/jumbotron/jumbotron.css b/docs/examples/jumbotron/jumbotron.css
index 179d40879d..3a2aa5e97b 100644
--- a/docs/examples/jumbotron/jumbotron.css
+++ b/docs/examples/jumbotron/jumbotron.css
@@ -1,5 +1,5 @@
/* Move down content because we have a fixed navbar that is 50px tall */
body {
- padding-top: 50px;
- padding-bottom: 20px;
+ padding-top: 5rem;
+ padding-bottom: 2rem;
}