Merge branch 'pnav-box'

diff --git a/2015/live/index.html b/2015/live/index.html
index dfedd918b2afa5abec855cb43c571649b4dcbd1e..07b191914d7904f13964c558f8141b163cff9199 100755 (executable)
--- a/2015/live/index.html
+++ b/2015/live/index.html
@@ -5,7 +5,6 @@
 <!--#include virtual="/server/2015/banner.html"-->
 <!--#include virtual="/server/2015/sidebar.html"-->
 
-<div id="lp-content" class="col-sm-9"> <!-- start of content column -->
   <h1>LibrePlanet from anywhere</h1>
   <p>During LibrePlanet, this page will host streaming video of all sessions. If you plan to participate remotely, please bookmark it now and check back during the conference.</p>
 
@@ -13,9 +12,6 @@
 
   <p style="text-align:center"><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=14"><img src="//static.fsf.org/nosvn/donate.en.png" alt="Donate to the FSF" style="align:left; padding: 15px"></a></p>
 
-
-
-</div> <!-- end of content column -->
 <!--#include virtual="/server/2015/footer.html"-->
 <!--#include virtual="/server/2015/common_js.html"-->
 <script type="text/javascript">

diff --git a/2015/program/index.html b/2015/program/index.html
index 792840975025697feffccb7c3d566b651c136f8b..38754e7642f5103e15e7c5165f0c00783d277261 100755 (executable)
--- a/2015/program/index.html
+++ b/2015/program/index.html
@@ -8,13 +8,6 @@
 
 <h1>Program <small>Sessions</small></h1>
 
-<!--TO DO
-Final checkthrough
-Finish and comment in lightning talk signup page
-General spacing and formatting
-Fixed nav
--->
-
 <!--#include virtual="/server/2015/program-menu.html"-->
 
 <div id="lp-panel" class="panel panel-default hidden-xs">

diff --git a/2015/program/social.html b/2015/program/social.html
index 104df97b68defd976c252ac91fd94611d1d36a25..f1549507689ad3fc8c889dfd559c9c3b74134b48 100755 (executable)
--- a/2015/program/social.html
+++ b/2015/program/social.html
@@ -55,9 +55,9 @@
                                        <h4>LibrePlanet Party!</h4>
                                        <p>Enjoy appetizers and pool provided by the FSF and spend time with the LibrePlanet community. Flat Top Johnny's has a full bar and kitchen, as is open to all ages. The restaurant is only nine minutes away from the conference on foot.</p>
                                        <p class="session-details">
-                                               When: 19:00 - 22:00, Saturday, 3/21</br>
+                                               When: 19:00 - 22:00, Saturday, 3/21<br/>
                                                Where: <a href="http://www.flattopjohnnys.com/">Flat Top Johnny's</a> at 1 Kendall Square,
-                                               Cambridge, MA, 02139</br>
+                                               Cambridge, MA, 02139<br/>
                                                Wheelchair access: On Binney Street
                                        </p>
                                </div>

diff --git a/2015/program/speakers.html b/2015/program/speakers.html
index dbe788132a316ebbc4e8ca3edd9ef6bb6cf28511..3e9e3dfb117617cd53962e9d0c976bbd1e432dcb 100755 (executable)
--- a/2015/program/speakers.html
+++ b/2015/program/speakers.html
@@ -2,7 +2,6 @@
 
 <title>LibrePlanet 2015 &mdash; Speakers </title>
 
-<!--#include virtual="/server/2015/header.html"-->
 <!--#include virtual="/server/2015/banner.html"-->
 <!--#include virtual="/server/2015/sidebar.html"-->