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

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 16/11/19 13:04:16

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

Log message:
        body-include-2: fix an ampersand, 2 alternative texts for the join-fsf 
button. head-include-1: adjust positions, sizes and margins, add the desktop 
background image.

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

Patches:
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/fundraiser/body-include-2.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- body-include-2.html 18 Nov 2016 21:43:07 -0000      1.2
+++ body-include-2.html 19 Nov 2016 13:04:15 -0000      1.3
@@ -25,7 +25,7 @@
 sustaining this work. 
 Join now for $10/month and help freedom thrive.</p>
 
-<p id="join-fsf"><a 
href="http://fsf.org/jfb?pk_campaign=2016_Fundraiser_Banner&pk_kwd=Join";>JOIN&nbsp;THE&nbsp;FSF</a></p>
+<p id="join-fsf"><a 
href="http://fsf.org/jfb?pk_campaign=2016_Fundraiser_Banner&amp;pk_kwd=Join";>JOIN&nbsp;<span
 class="fundraiser">NOW</span><span class="normal">THE&nbsp;FSF</span></a></p>
 </div><!-- /fsf-frame -->
 
 <div id="gnu-banner">

Index: head-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/fundraiser/head-include-1.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- head-include-1.html 18 Nov 2016 21:51:13 -0000      1.2
+++ head-include-1.html 19 Nov 2016 13:04:15 -0000      1.3
@@ -8,11 +8,22 @@
 <link rel="stylesheet" href="/mini.css" media="handheld" />
 <link rel="stylesheet" href="/layout.min.css" media="screen" />
 <link rel="stylesheet" href="/print.min.css" media="print" />
+
 <style type="text/css" media="screen">
 #header {
-   background: #effbfb;
-   background: linear-gradient(150deg, #f5fcfc, #d1ebeb);
-   padding-bottom: 1px
+   position: relative;
+   padding-bottom: 1px;
+/*   background: linear-gradient(150deg, #f5fcfc, #d1ebeb); */
+   background: #effbfb 
url(//static.fsf.org/nosvn/banners/2016fundraiser/img/background-desktop.jpg) 
no-repeat;
+   background-position: 100% 100%;
+   background-size: auto 100%; 
+}
+#translations {
+   background: #efede6;
+   border-color: #d7d4c5;
+}
+#fsf-frame {
+   margin-bottom: 0;
 }
 #fssbox, #fsf-support, #fundraiser, .progress {
    display: none;
@@ -31,21 +42,26 @@
    color: white;
    background: #fa5c64;
 }
+#join-fsf span.fundraiser {
+   display: none;
+}
 .progress {
    clear: left;
-   width: 48%;
-   font-size: 1em;
-   line-height: 1.1em;
+   width: 50%;
+   font-size: .9em;
+   line-height: 1em;
    text-align: right;
    margin: 3em 0 1em;
    background: #d7d4c5;
    border: .1em solid #b6ac93;
+   position: absolute;
+   bottom: -.3em;
 }
 .progress-bar {
    float: left;
    font-size: 1.1em;
-   line-height: 1.2em;
-   margin: -.2em 0 0 -.1em;
+   line-height: 1.1em;
+   margin: -.1em 0 0 -.1em;
    position: relative;
    width: 1.5em; min-width: 1.8em;
    background: #fc7b82;
@@ -61,37 +77,40 @@
    -webkit-border-radius: 1em;
    -opera-border-radius: 1em;
 }
-
 @media (min-width: 30em) {
    p#join-fsf {
       display: block;
       float: right;
-      margin-bottom: 0;
+      margin: 0 0 0 2em;
    }
    #gnu-banner {
-      clear: right;
-      padding-top: 0;
+      float: left;
+      padding-top: .4em;
    }
 }
-
 @media (min-width: 40em) {
-   #fundraiser, .progress {
+   p#fundraiser, .progress {
       display: block;
    }
    p#join-fsf {
       float: none;
-      text-align: left;
-      margin: 0 0 1em 35%;
+      font-size: 1.1em;
+      margin: 0 15% 1.2em 0;
+   }
+   #join-fsf span.fundraiser {
+      display: inline;
+   }
+   #join-fsf span.normal {
+      display: none;
    }
    #gnu-banner {
       clear: none;
       float: left;
       max-width: 50%;
       padding-top: .5em;
-      margin-bottom: 1.2em;
    }
    #fsf-frame {
-      max-width: 45%;
+      max-width: 48%;
       text-align: right;
    }
 }