From: Zak Rogoff <zak@montage.office.fsf.org>
Date: Fri, 16 Jan 2015 21:59:23 +0000 (-0500)
Subject: Fixing weird disappearance of CSS and sidebar program button I added. I think I didn... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=933205b1967990095b609f0754cad7a063629105;p=libreplanet-static.git

Fixing weird disappearance of CSS and sidebar program button I added. I think I didn't commit something properly before?
---

diff --git a/2015/assets/css/custom.css b/2015/assets/css/custom.css
index ac40a4a2..441e3854 100644
--- a/2015/assets/css/custom.css
+++ b/2015/assets/css/custom.css
@@ -8,11 +8,11 @@ body {
 }
 
 h2, h3  {
-	color: rgb(88, 208, 121);
+  color: rgb(88, 208, 121);
 }
 
 h2 small, h2 .small, h3 small, h3 .small {
-	color: rgb(60, 142, 83);
+  color: rgb(60, 142, 83);
 }
 
 h3 {
@@ -73,7 +73,7 @@ hr {
 }
 
 .lp-head p {
-   margin: -0.79em 0 0.001em -4em;
+  margin: -0.79em 0 0.001em -4em;
 }
 
 .lp-signup {
@@ -121,81 +121,81 @@ hr {
 }
 
 @media (max-width:551px) {
-	.lp-head p {
-		margin: 0 0 0.2em 0;
-		text-align: center;
-	}
-	.lp-head img {
-		margin: 1.5em auto 0.5em auto;
-	}
+  .lp-head p {
+    margin: 0 0 0.2em 0;
+    text-align: center;
+  }
+  .lp-head img {
+    margin: 1.5em auto 0.5em auto;
+  }
 
-	#lp-panel {
-		max-width: 100%;
-		margin-left: 0;
-		float: none;
-	}
+  #lp-panel {
+    max-width: 100%;
+    margin-left: 0;
+    float: none;
+  }
 
 }
 
 @media (min-width: 552px) and (max-width:767px) {
 
-	.lp-head img {
-		margin: 1.5em auto 0.5em auto;
-	}
-	.lp-head p {
-		margin: 0.27em 0 0.001em -3.6em;
-	}
+  .lp-head img {
+    margin: 1.5em auto 0.5em auto;
+  }
+  .lp-head p {
+    margin: 0.27em 0 0.001em -3.6em;
+  }
 
-	#lp-panel {
-		max-width: 100%;
-		margin-left: 0;
-		float: none;
-	}
+  #lp-panel {
+    max-width: 100%;
+    margin-left: 0;
+    float: none;
+  }
 
-	#lp-updates {
-		max-width: 100%;
-		margin-left: 0;
-	}
+  #lp-updates {
+    max-width: 100%;
+    margin-left: 0;
+  }
 }
 
 .lp-thumbnail {
-	float: right;
-	margin-left: 0.5em;
+  float: right;
+  margin-left: 0.5em;
 }
 
 
 @media (max-width: 635px) {
-	.lp-thumbnail {
-		float: none;
-		margin-left: 0;
-	}
+  .lp-thumbnail {
+    float: none;
+    margin-left: 0;
+  }
 }
 
 
 @media (min-width: 768px) and (max-width:991px) {
-	.lp-head img {
-		margin-top: 1.0em;
-	}
-	.lp-head p {
-		margin: -0.45em 0 0.001em -3.6em;
-	}
+  .lp-head img {
+    margin-top: 1.0em;
+  }
+  .lp-head p {
+    margin: -0.45em 0 0.001em -3.6em;
+  }
 }
 
 @media (min-width:1200px) {
-	.lp-head p {
-		margin: -0.79em 0 0.001em -7em;
-	}
+  .lp-head p {
+    margin: -0.79em 0 0.001em -7em;
+  }
 }
 
 @media (min-width:1280px) {
-	.btn-block {
-		display: block;
-		margin-right:auto;
-		margin-left:auto;
-		width: 85%;
-		padding-right: 0;
-		padding-left: 0;
-	}
+  .btn-block {
+    display: block;
+    margin-right:auto;
+    margin-left:auto;
+    width: 85%;
+    padding-right: 0;
+    padding-left: 0;
+  }
 }
 
 
@@ -207,20 +207,20 @@ hr {
 }
 
 @media (max-width:768px) {
-	.fsf-donate-button {
-	  margin-left: 38%;
-	  margin-top: 5px;
-	  margin-bottom: 10px;
-	  width:22%;
-	}
+  .fsf-donate-button {
+    margin-left: 38%;
+    margin-top: 5px;
+    margin-bottom: 10px;
+    width:22%;
+  }
 }
 
 @media (min-width:320px) and (max-width:360px) {
   .fsf-donate-button {
-	margin-left: 28%;
-	margin-top: 5px;
-	margin-bottom: 10px;
-	width:46%;
+    margin-left: 28%;
+    margin-top: 5px;
+    margin-bottom: 10px;
+    width:46%;
   }
 }
 
@@ -253,9 +253,9 @@ hr {
   border: 1px solid #cccccc;
   border-radius: 4px;
   -webkit-box-shadow: none;
-          box-shadow: none;
+  box-shadow: none;
   -webkit-transition: border-color ease-in-out 0.15s;
-          transition: border-color ease-in-out 0.15s;
+  transition: border-color ease-in-out 0.15s;
 }
 
 .form-control:focus {
@@ -266,7 +266,7 @@ hr {
 }
 
 .scholarship-input-annotation {
-	margin-bottom: -0.6em;
+  margin-bottom: -0.6em;
 }
 
 .lp-signup .form-group {
@@ -274,7 +274,7 @@ hr {
 }
 
 .lp-label-news {
-	display: inline-block;
+  display: inline-block;
 }
 
 .checkbox .help-block {
@@ -285,19 +285,19 @@ hr {
 }
 
 .form-group .lp-left-form-checkbox-text {
-	text-align:right;
-	font-weight: bold;
+  text-align:right;
+  font-weight: bold;
 }
 
 @media screen and (min-width: 320px) and (max-width: 768px){
-	.form-group .lp-left-form-checkbox-text {
-		text-align: left;
-		font-weight: bold;
-	}
+  .form-group .lp-left-form-checkbox-text {
+    text-align: left;
+    font-weight: bold;
+  }
 }
 
 .field-required {
-	color: rgba(128, 0, 0, 0.6);
+  color: rgba(128, 0, 0, 0.6);
 }
 
 .radio-inline,
@@ -341,19 +341,19 @@ hr {
 }
 
 @media (min-width:768px) {
-	.nav {
-	  padding-left: 0;
-	  margin-bottom: 0;
-	  list-style: none;
-	  padding-top: 1.0em;
-	}
-	.lp-home {
-      padding-top: 2.0em;
-      padding-bottom: 1.0em;
-	}
-	.nav-padding-top {
-      margin-top: 4.12em;
-	}
+  .nav {
+    padding-left: 0;
+    margin-bottom: 0;
+    list-style: none;
+    padding-top: 1.0em;
+  }
+  .lp-home {
+    padding-top: 2.0em;
+    padding-bottom: 1.0em;
+  }
+  .nav-padding-top {
+    margin-top: 4.12em;
+  }
 }
 
 .nav > li {
@@ -399,8 +399,8 @@ hr {
 }
 
 .btn-carousel {
-	font-size: 1.15em;
-	font-weight: 100;
+  font-size: 1.15em;
+  font-weight: 100;
 }
 
 .carousel-control .icon-prev,
@@ -485,23 +485,23 @@ hr {
 @media screen and (min-width: 1280px) {
   .carousel-caption-tr {
     padding-bottom: 10px;
-	margin-left: 65px;
-	margin-right: auto;
+    margin-left: 65px;
+    margin-right: auto;
   }
 
   .carousel-caption-bl {
     padding-bottom: 10px;
-	margin-left: auto;
-	margin-right: 65px;
+    margin-left: auto;
+    margin-right: 65px;
   }
 
 }
 
 @media screen and (min-width: 600px) and (max-width: 980px){
-	.btn-carousel {
-		font-size: 0.9em;
-		font-weight: 200;
-	}
+  .btn-carousel {
+    font-size: 0.9em;
+    font-weight: 200;
+  }
 }
 
 @media screen and (min-width: 320px) and (max-width: 480px){
@@ -510,8 +510,8 @@ hr {
   }
 
   .btn-carousel {
-	  font-size: 0.85em;
-	  font-weight: 200;
+    font-size: 0.85em;
+    font-weight: 200;
   }
   .carousel-caption-tr {
     left: 1%;
@@ -521,7 +521,7 @@ hr {
 
 
 .margin-top {
-	margin-top: 22px;
+  margin-top: 22px;
 }
 
 .speaker {
@@ -529,11 +529,11 @@ hr {
 }
 
 .session-speaker h3 {
-	margin-top: 0em;
+  margin-top: 0em;
 }
 
 .session-speaker {
-	margin-top: 1.8em;
+  margin-top: 1.8em;
 }
 
 .speaker-photo {
@@ -542,11 +542,11 @@ hr {
 }
 
 .lp-video {
-	width: 100%;
+  width: 100%;
 }
 
 .word-break {
-	word-break: break-all;
+  word-break: break-all;
 }
 
 /* Footer - adapted from <http://getbootstrap.com/examples/sticky-footer/>
@@ -574,5 +574,5 @@ body {
 }
 
 #footer .container p {
-	margin: 1.4em 0;
+  margin: 1.4em 0;
 }
diff --git a/server/2015/sidebar.html b/server/2015/sidebar.html
index ecc1de53..de47e0cd 100755
--- a/server/2015/sidebar.html
+++ b/server/2015/sidebar.html
@@ -11,7 +11,7 @@
 
             <ul class="nav nav-pills nav-stacked" style="padding-top: 0 !important;">
               <!--<li id="cfs-link"><a href="/2015/call_for_sessions">Propose a Session</a></li>-->
-              <!--<li><a href="/2015/program">Program</a></li>-->
+              <li><a href="/2015/program">Program</a></li>
               <!--<li><a href="/2015/program/exhibit_hall.html">Exhibit hall</a></li>-->
               <li id="exhibit-link"><a href="/2015/exhibit">Join the Exhibit Hall</a></li>
               <li id="volunteer-link"><a href="/2015/volunteer">Volunteer</a></li>
@@ -59,7 +59,7 @@
 
 				<strong>01/16/2015:</strong> <a href="https://www.fsf.org/blogs/community/free-software-everywhere-in-the-libreplanet-2015-program">Draft program announced</a></li>
           <li class="list-group-item"><strong>12/11/2014:</strong> <a href="https://www.fsf.org/blogs/community/how-many-libreplanet-scholarships-will-we-give">Karen Sandler announced as keynote speaker</a></li>
-        
+
 			</ul>
           </div> <!-- end of sidebar column -->
           <div id="lp-content" class="col-sm-9"> <!-- start of content column -->