Merge branch 'pnav-box'

diff --git a/2015/assets/css/custom.css b/2015/assets/css/custom.css
index 2f334ddb3f95f7c420845574f8c2dc65d3f6a1fd..793e0a55ed1a3180aa0329de7ded7b348e968f27 100644 (file)
--- a/2015/assets/css/custom.css
+++ b/2015/assets/css/custom.css
@@ -53,7 +53,15 @@ hr {
 #lp-panel {
   max-width: 32%;
   margin-left: 0.3em;
-  float: right;
+  position: fixed;
+  right: 1%;
+  top: 20%;
+}
+
+#lp-mini-nav {
+  position: fixed;
+  bottom: 0%;
+  right: 1%;
 }
 
 #lp-panel ul {
@@ -143,9 +151,8 @@ hr {
   #lp-panel {
     max-width: 100%;
     margin-left: 0;
-    float: none;
+       position: static;
   }
-
 }
 
 @media (min-width: 552px) and (max-width:767px) {
@@ -160,7 +167,7 @@ hr {
   #lp-panel {
     max-width: 100%;
     margin-left: 0;
-    float: none;
+       position: static;
   }
 
   #lp-updates {

diff --git a/2015/program/index.html b/2015/program/index.html
index 3ec0b028301d53ffceb917a7c0f77c1026c641dd..38754e7642f5103e15e7c5165f0c00783d277261 100755 (executable)
--- a/2015/program/index.html
+++ b/2015/program/index.html
@@ -23,10 +23,10 @@
        </div>
 </div>
 
-<p>All times are in Eastern Daylight Time (EDT), which is UTC - 4 hours. In room numbers, "32-" refers to MIT Building 32 (the Stata Center), where all conference rooms are located.</p>
-
 <div class="row"> <!-- session row start -->
        <div class="col-sm-9"> <!-- session column start -->
+         <p>All times are in Eastern Daylight Time (EDT), which is UTC - 4 hours. In room numbers, "32-" refers to MIT Building 32 (the Stata Center), where all conference rooms are located.</p>
+
                <h1 id="saturday">Saturday, March 21</h1>
                <hr>
                <h2><small>09:00 - 09:45: Registration and Breakfast</small></h2>
@@ -398,6 +398,13 @@
 </div> <!-- session column end -->
 </div> <!-- session row end -->
 
+<div id="lp-mini-nav" class="visible-xs">
+  <ul class="list-inline">
+       <li><a class="btn btn-default btn-xs" href="#saturday">Saturday sessions</a></li>
+       <li><a class="btn btn-default btn-xs" href="#sunday">Sunday sessions</a></li>
+  </ul>
+</div>
+
 
 <!--#include virtual="/server/2015/footer.html"-->
 <!--#include virtual="/server/2015/common_js.html"-->