From c11cb7dd7dde432252768d6bdcee38b826e32211 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 26 Oct 2017 16:58:07 +0100
Subject: [PATCH] Added Twitter button to footer, moved header button outside
 form.

---
 about.html                                  |  7 +++-
 apk.html                                    |  7 +++-
 building.html                               |  7 +++-
 copyright.html                              |  7 +++-
 css/styles.css                              | 38 +++++++++++----------
 download.html                               |  7 +++-
 fdroid.html                                 |  7 +++-
 get-involved.html                           |  7 +++-
 hiring.html                                 |  7 +++-
 how-it-works.html                           |  7 +++-
 index.html                                  |  7 +++-
 news/2017-beta-released-security-audit.html |  7 +++-
 privacy.html                                |  7 +++-
 13 files changed, 92 insertions(+), 30 deletions(-)

diff --git a/about.html b/about.html
index ae179d1..41f5953 100644
--- a/about.html
+++ b/about.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -76,6 +78,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/apk.html b/apk.html
index f79f430..01268cf 100644
--- a/apk.html
+++ b/apk.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -80,6 +82,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/building.html b/building.html
index c201f92..341d63c 100644
--- a/building.html
+++ b/building.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -106,6 +108,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/copyright.html b/copyright.html
index fc31e57..d2ecdfd 100644
--- a/copyright.html
+++ b/copyright.html
@@ -15,10 +15,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -69,6 +71,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/css/styles.css b/css/styles.css
index 44dcba9..8119cfd 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -29,10 +29,8 @@ img {
     vertical-align:middle;
 }
 
-#twitterbutton {
-    width: 21px;
-    padding-left: 9px;
-    padding-top: 3px;
+.twitterbutton {
+    width: 24px;
 }
 
 #playbutton, #fdroidbutton {
@@ -149,6 +147,17 @@ figcaption {
 
 #signup2 {display:none;}
 
+#twitter {
+    float:right;
+    padding-left:12px;
+}
+
+#twitter2 {
+    float:left;
+    padding-left:15px;
+    padding-right:12px;
+}
+
 #signupform {
     height:30px;
     padding-bottom:10px;
@@ -157,13 +166,9 @@ figcaption {
 }
 
 #signupform2 {
-    height:auto;
-    padding-bottom:0;
+    height:30px;
     float:left;
-    width:80%;
-    font-size:1.5em;
-    padding-top:10px;
-    padding-left:0;
+    text-align:left;
 }
 
 #signupconf {
@@ -180,11 +185,10 @@ figcaption {
 #signupconf2 {
     display:none;
     float:left;
+    text-align:left;
     color:#fff;
-    font-size:1.2em;
+    font-size:0.9em;
     font-weight:bold;
-    padding-top:10px;
-    padding-left:15px;
 }
 
 #signupform input, textarea {
@@ -613,11 +617,9 @@ figcaption {
         margin:10px 10px 10px 15px;
     }
 
-    #footer {text-align:left;}
-
-    #footer form {
-        margin:10px 10px 0 15px;
-        padding:0;
+    #footer {
+        text-align:left;
+        margin-top:5px;
     }
 
     #signup2 {
diff --git a/download.html b/download.html
index 0d6fb67..2d34036 100644
--- a/download.html
+++ b/download.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -75,6 +77,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/fdroid.html b/fdroid.html
index cbbb332..b2a7db4 100644
--- a/fdroid.html
+++ b/fdroid.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -76,6 +78,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/get-involved.html b/get-involved.html
index 34593f3..56154e6 100644
--- a/get-involved.html
+++ b/get-involved.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -66,6 +68,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/hiring.html b/hiring.html
index 582e648..70a7839 100644
--- a/hiring.html
+++ b/hiring.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -63,6 +65,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/how-it-works.html b/how-it-works.html
index 872480e..4bd3a51 100644
--- a/how-it-works.html
+++ b/how-it-works.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -109,6 +111,9 @@ servers to block.</li>
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/index.html b/index.html
index fc4a1b2..06a0f1c 100644
--- a/index.html
+++ b/index.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -92,6 +94,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/news/2017-beta-released-security-audit.html b/news/2017-beta-released-security-audit.html
index d17e441..a496546 100644
--- a/news/2017-beta-released-security-audit.html
+++ b/news/2017-beta-released-security-audit.html
@@ -15,10 +15,12 @@
         <a href="../index.html"><div id="logo"><img src="../img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="../img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="../img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -127,6 +129,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="../img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/privacy.html b/privacy.html
index c8e986a..5500ab3 100644
--- a/privacy.html
+++ b/privacy.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
-              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -81,6 +83,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
-- 
GitLab