]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 56f8b73)
Remove docs and prettify css from examples thus far; update narrow page
authorMark Otto <otto@github.com>
Fri, 18 Jan 2013 04:39:38 +0000 (20:39 -0800)
committerMark Otto <otto@github.com>
Fri, 18 Jan 2013 04:39:38 +0000 (20:39 -0800)
jumbotron.html patch | blob | blame | history
marketing-narrow.html patch | blob | blame | history
starter-template.html patch | blob | blame | history

diff --git a/jumbotron.html b/jumbotron.html
index cb2f9c5b666dd1f5cffdfc4cb14aa54ca8299de8..b8b0ef93518b445535778c14d64e00e466addb34 100644 (file)
--- a/jumbotron.html
+++ b/jumbotron.html
@@ -10,10 +10,6 @@
     <!-- Bootstrap core CSS -->
     <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 -->
     <!--[if lt IE 9]>
       <script src="../assets/js/html5shiv.js"></script>
@@ -29,13 +25,13 @@
 
     <!-- Custom styles for this template -->
     <style>
+      body {
+        padding-top: 80px;
+      }
       .navbar-form input[type="text"],
       .navbar-form input[type="password"] {
         width: 180px;
       }
-      .jumbotron {
-        margin-top: 20px;
-      }
     </style>
   </head>
 
diff --git a/marketing-narrow.html b/marketing-narrow.html
index f6f5d1685122713724c7c65f1a89b5a4dc67cccd..6ba0a5ecb3a08c325d18160c4ca16355fd8f0551 100644 (file)
--- a/marketing-narrow.html
+++ b/marketing-narrow.html
@@ -1,18 +1,33 @@
+
 <!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: 40px;
+        padding-bottom: 30px;
       }
 
       /* Custom container */
@@ -26,7 +41,7 @@
 
       /* Main marketing message and sign up button */
       .jumbotron {
-        margin: 60px 0;
+        margin: 40px 0;
         text-align: center;
       }
       .jumbotron h1 {
@@ -46,25 +61,13 @@
         margin-top: 28px;
       }
     </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-narrow">
 
+
+    <div class="container-narrow">
       <div class="masthead">
         <ul class="nav nav-pills pull-right">
           <li class="active"><a href="#">Home</a></li>
@@ -74,6 +77,7 @@
         <h3 class="muted">Project name</h3>
       </div>
 
+
       <hr>
 
       <div class="jumbotron">
@@ -82,9 +86,7 @@
         <a class="btn btn-large btn-success" href="#">Sign up today</a>
       </div>
 
-      <hr>
-
-      <div class="row-fluid marketing">
+      <div class="row marketing">
         <div class="span6">
           <h4>Subheading</h4>
           <p>Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.</p>
@@ -116,7 +118,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/starter-template.html b/starter-template.html
index cea480d4916ea477ba85f6f7e86b2457ee27d73c..9e8d7ad3bec02273b592b4ae581f7e8ca42eb818 100644 (file)
--- a/starter-template.html
+++ b/starter-template.html
@@ -10,10 +10,6 @@
     <!-- Bootstrap core CSS -->
     <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 -->
     <!--[if lt IE 9]>
       <script src="../assets/js/html5shiv.js"></script>
Mirror of https://github.com/twbs/bootstrap.git