From d7d8192f30a0375315eb759e3915395b663ca4f0 Mon Sep 17 00:00:00 2001
From: rsiddharth <rsd@gnu.org>
Date: Tue, 24 May 2016 22:50:33 +0000
Subject: [PATCH] add back "join the announcement list".

---
 2016/assets/css/custom.css   |  1 +
 2016/includes/banner.html    |  9 ++++-----
 2016/includes/common_js.html | 16 ++++++++++++++--
 2016/includes/join-list.html |  4 ++--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/2016/assets/css/custom.css b/2016/assets/css/custom.css
index f5495b6a..10d86ce6 100644
--- a/2016/assets/css/custom.css
+++ b/2016/assets/css/custom.css
@@ -213,6 +213,7 @@ hr {
 .checkbox .help-block {
   display: inline-block;
   margin-top: 0;
+  margin-left: 0;
   margin-bottom: 10px;
   color: #737373;
 }
diff --git a/2016/includes/banner.html b/2016/includes/banner.html
index 32aa9ef1..26ab0c08 100755
--- a/2016/includes/banner.html
+++ b/2016/includes/banner.html
@@ -22,12 +22,11 @@
           Cambridge, Massachusetts</strong>
 				</p>
 			  </div>
+                          <!-- #top-right-desktop start -->
+                          <!--#include virtual="/2016/includes/join-list.html"-->
+                          <!-- #top-right-desktop end -->
 			</div><!-- end of lp header -->
 
-            <!-- Start of register button -->
-	        <div class="col-sm-6 col-xs-12">
-
-	        </div> <!-- end of Register button  -->
 		  </div>
 		</div> <!-- end of header container -->
       </div> <!-- end of lp banner -->
@@ -57,8 +56,8 @@
           </div>
 
           <div class="collapse navbar-collapse" id="lp-navbar-collapse">
+
             <ul class="nav navbar-nav">
-              <li><!--#include virtual="/2016/includes/register-now.html"--></li>
               <!--#include virtual="/2016/includes/nav-list-1.html"-->
             </ul>
 
diff --git a/2016/includes/common_js.html b/2016/includes/common_js.html
index 90259fb1..638fd0db 100755
--- a/2016/includes/common_js.html
+++ b/2016/includes/common_js.html
@@ -14,14 +14,26 @@ function logoTextStack() {
     if(screenSize <= 551) {
         $("#lp16-logo").removeClass("col-xs-5");
         $("#lp16-date-place").removeClass("col-xs-2");
-        $("#lp-signup-block").removeClass("col-xs-5");
     }else if(!$("#lp16-logo").hasClass("col-xs-5")) {
 		$("#lp16-logo").addClass("col-xs-5");
         $("#lp16-date-place").addClass("col-xs-2");
-        $("#lp-signup-block").addClass("col-xs-5");
     }
 }
 </script>
+<script>
+ $(document).ready(place_signup);
+ $(window).resize(place_signup);
+
+ function place_signup() {
+     screen_width = $(window).width();
+
+     if(screen_width <= 767) {
+         $('#lp-signup-block').prependTo('#lp-navbar-collapse');
+     }else {
+         $('#lp-signup-block').appendTo('.lp-head');
+     }
+ }
+</script>
 <script>
  $(document).ready(lp_sidebar_place);
  $(window).resize(lp_sidebar_place);
diff --git a/2016/includes/join-list.html b/2016/includes/join-list.html
index fa23ed51..7436a0c2 100644
--- a/2016/includes/join-list.html
+++ b/2016/includes/join-list.html
@@ -1,5 +1,5 @@
 <!-- start of signup form-->
-<div id="lp-signup-block" class="col-sm-6 col-xs-5">
+<div id="lp-signup-block" class="col-sm-offset-1 col-sm-5 col-xs-12">
   <form class="lp-signup"
         action="https://my.fsf.org/civicrm/profile/create?gid=285&amp;reset=1"
         method="post" name="Edit" id="Edit">
@@ -45,7 +45,7 @@
 			<span class="text-muted">Also join the FSF's newsletter</span>
           </label>
           <p class="help-block">
-			<span class="hidden-xs">&middot;</span>
+	    &middot;
             <a href="https://my.fsf.org/donate/privacypolicy.html">
               Read our privacy policy.
             </a>
-- 
2.25.1