www/server/staging/fundraiser body-include-2.ht...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 17/11/14 18:14:39

Modified files:
        server/staging/fundraiser: body-include-2.html 
                                   head-include-2.html 

Log message:
        Fundraiser between translist and banner; change navbar color; minor 
fixes.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/body-include-2.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/head-include-2.html?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/fundraiser/body-include-2.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- body-include-2.html 14 Nov 2017 17:46:34 -0000      1.6
+++ body-include-2.html 14 Nov 2017 23:14:39 -0000      1.7
@@ -1,4 +1,26 @@
 <!-- start of server/body-include-2 -->
+<div id="fundraiser">
+<div class="progress">
+<div class="progress-bar">
+<span class="percentage"><span class="gnun-split"></span><!--#echo 
encoding="none" var="d_value" --></span>
+</div>
+<div class="goal-div">
+<span class="goal">$450,000</span>
+</div>
+</div>
+
+<p>
+Associate members power up the Free Software Foundation.
+Help smash our goal of <b>700</b> new members
+or donate by December 31st!</p>
+<p class="contribute">
+<a class="donate" 
href="http://my.fsf.org/donate?pk_campaign=2017_Fundraiser_Banner&amp;pk_kwd=Donate";>
+Donate</a>
+<a class="join" 
href="http://my.fsf.org/join?pk_campaign=2017_Fundraiser_Banner&amp;pk_kwd=Join";>
+Join</a>
+</p>
+</div> <!-- /fundraiser -->
+
 <div id="header">
 <div id="fsf-frame">
 <div id="fssbox">
@@ -24,27 +46,6 @@
  <a href="/">
  <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] " 
/><strong>GNU</strong> Operating System</a>
 </div><!-- /gnu-banner -->
-<div id="fundraiser">
-<p>
-Associate members power up the Free Software Foundation.
-Help smash our goal of <b>700</b> new members
-or donate by December 31st!</p>
-<p class="contribute">
-<a class="donate" 
href="http://my.fsf.org/donate?pk_campaign=2017_Fundraiser_Banner&amp;pk_kwd=Donate";>
-Donate</a>
-<a class="join" 
href="http://my.fsf.org/join?pk_campaign=2017_Fundraiser_Banner&amp;pk_kwd=Join";>
-Join</a>
-</p>
-
-<div class="progress">
-<div class="progress-bar">
-<span class="percentage"><span class="gnun-split"></span><!--#echo 
encoding="none" var="d_value" --></span>
-</div>
-<div class="goal-div">
-<span class="goal">$450,000</span>
-</div>
-</div>
-</div> <!-- /fundraiser -->
 
 <div style="clear: both"></div>
 </div><!-- /header -->

Index: head-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/fundraiser/head-include-2.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- head-include-2.html 14 Nov 2017 17:46:34 -0000      1.6
+++ head-include-2.html 14 Nov 2017 23:14:39 -0000      1.7
@@ -2,16 +2,40 @@
 <!--#include virtual="/server/banners/sofar.html"
  --><meta name="viewport" content="width=device-width, initial-scale=1" />
 <style type="text/css" media="screen">
+#translations
+{
+  border-bottom: .2em solid #123e3f;
+}
 #header
 {
-  padding: 1em 3%;
   position: relative;
 }
+#fsf-frame
+{
+  margin: .3em 1em;
+} 
+#gnu-banner
+{
+  float: none;
+  padding-bottom: .5em;
+}
+#navigation
+{
+  background-color: #007b7c;
+}
+#navigation li
+{
+  border-bottom: .15em solid #007b7c;
+}
+ul#edu-navigation li.active,
+ul#edu-navigation li.current
+{
+   border-bottom: .15em solid #007b7c;
+}
+
 div#fundraiser
 {
   background-color: #123e3f;
-  padding: .3em 0 0 0;
-  margin-left: -3.2%; margin-right: -3.2%;
 }
 #fundraiser p
 {
@@ -39,6 +63,7 @@
   padding: 0 .5em 0 .5em;
   display: inline-block;
   margin: .5em;
+  text-decoration: none;
 }
 #fundraiser .donate
 {
@@ -60,24 +85,23 @@
 .progress
 {
   clear: left;
-  width: 100%;
-  line-height: 1.1em;
+  float: left;
+  width: 99%;
+  line-height: 1.2em;
   text-align: right;
-  margin: 0;
-  background: #2fa3a3;
+  margin-bottom: .5em;
+  padding-right: 1%;
+  background: #36a9aa;
   color: black;
-  float: left;
 }
 .progress-bar
 {
   float: left;
-  line-height: 1em;
+  line-height: 1.2em;
+  padding: 0 .2em;
   margin: 0;
   min-width: 3.5em;
   background: #feb916;
-  border: .05em solid #000;
-
-  position: absolute;
   text-align: center;
 }</style>
 <style type="text/css" media="screen"><!--#set var="bar"
@@ -91,11 +115,6 @@
 {
   margin-right: .1em;
 }
-#gnu-banner
-{
-  float: none;
-}
-.goal-div { position: relative; }
 
 @media (max-width: 21em)
 {