[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/fundraiser head-include-2.ht...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/fundraiser head-include-2.ht... |
|
Date: |
Wed, 23 Nov 2016 15:42:11 +0000 (UTC) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 16/11/23 15:42:11
Modified files:
server/staging/fundraiser: head-include-2.html
body-include-2.html
Log message:
Simplification by Ineiev, + minor margin and position adjustments.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/head-include-2.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/body-include-2.html?cvsroot=www&r1=1.4&r2=1.5
Patches:
Index: head-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/fundraiser/head-include-2.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- head-include-2.html 22 Nov 2016 08:47:47 -0000 1.4
+++ head-include-2.html 23 Nov 2016 15:42:11 -0000 1.5
@@ -3,8 +3,7 @@
--><meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css" media="screen">
#header {
- position: relative;
- padding-bottom: 1px;
+ padding: 1em 3%;
background: #effbfb url(background-desktop.1.jpg) no-repeat;
background-position: 100% 100%;
background-size: auto 100%;
@@ -14,18 +13,18 @@
border-color: #d7d4c5;
}
#fsf-frame {
- margin-bottom: 0;
+ margin: 0;
}
#fsf-frame p {
line-height: 1.4em;
}
-#fssbox, #fsf-support, #fundraiser, .progress {
+#fsf-support, #fundraiser, .progress {
display: none;
}
p#fundraiser {
float: right;
font-size: 1.1em;
- margin: .5em 0 1.5em 2em;
+ margin: 0 0 1.2em 2em;
}
#join-fsf a, #join-fsf a:visited {
color: white;
@@ -36,24 +35,24 @@
color: white;
background: #fa5c64;
}
+#gnu-banner {
+ padding: 0 0 .7em;
+ margin: 0;
+}
.progress {
clear: left;
width: 50%;
font-size: .9em;
- line-height: 1em;
+ line-height: 1.1em;
text-align: right;
- margin: 3em 0 1em;
+ margin: 2em 0 0;
background: #d7d4c5;
border: .1em solid #b6ac93;
- position: absolute;
- bottom: -.3em;
}
.progress-bar {
float: left;
- font-size: 1.1em;
- line-height: 1.1em;
- margin: -.1em 0 0 -.1em;
- position: relative;
+ line-height: 1em;
+ margin: 0;
width: 1.5em; min-width: 1.8em;
background: #fc7b82;
border: .1em solid #fa5c64;
@@ -73,37 +72,34 @@
-webkit-border-radius: 1em;
-opera-border-radius: 1em;
}
-/* For the home page*/
-#fssbox.emph-box {
- display: block;
- text-align: center;
- padding: 0 1.2em 1.2em;
- margin: 2em 0;
-}
-#fssbox.emph-box p {
- margin-top: 1em;
-}
@media (min-width: 30em) {
p#join-fsf {
display: block;
float: right;
- margin: 0 0 0 2em;
+ margin-left: 2em;
}
#gnu-banner {
float: left;
- padding-top: .4em;
- margin-bottom: .4em;
+ margin-bottom: 0;
}
}
@media (min-width: 40em) {
+ #header {
+ position: relative;
+ }
p#fundraiser, .progress {
display: block;
}
+ .progress {
+ float: left;
+ position: absolute;
+ bottom: 1em;
+ }
p#join-fsf {
float: none;
font-size: 1.1em;
- margin: 0 15% 1.2em 0;
+ margin: 0 15% .5em 2em;
}
#join-fsf span.normal {
display: none;
@@ -112,7 +108,7 @@
clear: none;
float: left;
max-width: 50%;
- padding-top: .5em;
+ padding-top: .4em;
}
#fsf-frame {
max-width: 48%;
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/fundraiser/body-include-2.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- body-include-2.html 19 Nov 2016 19:04:22 -0000 1.4
+++ body-include-2.html 23 Nov 2016 15:42:11 -0000 1.5
@@ -1,40 +1,23 @@
<!-- start of server/body-include-2 -->
<div id="header">
-<div id="fsf-frame">
-<div id="fssbox">
-<p><a href="http://www.fsf.org/fss";>Free Software Supporter</a></p>
-<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
method="post">
- <div>
- <input name="postURL" type="hidden" value="" />
- <input type="hidden" name="group[25]" value="1" />
- <input name="cancelURL" type="hidden"
value="https://crm.fsf.org/civicrm/profile?reset=1&gid=31"; />
- <input name="_qf_default" type="hidden" value="Edit:cancel" />
- </div>
- <p>
- <input type="text" id="frmEmail" name="email-Primary" size="18"
maxlength="80"
- value="email address" onfocus="this.value=''"/>
- <input type="submit" name="_qf_Edit_next" value="Sign up" />
- </p>
-</form>
-</div><!-- /fssbox -->
+<div id="gnu-banner">
+ <a href="/">
+ <img src="/graphics/heckert_gnu.transp.small.png" alt=" [A GNU head] "
/><strong>GNU</strong> Operating System</a>
+<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
+</div><!-- /gnu-banner -->
+
+<div id="fsf-frame">
<p id="fundraiser">
The Free Software Foundation has <a
href="https://www.fsf.org/appeal?pk_campaign=2016_Fundraiser_Banner&pk_kwd=Appeal";>planted
the seeds of computer user
freedom</a> for more than three decades. Associate Members are the roots
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 <span
class="normal">THE FSF</span></a></p>
+<p id="join-fsf"><a
href="http://fsf.org/jfb?pk_campaign=2016_Fundraiser_Banner&pk_kwd=Join";>JOIN<span
class="normal"> THE FSF</span></a></p>
</div><!-- /fsf-frame -->
-<div id="gnu-banner">
- <a href="/">
- <img src="/graphics/heckert_gnu.transp.small.png" alt=" [A GNU head] "
/><strong>GNU</strong> Operating System</a>
-
-<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
-</div><!-- /gnu-banner -->
-
<div class="progress">
<div class="progress-bar">
<span class="percentage"><span class="gnun-split"></span><!--#echo
var="percent" -->%</span>