Add footer with styles.

audreyfeldroy · Sep 9, 2013 · 48cc4c5 · 48cc4c5
1 parent a4d0d27
commit 48cc4c5
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/cookiecutter.json b/cookiecutter.json
@@ -1,5 +1,6 @@
 {
 	"website_name": "Complexity Boilerpläte",
 	"repo_name": "boilerplate",
-	"project_short_description": "Complexity Boilerplate is @audreyr's starter Complexity site. It's a bit opinionated, so you might want to start from complexity-example or create your own Cookiecutter template for Complexity."
+	"project_short_description": "Complexity Boilerplate is @audreyr's starter Complexity site. It's a bit opinionated, so you might want to start from complexity-example or create your own Cookiecutter template for Complexity.",
+  "year": "2013"
 }
diff --git a/{{cookiecutter.repo_name}}/project/assets/css/{{cookiecutter.repo_name}}.css b/{{cookiecutter.repo_name}}/project/assets/css/{{cookiecutter.repo_name}}.css
@@ -5,6 +5,35 @@
    ========================================================================== */
 
 /**
- * Example customization goes here.
+ * Footer container border and padding
  */
 
+.footer {
+  border-top: 1px solid #E5E5E5;
+  padding-top: 40px;
+  padding-bottom: 30px;
+  margin-top: 100px;
+}
+
+/**
+ * Footer li links displayed inline, without bullets
+ */
+
+.footer-links {
+  float: left;
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+
+.footer-links li {
+  display: inline-block;
+}
+
+/**
+ * Give 2nd li onward a 10px left margin, so links aren't squished together.
+ */
+
+.footer-links li+li {
+  margin-left: 10px;
+}
diff --git a/{{cookiecutter.repo_name}}/project/templates/base.html b/{{cookiecutter.repo_name}}/project/templates/base.html
@@ -1,3 +1,5 @@
+<<<<<<< Local Changes
+=======
 <!DOCTYPE html>
 <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
 <!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
@@ -77,8 +79,18 @@
     {{ '{% endblock %}' }}
   </div><!-- container -->
 
+  <footer class="footer">
+    <div class="container">
+      <ul class="footer-links">
+        <li>&copy; {{ cookiecutter.year }} {{ cookiecutter.website_name }}.</li>
+        <li><a href="/about/">About</a></li>
+      </ul>
+    </div><!-- container -->
+  </footer>
+
   <script src="/js/jquery.min.js"></script>
   <script src="/js/bootstrap.min.js"></script>
   <script src="/js/{{ cookiecutter.repo_name }}.js"></script>
 </body>
 </html>
+>>>>>>> External Changes