The FSF donate link is part of the nav section instead of a seperate

button.

diff --git a/2014/anti-harassment/index.html b/2014/anti-harassment/index.html
index f252834e508bd51dda5b1f033112cb2786d134c4..ab4ab01e5e8d382c8a77ecffcfd80de763f87641 100644 (file)
--- 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 7c4cb617205a56e6f0f074311a5e0c27b565a1d4..a4c0d21e611f871706aa0066dfb4be17d7c7e25b 100644 (file)
--- 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 abead8554b852d15abb2555380a187cc5f851827..77c2800e07ffc1156071f25fae10603b540bdbde 100644 (file)
--- 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 8cfeacf7f89f8c5e954c7917d12f5ee0512c1718..c18afb1cc8f8dead43d247558f188b6c14cfa203 100644 (file)
--- 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 -->