From f59ca556db4b714003fa953414bb1e33bdf320eb Mon Sep 17 00:00:00 2001
From: rsiddharth <rsd@gnu.org>
Date: Mon, 7 Oct 2013 22:00:52 +0530
Subject: [PATCH] The FSF donate link is part of the nav section instead of a
 seperate button.

---
 2014/anti-harassment/index.html | 8 +-------
 2014/assets/css/custom.css      | 8 ++++++--
 2014/javascript/index.html      | 8 +-------
 server/staging/lpc14/index.html | 8 +-------
 4 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/2014/anti-harassment/index.html b/2014/anti-harassment/index.html
index f252834e..ab4ab01e 100644
--- a/2014/anti-harassment/index.html
+++ b/2014/anti-harassment/index.html
@@ -93,14 +93,8 @@
 			  <li><a href="http://libreplanet.org/wiki/LibrePlanet:Conference/2013/Video"> LibrePlanet 2013 videos</a></li>
 			  <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference">Previous conferences</a></li>
 			  <li class="active"><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>
+			  <li class="fsf-donate"><a href="https://static.fsf.org/nosvn/donate.en.png"> Donate to the FSF</a></li>
 			</ul>
-			<div class="fsf-donate-button">
-			  <a  href="#">
-				<img class="img-responsive"
-					 src="https://static.fsf.org/nosvn/donate.en.png"
-					 alt="[ Donate to the FSF ]" />
-			  </a>
-			</div>
 		  </div> <!-- end of nav items -->
 
 		  <div class="col-sm-9"> <!-- start of anti-harassment column -->
diff --git a/2014/assets/css/custom.css b/2014/assets/css/custom.css
index 7c4cb617..a4c0d21e 100644
--- a/2014/assets/css/custom.css
+++ b/2014/assets/css/custom.css
@@ -171,10 +171,14 @@ body {
   transition: background-color 1s;
 }
 
+.nav > li.fsf-donate > a {
+  background-color: rgba(128, 0, 0, 0.6);
+}
+
 .nav > li > a:hover,
 .nav > li > a:focus {
   text-decoration: none;
-  background-color: rgba(128, 0, 0, 0.8);
+  background-color: rgba(128, 0, 0, 0.7);
 }
 
 .nav-pills > li > a {
@@ -186,7 +190,7 @@ body {
 .nav-pills > li.active > a:hover,
 .nav-pills > li.active > a:focus {
   color: #ffffff;
-  background-color: rgba(128, 0, 0, 0.8);
+  background-color: rgba(128, 0, 0, 0.7);
 }
 
 .carousel-control .icon-prev,
diff --git a/2014/javascript/index.html b/2014/javascript/index.html
index abead855..77c2800e 100644
--- a/2014/javascript/index.html
+++ b/2014/javascript/index.html
@@ -90,14 +90,8 @@
 			  <li><a href="http://libreplanet.org/wiki/LibrePlanet:Conference/2013/Video"> LibrePlanet 2013 videos</a></li>
 			  <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference">Previous conferences</a></li>
 			  <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>
+			  <li class="fsf-donate"><a href="https://static.fsf.org/nosvn/donate.en.png"> Donate to the FSF</a></li>
 			</ul>
-			<div class="fsf-donate-button">
-			  <a  href="#">
-				<img class="img-responsive"
-					 src="https://static.fsf.org/nosvn/donate.en.png" 
-					 alt="[ Donate to the FSF ]" />
-			  </a>
-			</div>
 		  </div> <!-- end of nav items -->
 
 		  <div class="col-sm-8"> <!-- start of LPC 14 main text -->
diff --git a/server/staging/lpc14/index.html b/server/staging/lpc14/index.html
index 8cfeacf7..c18afb1c 100644
--- a/server/staging/lpc14/index.html
+++ b/server/staging/lpc14/index.html
@@ -87,14 +87,8 @@
 			  <li><a href="http://libreplanet.org/wiki/LibrePlanet:Conference/2013/Video"> LibrePlanet 2013 videos</a></li>
 			  <li><a href="https://libreplanet.org/wiki/LibrePlanet:Conference">Previous conferences</a></li>
 			  <li><a href="/2014/anti-harassment/">Anti-harassment policy</a></li>
+			  <li class="fsf-donate"><a href="https://static.fsf.org/nosvn/donate.en.png"> Donate to the FSF</a></li>
 			</ul>
-			<div class="fsf-donate-button">
-			  <a  href="#">
-				<img class="img-responsive"
-					 src="https://static.fsf.org/nosvn/donate.en.png"
-					 alt="[ Donate to the FSF ]" />
-			  </a>
-			</div>
 		  </div> <!-- end of nav items -->
 
 		  <div class="col-sm-9"> <!-- start of carousel column -->
-- 
2.25.1