Skip to content

B
bootstrap
Commit 8111e307 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Remove docs and prettify css from examples thus far; update narrow page

parent caed3a9d
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 35 deletions
docs/examples/jumbotron.html
View file @ 8111e307
...@@ -10,10 +10,6 @@ ...@@ -10,10 +10,6 @@
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../assets/css/bootstrap.css" rel="stylesheet"> <link href="../assets/css/bootstrap.css" rel="stylesheet">
<!-- Documentation extras -->
<link href="../assets/css/docs.css" rel="stylesheet">
<link href="../assets/js/google-code-prettify/prettify.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="../assets/js/html5shiv.js"></script> <script src="../assets/js/html5shiv.js"></script>
...@@ -29,13 +25,13 @@ ...@@ -29,13 +25,13 @@
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<style> <style>
body {
padding-top: 80px;
}
.navbar-form input[type="text"], .navbar-form input[type="text"],
.navbar-form input[type="password"] { .navbar-form input[type="password"] {
width: 180px; width: 180px;
} }
.jumbotron {
margin-top: 20px;
}
</style> </style>
</head> </head>
......
docs/examples/marketing-narrow.html
View file @ 8111e307
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <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="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<!-- Le styles --> <!-- Bootstrap core CSS -->
<link href="../assets/css/bootstrap.css" rel="stylesheet"> <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 { body {
padding-top: 20px; padding-bottom: 30px;
padding-bottom: 40px;
} }
/* Custom container */ /* Custom container */
...@@ -26,7 +41,7 @@ ...@@ -26,7 +41,7 @@
/* Main marketing message and sign up button */ /* Main marketing message and sign up button */
.jumbotron { .jumbotron {
margin: 60px 0; margin: 40px 0;
text-align: center; text-align: center;
} }
.jumbotron h1 { .jumbotron h1 {
...@@ -46,25 +61,13 @@ ...@@ -46,25 +61,13 @@
margin-top: 28px; margin-top: 28px;
} }
</style> </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> </head>
<body> <body>
<div class="container-narrow">
<div class="container-narrow">
<div class="masthead"> <div class="masthead">
<ul class="nav nav-pills pull-right"> <ul class="nav nav-pills pull-right">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
...@@ -74,6 +77,7 @@ ...@@ -74,6 +77,7 @@
<h3 class="muted">Project name</h3> <h3 class="muted">Project name</h3>
</div> </div>
<hr> <hr>
<div class="jumbotron"> <div class="jumbotron">
...@@ -82,9 +86,7 @@ ...@@ -82,9 +86,7 @@
<a class="btn btn-large btn-success" href="#">Sign up today</a> <a class="btn btn-large btn-success" href="#">Sign up today</a>
</div> </div>
<hr> <div class="row marketing">
<div class="row-fluid marketing">
<div class="span6"> <div class="span6">
<h4>Subheading</h4> <h4>Subheading</h4>
<p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p> <p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
...@@ -116,7 +118,9 @@ ...@@ -116,7 +118,9 @@
</div> <!-- /container --> </div> <!-- /container -->
<!-- Le javascript
<!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script> <script src="../assets/js/jquery.js"></script>
......
docs/examples/starter-template.html
View file @ 8111e307
...@@ -10,10 +10,6 @@ ...@@ -10,10 +10,6 @@
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link href="../assets/css/bootstrap.css" rel="stylesheet"> <link href="../assets/css/bootstrap.css" rel="stylesheet">
<!-- Documentation extras -->
<link href="../assets/css/docs.css" rel="stylesheet">
<link href="../assets/js/google-code-prettify/prettify.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="../assets/js/html5shiv.js"></script> <script src="../assets/js/html5shiv.js"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment