From 4c57fab0a071d3d70dedd32b327c995bdabe4428 Mon Sep 17 00:00:00 2001
From: rsiddharth <rsd@gnu.org>
Date: Sun, 12 Oct 2014 17:14:56 -0400
Subject: [PATCH] Updated assets/css/custom.css: removed space above header,
 logo aligned with nav elements.

Removed inline styling in server/2015/banner.html styling that was
incorporated @ custom.css.
---
 2015/assets/css/custom.css | 12 ++++++------
 server/2015/banner.html    |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/2015/assets/css/custom.css b/2015/assets/css/custom.css
index c136d5c2..4afe7d5f 100644
--- a/2015/assets/css/custom.css
+++ b/2015/assets/css/custom.css
@@ -28,11 +28,11 @@ h3 {
 }
 
 .lp-head img {
-  margin: 2.0em 0 0.001em 0.61em;
+  margin: 0.5em 0 0.001em -1.5em;
 }
 
 .lp-head p {
-   margin: 2.975em 0 0 -0.9em;
+   margin: 0.9em 0 0.001em -3.21em;
 }
 
 #lp-panel {
@@ -90,16 +90,16 @@ h3 {
 
 @media (min-width: 768px) and (max-width:991px) {
 	.lp-head img {
-		margin-top: 2.4em;
+		margin-top: 1.0em;
 	}
 	.lp-head p {
-		margin: 2.855em 0 0 -0.9em;
+		margin: 0.9em 0 0 -2.3em;
 	}
 }
 
 @media (min-width:1200px) {
 	.lp-head p {
-		margin: 2.975em 0 0 -4.1em;
+		margin: 0.9em 0 0.001em -6.21em;
 	}
 }
 
@@ -117,7 +117,7 @@ h3 {
 
 
 .btn-register-lp14 {
-	margin-top: 2em;
+	margin-top: 0.5em;
 	margin-bottom: 0.3em;
 	color: #ffffff;
 	text-shadow: 0px 0px 0px #ffffff;
diff --git a/server/2015/banner.html b/server/2015/banner.html
index 0f4a9db6..8179129a 100644
--- a/server/2015/banner.html
+++ b/server/2015/banner.html
@@ -9,11 +9,11 @@
 				<a href="/2015/">
 				  <img src="/2015/assets/img/site_logo_alternate.png"
 					   class="img-responsive"
-					   alt="[ LibrePlanet 2015 &mdash; Free Software Everywhere]" style="padding-top:5px; margin: 0.5em 0 0.001em -1.5em;"/>
+					   alt="[ LibrePlanet 2015 &mdash; Free Software Everywhere]" />
 				</a>
 			  </div>
 			  <div class="col-sm-3">
-				<p class="text-muted" style="margin: 1.475em 0 0.001em -6.21em !important;">
+				<p class="text-muted">
 				  <strong>March 21-22<br />
 					Cambridge, MA</strong><br />
 				  Registration opens in October</p>
@@ -80,12 +80,12 @@
 
 
 	    <div class="col-sm-offset-3 col-sm-3"> <!-- Start of register button -->
-	    <a class="btn btn-register-lp14 btn-lg btn-block" style="margin-top: 0.5em !important;"
+	    <a class="btn btn-register-lp14 btn-lg btn-block"
 	    href="https://crm.fsf.org/civicrm/event/register?reset=1&amp;id=20">
 	    <span class="glyphicon glyphicon-ok"></span>
 	    Register now
 	    </a>
-	    <p class="text-muted text-center" style="margin: 0 0 34px !important;">
+	    <p class="text-muted text-center">
 	    gratis for members and students!
 	    </p>
 	    </div> <!--end of Register button -->
-- 
2.25.1