aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-01-17 21:05:23 -0800
committerMark Otto <[email protected]>2013-01-17 21:05:23 -0800
commit8713fa1edf406b1bb2223dcbbdf37b9b1dd4b564 (patch)
tree9a26fd1874cb059fb343cd8329937bba7ee91f41
parent70fca06f252c5e5b05013e2453fe71903f6832fd (diff)
downloadbootstrap-8713fa1edf406b1bb2223dcbbdf37b9b1dd4b564.tar.xz
bootstrap-8713fa1edf406b1bb2223dcbbdf37b9b1dd4b564.zip
overhaul justified nav example
-rw-r--r--justified-nav.html107
-rw-r--r--marketing-narrow.html1
2 files changed, 54 insertions, 54 deletions
diff --git a/justified-nav.html b/justified-nav.html
index ef8f8d428..ec494fa99 100644
--- a/justified-nav.html
+++ b/justified-nav.html
@@ -1,18 +1,34 @@
+
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
- <title>Template &middot; Bootstrap</title>
+ <title>Narrow page template &middot; Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
- <!-- Le styles -->
+ <!-- Bootstrap core CSS -->
<link href="../assets/css/bootstrap.css" rel="stylesheet">
- <style type="text/css">
+
+ <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!--[if lt IE 9]>
+ <script src="../assets/js/html5shiv.js"></script>
+ <script src="../assets/js/respond/respond.min.js"></script>
+ <![endif]-->
+
+ <!-- Fav and touch icons -->
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
+ <link rel="shortcut icon" href="../assets/ico/favicon.png">
+
+ <!-- Custom styles for this template -->
+ <style>
+
body {
- padding-top: 20px;
- padding-bottom: 60px;
+ padding-bottom: 30px;
}
/* Custom container */
@@ -26,8 +42,8 @@
/* Main marketing message and sign up button */
.jumbotron {
- margin: 80px 0;
text-align: center;
+ background-color: transparent;
}
.jumbotron h1 {
font-size: 100px;
@@ -51,70 +67,53 @@
}
- /* Customize the navbar links to be fill the entire space of the .navbar */
- .navbar .navbar-inner {
- padding: 0;
- }
- .navbar .nav {
- margin: 0;
- display: table;
- width: 100%;
- }
- .navbar .nav li {
- display: table-cell;
- width: 1%;
- float: none;
+ /* Customize the nav-justified links to be fill the entire space of the .navbar */
+ .nav-justified {
+ max-height: 50px;
+ background-color: #eee;
+ border-radius: 5px;
}
- .navbar .nav li a {
+ .nav-justified li a {
+ padding-top: 15px;
+ padding-bottom: 15px;
+ color: #777;
font-weight: bold;
text-align: center;
border-left: 1px solid rgba(255,255,255,.75);
border-right: 1px solid rgba(0,0,0,.1);
}
- .navbar .nav li:first-child a {
+ .nav-justified .active a {
+ background-color: #ddd;
+ }
+ .nav-justified li:first-child a {
border-left: 0;
- border-radius: 3px 0 0 3px;
+ border-top-left-radius: 5px;
+ border-bottom-left-radius: 5px;
}
- .navbar .nav li:last-child a {
+ .nav-justified li:last-child a {
border-right: 0;
- border-radius: 0 3px 3px 0;
+ border-top-right-radius: 5px;
+ border-bottom-right-radius: 5px;
}
</style>
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="../assets/js/html5shiv.js"></script>
- <![endif]-->
-
- <!-- Fav and touch icons -->
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- <link rel="shortcut icon" href="../assets/ico/favicon.png">
</head>
<body>
+
+
<div class="container">
<div class="masthead">
<h3 class="muted">Project name</h3>
- <div class="navbar">
- <div class="navbar-inner">
- <div class="container">
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#">Projects</a></li>
- <li><a href="#">Services</a></li>
- <li><a href="#">Downloads</a></li>
- <li><a href="#">About</a></li>
- <li><a href="#">Contact</a></li>
- </ul>
- </div>
- </div>
- </div><!-- /.navbar -->
+ <ul class="nav nav-justified">
+ <li class="active"><a href="#">Home</a></li>
+ <li><a href="#">Projects</a></li>
+ <li><a href="#">Services</a></li>
+ <li><a href="#">Downloads</a></li>
+ <li><a href="#">About</a></li>
+ <li><a href="#">Contact</a></li>
+ </ul>
</div>
<!-- Jumbotron -->
@@ -127,7 +126,7 @@
<hr>
<!-- Example row of columns -->
- <div class="row-fluid">
+ <div class="row">
<div class="span4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui. </p>
@@ -153,7 +152,9 @@
</div> <!-- /container -->
- <!-- Le javascript
+
+
+ <!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
diff --git a/marketing-narrow.html b/marketing-narrow.html
index 6ba0a5ecb..bab956c77 100644
--- a/marketing-narrow.html
+++ b/marketing-narrow.html
@@ -1,4 +1,3 @@
-
<!DOCTYPE html>
<html lang="en">
<head>