From e933e60c9b0a234a5b0bebfb1fc1220cde93b343 Mon Sep 17 00:00:00 2001
From: Nathan Bills <ndbills@gmail.com>
Date: Tue, 22 Apr 2014 00:09:21 -0600
Subject: [PATCH] The footer has the content it needs. It is responsive and is
fixed at the bottom of the page, out of the way. It looks nice, but what a
pain to setup haha.
---
project/static/css/style.css | 9 ++++++---
project/templates/home/home.html | 2 +-
project/templates/index.html | 29 ++++++++++++++++++++++-------
3 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/project/static/css/style.css b/project/static/css/style.css
index 3fe7d58..eddea54 100644
--- a/project/static/css/style.css
+++ b/project/static/css/style.css
@@ -6,12 +6,15 @@ html,body {
min-height: 100%;
height: auto !important;
height: 100%;
- margin: 0 auto -60px;
+ margin: 0 auto -110px;
+}
+
+#push {
+ height: 105px;
}
-#push,
#footer {
- height: 60px;
+ height: 92px;
}
@media (max-width: 767px) {
diff --git a/project/templates/home/home.html b/project/templates/home/home.html
index b044280..058022d 100644
--- a/project/templates/home/home.html
+++ b/project/templates/home/home.html
@@ -1,4 +1,4 @@
-{% extends "usernav.html" if user else 'index.html'%}
+{% extends "usernav.html" if user else "index.html"%}
{% block content %}
<div class="col-sm-12">
<div class="jumbotron">
diff --git a/project/templates/index.html b/project/templates/index.html
index 0290748..9daf8a5 100644
--- a/project/templates/index.html
+++ b/project/templates/index.html
@@ -1,7 +1,6 @@
<!doctype html>
<html lang="en">
<head>
-
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -52,21 +51,37 @@
{% block content %}{% endblock %}
</div>
- <div id="push"></div>
- </div>
- </div>
+ <div id="push"></div>
+
+ </div><!-- end container -->
+ </div><!-- end page -->
+
+ <!-- Begin the footer -->
<div id="footer">
- <div class="content">
+ <div class="container">
<div class="panel panel-default">
<div class="panel-body">
- Open Source by Brian Wood & Nathan Bills, 2014
+ <div class="row text-muted">
+ <div class="col-lg-6 col-md-5 col-sm-12">
+ <p>© 2014 by Brian Wood & Nathan Bills</p>
+ <p>This work is licensed under the <a class="text-muted" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License v2</a></p>
+ </div>
+ <div class="col-lg-2 col-md-3 col-sm-12">
+ <a href="https://www.themoviedb.org/"><img src="https://d3a8mw37cqal2z.cloudfront.net/assets/619c6e3db1177d51/images/tmdb-logo.png" style="width:180px;"></a>
+ </div>
+ <div class="col-md-3 col-sm-12">
+ <p>This product uses the TMDb API but is not endorsed or certified by TMDb.</p>
+ </div>
+ </div>
</div>
</div>
</div>
- </div>
+ </div><!-- end footer -->
+
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="http://ajax.aspnetcdn.com/ajax/jquery.validate/1.12.0/jquery.validate.min.js"></script>
+
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="{{ url_for('static', filename='lib/bootstrap.min.js') }}"></script>
<script src="{{ url_for('static', filename='lib/jquery-ui-1.10.4.custom.min.js') }}"></script>
--
GitLab