Author: adc
Date: Sun Dec 8 17:15:08 2013
New Revision: 1549068
URL: http://svn.apache.org/r1549068
Log:
Another try to fix footer
Modified:
steve/site/trunk/content/resources/css/main.css
steve/site/trunk/templates/skeleton.html
Modified: steve/site/trunk/content/resources/css/main.css
URL:
http://svn.apache.org/viewvc/steve/site/trunk/content/resources/css/main.css?rev=1549068&r1=1549067&r2=1549068&view=diff
==============================================================================
--- steve/site/trunk/content/resources/css/main.css (original)
+++ steve/site/trunk/content/resources/css/main.css Sun Dec 8 17:15:08 2013
@@ -78,3 +78,20 @@ blockquote p {
.offset-two-thirds {
margin-left: 660px;
}
+
+
+/* Wrapper for page content to push down footer */
+#wrap {
+ min-height: 100%;
+ height: auto;
+ /* Negative indent footer by its height */
+ margin: 0 auto -60px;
+ /* Pad bottom by footer height */
+ padding: 0 0 60px;
+}
+
+/* Set the fixed height of the footer here */
+#footer {
+ height: 60px;
+ background-color: #f5f5f5;
+}
Modified: steve/site/trunk/templates/skeleton.html
URL:
http://svn.apache.org/viewvc/steve/site/trunk/templates/skeleton.html?rev=1549068&r1=1549067&r2=1549068&view=diff
==============================================================================
--- steve/site/trunk/templates/skeleton.html (original)
+++ steve/site/trunk/templates/skeleton.html Sun Dec 8 17:15:08 2013
@@ -23,9 +23,6 @@
<link rel="apple-touch-icon" sizes="72x72"
href="{{base}}resources/images/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114"
href="{{base}}resources/images/apple-touch-icon-114x114.png">
- <script src="{{base}}resources/js/jquery-1.10.2.min.js"></script>
- <script src="{{base}}resources/js/bootstrap.js"></script>
-
<script type="text/javascript">
var _gaq = _gaq || [];
@@ -48,6 +45,7 @@
<body>
<div id="wrap">
+
<header class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
@@ -89,7 +87,6 @@
</div>
</header>
-
<div class="container">
{% block content %}{{ content|markdown }}{% endblock %}
@@ -129,5 +126,8 @@
</div>
</div>
+<script src="{{base}}resources/js/jquery-1.10.2.min.js"></script>
+<script src="{{base}}resources/js/bootstrap.js"></script>
+
</body>
</html>
