From b8f1638ebcc698bd6b0d8bbbd73482fae3424e7f Mon Sep 17 00:00:00 2001
From: rsiddharth <rsiddharth@ninthfloor.org>
Date: Wed, 16 Oct 2013 21:26:47 +0530
Subject: [PATCH] put LP14 text in the same container as the carousel.

---
 server/staging/lpc14/index.html | 36 +++++++++++++++++----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/server/staging/lpc14/index.html b/server/staging/lpc14/index.html
index 6a1c60e3..532399e4 100644
--- a/server/staging/lpc14/index.html
+++ b/server/staging/lpc14/index.html
@@ -79,7 +79,7 @@
 		</div> <!-- end of header container -->
 	  </div> <!-- end of lp banner -->
 
-	  <div class="container"> <!-- start of carousel container -->
+	  <div class="container"> <!-- start of container -->
 		<div class="row"> 
 
 		  <div class="col-sm-3"> <!-- start of nav items -->
@@ -104,7 +104,7 @@
 			</ul>
 		  </div> <!-- end of nav items -->
 
-		  <div class="col-sm-9"> <!-- start of carousel column -->
+		  <div class="col-sm-9"> <!-- start of content column -->
 
 			<!-- start of carousel -->
 			<div id="lpc-carousel" class="carousel slide">
@@ -136,7 +136,7 @@
 				  <p class="lead carousel-caption-bl">
 					We're collecting suggestions for LibrePlanet 2014
 					
-<a class="btn btn-default"
+					<a class="btn btn-default"
 					   href="https://libreplanet.org/wiki/LibrePlanet:Conference/2014/Conference_brainstorm_page">
 					  Share your ideas
 					</a>
@@ -146,7 +146,8 @@
 				  <img src="/2014/i/lp13-presentation.jpg"
 					   alt="[ A presentation at LibrePlanet 2013]">
 				  <p class="lead carousel-caption-tl">
-					Volunteers are crucial in planing LibrePlanet<br><a class="btn btn-default" href="https://libreplanet.org/2014/volunteer">
+					Volunteers are crucial in planing LibrePlanet<br>
+					<a class="btn btn-default" href="https://libreplanet.org/2014/volunteer">
 					  Join the planning committee
 					</a>
 				</li>
@@ -159,21 +160,22 @@
 				<span class="glyphicon glyphicon-chevron-right"></span>
 			  </a>
 			</div> <!-- end of carousel -->
-		  </div> <!-- end of carousel column -->
 
-		</div>
-	  </div> <!-- end of carousel container -->
+			<div class="margin-top"> <!-- start of LP14 text -->
+			  <p class="lead">
+				LibrePlanet is an annual conference of the global free
+				software community. Join software developers, policy
+				experts, activists and computer users to learn skills,
+				share accomplishments and face challenges. Newcomers
+				are always welcome.</p>
+
+			  <p>
+				Theme text placeholder.
+			  </p>
+			</div> <!-- end of LP14 text -->
+
+		  </div> <!-- end of content column -->
 
-	  <div class="container"> <!-- start of container -->
-		<div class="row margin-top">
-
-		  <div class="col-sm-offset-3 col-sm-9"> <!-- start of LPC 14 main text -->
-			<p class="lead">
-			  LibrePlanet is an annual conference of the global free software community. Join software developers, policy experts, activists and computer users to learn skills, share accomplishments and face challenges. Newcomers are always welcome.</p>
-<p>
-Theme text placeholder.
-			</p>
-		  </div> <!-- end of LPC 14 main text -->
 		</div>
 	  </div> <!-- end of container -->
 
-- 
2.25.1