From 721d8c6551dcc5b36e0e4a34b47f322be118dc62 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Tue, 16 Jul 2013 22:35:47 +0200
Subject: Decrease size of footer

Before it seemed a bit too prominent on pages with short content.

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/views/footer.php |  4 +---
 data/css/style.css           | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/application/views/footer.php b/application/views/footer.php
index 459b62959..dac3e3dd1 100644
--- a/application/views/footer.php
+++ b/application/views/footer.php
@@ -7,8 +7,7 @@ if (is_cli_client() && !isset($force_full_html)) {
 <div id="push"></div>
 </div>
 <footer class="footer" id="footer">
-	<div class="container">
-		<p class="muted credits">
+	<div class="container muted credits">
 			<p>Site code licensed under <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank">AGPL v3</a>.</p>
 			<p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
 			<ul class="footer-links">
@@ -16,7 +15,6 @@ if (is_cli_client() && !isset($force_full_html)) {
 				<li class="muted">&middot;</li>
 				<li><a href="<?php echo site_url("file/contact"); ?>">Contact</a></li>
 			</ul>
-		</p>
 	</div>
 </footer>
 <?php echo include_js("/data/js/jquery-2.0.2.min.js"); ?>
diff --git a/data/css/style.css b/data/css/style.css
index cc2e00b12..15860db83 100644
--- a/data/css/style.css
+++ b/data/css/style.css
@@ -86,17 +86,24 @@ body {
 	height: auto !important;
 	height: 100%;
 	/* Negative indent footer by it's height */
-	margin: 0 auto -131px;
+	margin: 0 auto -81px;
 }
 
 /* Set the fixed height of the footer here */
 #footer {
-	height: 130px;
+	height: 50px;
+	font-size: 12px;
+	padding: 15px 0;
+}
+
+#footer,
+#footer li {
+	line-height: 12px;
 }
 
 /* Set to footer height + 70px "padding" */
 #push {
-	height: 200px;
+	height: 120px;
 }
 
 /* Lastly, apply responsive CSS fixes as necessary */
@@ -109,8 +116,9 @@ body {
 	}
 }
 
+#footer p,
 .footer-links {
-	margin: 10px 0;
+	margin: 4px 0;
 }
 .footer-links li {
 	display: inline;
-- 
cgit v1.2.3-24-g4f1b