From 7c9295d44b5d5bc515afb0df1f5885f4f655410d Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 19 Jan 2013 09:34:08 -0800
Subject: [PATCH] update sticky footer templates
---
docs/examples/sticky-footer-navbar.html | 39 ++++++++++++-----------
docs/examples/sticky-footer.html | 41 +++++++++++++------------
2 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html
index cb5de6de2a..d6b9218f3e 100644
--- a/docs/examples/sticky-footer-navbar.html
+++ b/docs/examples/sticky-footer-navbar.html
@@ -2,14 +2,29 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>Sticky footer · Twitter Bootstrap</title>
+ <title>Sticky footer with navbar template · Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
- <!-- CSS -->
+ <!-- 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>
/* Sticky footer styles
-------------------------------------------------- */
@@ -66,25 +81,13 @@
}
</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>
- <!-- Part 1: Wrap all page content here -->
+
+ <!-- Wrap all page content here -->
<div id="wrap">
<!-- Fixed navbar -->
@@ -140,7 +143,7 @@
- <!-- 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/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html
index d307d79387..77be2bd01d 100644
--- a/docs/examples/sticky-footer.html
+++ b/docs/examples/sticky-footer.html
@@ -2,14 +2,29 @@
<html lang="en">
<head>
<meta charset="utf-8">
- <title>Sticky footer · Twitter Bootstrap</title>
+ <title>Sticky footer template · Bootstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">
- <!-- CSS -->
+ <!-- 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>
/* Sticky footer styles
-------------------------------------------------- */
@@ -48,8 +63,6 @@
}
}
-
-
/* Custom page CSS
-------------------------------------------------- */
/* Not required for template or sticky footer method. */
@@ -63,25 +76,13 @@
}
</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>
- <!-- Part 1: Wrap all page content here -->
+
+ <!-- Wrap all page content here -->
<div id="wrap">
<!-- Begin page content -->
@@ -104,7 +105,7 @@
- <!-- Le javascript
+ <!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="../assets/js/jquery.js"></script>
--
GitLab