From 9d48a462515c7394de726382da602937dab91315 Mon Sep 17 00:00:00 2001
From: Zak Rogoff <zak@fsf.org>
Date: Fri, 23 Oct 2015 14:40:33 -0400
Subject: [PATCH] Aesthetic tweaks to the sidebar and the carousel captions.

---
 2016/assets/css/custom.css | 28 ++++++++++++++--------------
 2016/index.html            |  6 +++---
 server/2016/sidebar.html   |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/2016/assets/css/custom.css b/2016/assets/css/custom.css
index 717084aa..0689700d 100644
--- a/2016/assets/css/custom.css
+++ b/2016/assets/css/custom.css
@@ -393,6 +393,19 @@ hr {
   border-radius: 8px;
 }
 
+.carousel-caption-bottom {
+  color: rgb(51, 51, 51);
+  position: static;
+  z-index: 10;
+  height: 2em;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  font-size: larger;
+  text-align: center;
+  background-color: rgba(240, 240, 240, .8);
+  border-radius: 0px 0px 8px 8px;
+}
+
 @media screen and (min-width: 1280px) {
   .carousel-caption-tr {
     padding-bottom: 10px;
@@ -441,20 +454,6 @@ hr {
     right: 0;
 }
 
-.carousel-caption-bottom {
-  color: rgb(51, 51, 51);
-  position: static;
-  right: auto;
-  left: auto;
-  z-index: 10;
-  height: 50px;
-  padding-top: 1px;
-  padding-bottom: 1px;
-  text-align: center;
-  border-bottom: 3px solid rgba(88, 208, 121, 0.8);
-  background-color: rgba(250, 250, 250, 1);
-}
-
 /* Header */
 
 .lp-banner {
@@ -632,6 +631,7 @@ hr {
 .nav > li.fsf-donate > a {
   background-color: rgba(58, 208, 61, 0.6);
   margin-top: 20px;
+  color: white;
 }
 
 .nav > li > a:hover,
diff --git a/2016/index.html b/2016/index.html
index 5cc6ff06..1fe2e537 100755
--- a/2016/index.html
+++ b/2016/index.html
@@ -14,13 +14,13 @@
 				<img src="//static.fsf.org/nosvn/images/best-event-photos/lp2013-expand-the-tent-848x477.jpg"
 				alt="[ The Expanding the Tent panel at LibrePlanet 2013 ]">
 			<p class="carousel-caption-bottom">
-				Call for Sessions open until November 16th.<br><a href="https://my.fsf.org/civicrm/profile/create?gid=325&amp;reset=1">Submit a proposal today.</a></p>
+				Call for Sessions open until November 16th. <a href="https://my.fsf.org/civicrm/profile/create?gid=325&amp;reset=1">Submit a proposal today.</a></p>
 			</li>
 
 			<li class="item">
 				<img src="//static.fsf.org/nosvn/images/best-event-photos/lp2015-open-house-848x477.jpg"
 				alt="[ Open house at LibrePlanet 2015 ]">
-				<p class="carousel-caption-bottom"> <a href="https://crm.fsf.org/join">Join the Free Software Foundation</a> and get<br />gratis conference admission and other perks.
+				<p class="carousel-caption-bottom"> <a href="https://crm.fsf.org/join">Join the Free Software Foundation</a> and get gratis conference admission and other perks.
 				</p>
 			</li>
 
@@ -28,7 +28,7 @@
 			<img src="//static.fsf.org/nosvn/images/best-event-photos/fsf30-crypto-session-848x477.jpg"
 			alt="[ Crypto panel at the FSF 30th Anniversary User Freedom Summit ]">
 			<p class="carousel-caption-bottom">
-				Call for Sessions open until November 16th.<br><a href="https://my.fsf.org/civicrm/profile/create?gid=325&amp;reset=1">Submit a proposal today.</a></p>
+				Call for Sessions open until November 16th. <a href="https://my.fsf.org/civicrm/profile/create?gid=325&amp;reset=1">Submit a proposal today.</a></p>
 			</li>
 	</ul>
 
diff --git a/server/2016/sidebar.html b/server/2016/sidebar.html
index 05b90367..14e9025f 100755
--- a/server/2016/sidebar.html
+++ b/server/2016/sidebar.html
@@ -30,7 +30,7 @@
 		<ul class="nav nav-pills nav-stacked">
 			<li id="mailing-list-link"><a href="https://lists.gnu.org/mailman/listinfo/libreplanet-discuss">Join the discussion list</a></li>
 			<li id="getting_around-link"><a href="/2016/getting_around">Travel info</a></li>
-			<li><a href="https://crm.fsf.org/civicrm/contribute/transact?reset=1&amp;id=33">Build the scholarship fund</a></li>
+			<li><a href="https://my.fsf.org/civicrm/contribute/transact?reset=1&amp;id=33">Build the scholarship fund</a></li>
 			<li id="ahp-link"><a href="/2016/safe-space-policy/">Safe space policy</a></li>
 		</ul>
 
-- 
2.25.1