From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Mar 2014 15:02:25 +0000 (+0100)
Subject: Cleanup footer.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4c6807966dbe93b5ddf217f16f4ffaa8232e7eb;p=ipfire.org.git

Cleanup footer.
---

diff --git a/static/css/style.css b/static/css/style.css
index f8006300..1cc95341 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -103,24 +103,13 @@ margin-bottom: 5px;
 }
 
 .footer {
-  border-top: 1px solid #E7E7E7;
-  padding: 30px 0;
-  margin-top: 70px;
-}
-.footer p {
-margin-bottom: 0;
-color: #777;
-}
-.footer-links {
-margin: 10px 0;
-}
-.footer-links li {
-display: inline;
-padding: 0 2px;
-}
-.footer-links li:first-child {
-padding-left: 0;
+	border-top: 1px solid #E7E7E7;
+	background-color: #F9F9F9;
+	color: #777;
+	padding: 20px 0;
+	margin-top: 70px;
 }
+
 .sidenav {
 width: 228px;
 margin: 30px 0 0;
diff --git a/templates/base.html b/templates/base.html
index 4ab93621..daf9aa55 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -53,19 +53,9 @@
 		{% end block %}
 
 		{% block footer %}
-			<footer class="footer navbar-default">
+			<footer class="footer">
 				<div class="container">
-					<div class="pull-right">
-						<a href="https://www.facebook.com/IPFire.org"><img src="{{ static_url("images/icons/social/facebook.png") }}" alt="Facebook"></a>
-						<a href="https://twitter.com/ipfire"><img src="{{ static_url("images/icons/social/twitter.png") }}" alt="Twitter"></a>
-						<a href="/news.rss"><img src="{{ static_url("images/icons/social/rss.png") }}" alt="RSS"></a>
-					</div>
-
-					<p>
-						&copy; {{ year }} - {{ _("IPFire is free software") }}
-					</p>
-
-					<ul class="footer-links">
+					<ul class="list-unstyled list-inline pull-right">
 						{% if hostname in ("www.ipfire.org", "dev.ipfire.org") %}
 							<li>
 								<a href="/press">{{ _("Press") }}</a>
@@ -94,6 +84,10 @@
 							{% end %}
 						{% end %}
 					</ul>
+
+					<p>
+						&copy; {{ year }} - {{ _("IPFire is free software") }}
+					</p>
 				</div>
 			</footer>
 		{% end block %}