[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/fundraiser home.html head-in...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/fundraiser home.html head-in... |
|
Date: |
Wed, 12 Jun 2019 04:44:02 -0400 (EDT) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 19/06/12 04:44:02
Modified files:
server/staging/fundraiser: home.html head-include-2.html
body-include-2.html
Log message:
Spring fundraiser 2019.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/home.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/head-include-2.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/fundraiser/body-include-2.html?cvsroot=www&r1=1.16&r2=1.17
Patches:
Index: home.html
===================================================================
RCS file: /webcvs/www/www/server/staging/fundraiser/home.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- home.html 9 Nov 2018 05:16:53 -0000 1.4
+++ home.html 12 Jun 2019 08:43:59 -0000 1.5
@@ -12,9 +12,6 @@
<style type="text/css" media="print,screen">
<!--
-#content {
- margin: 0;
-}
.first-column, .second-column {
width: 46em; max-width: 100%;
margin: auto;
@@ -77,6 +74,14 @@
max-width: 100%;
min-width: 8em;
}
+p.btn-left a, p.btn-right a,
+ p.btn-left a:visited, p.btn-right a:visited {
+ font-size: 1.6em;
+ padding: .4em .6em;
+ color: #b02500;
+ border: .1em solid #b02500;
+ margin: .3em 0;
+}
p.btn-left {
float: left;
margin: .7em 0;
@@ -85,13 +90,6 @@
float: right;
margin: 0 0 .3em;
}
-p.button a, p.button a:visited {
- font-size: 1.6em;
- padding: .4em .6em;
- color: #b02500;
- border: .1em solid #b02500;
- margin: .3em 0;
-}
p.button a:hover {
color: #777;
border-color: #777;
@@ -129,7 +127,7 @@
float: left;
margin-right: .5em;
}
-#Flashes p, #unmaint li, #blurb p, #blurb p small {
+#Flashes p, #unmaint, #blurb p, #blurb p small {
font-size: .9em;
}
#unmaint li, #blurb p {
@@ -139,26 +137,23 @@
display: block;
font-size: 1.1em;
color: black;
+ margin-bottom: .5em;
}
.ltr {
direction: ltr;
text-align: left;
}
-.clear {
- clear: both;
- height: 2em;
-}
.translators-notes {
width: 44.4em; max-width: 100%;
margin: 0 auto;
}
-#mission-statement {
- margin-bottom: 0;
-}
#sisters {
font-size: .9em;
- margin: 0 3% 2em;
+ text-align: center;
+ background-color: white;
+ padding: 0 3% 2em;
+ margin: 0;
}
@media (min-width: 60em) {
@@ -220,9 +215,9 @@
<div class="screenshot">
<a href="/distros/screenshots/guixSD-gnome3.jpg"><img
src="/distros/screenshots/guixSD-gnome3-medium.jpg"
- alt=" [Screenshot of GuixSD 0.15 with GNOME 3
desktop] " /></a>
+ alt=" [Screenshot of Guix 0.15 with GNOME 3 desktop] "
/></a>
</div>
-<p><small><a href="/software/guix/">GuixSD 0.15</a> with <a
+<p><small><a href="/software/guix/">Guix 0.15</a> with <a
href="https://www.gnome.org/";>GNOME 3</a> desktop, Epiphany web
browser, Totem video player, and GNOME terminal emulator</small></p><!--#endif
--><!--#if expr="$DISTRO = pureos8" -->
@@ -249,7 +244,7 @@
</tr>
<tr class="caption">
<td><small>Trisquel 8 & MATE</small></td>
- <td><small>GuixSD & GNOME 3</small></td>
+ <td><small>Guix & GNOME 3</small></td>
<td><small>PureOS 8 & GNOME 3</small></td>
</tr>
</table>
@@ -286,13 +281,15 @@
<ul>
<li>The freedom to run the program as you wish,
for any purpose (freedom 0).</li>
-<li>The freedom to study how the program works, and adapt it to your needs
- (freedom 1). Access to the source code is a precondition for this.</li>
-<li>The freedom to redistribute copies so you can help your neighbor
+<li>The freedom to study how the program works, and change it so it
+ does your computing as you wish (freedom 1). Access to the source
+ code is a precondition for this.</li>
+<li>The freedom to redistribute copies so you can help others
(freedom 2).</li>
-<li>The freedom to improve the program, and release your improvements
- to the public, so that the whole community benefits
- (freedom 3). Access to the source code is a precondition for this.</li>
+<li>The freedom to distribute copies of your modified versions
+ to others (freedom 3). By doing this you can give the whole
+ community a chance to benefit from your changes.
+ Access to the source code is a precondition for this.</li>
</ul>
<p>Developments in technology and network use have made these freedoms
@@ -338,8 +335,8 @@
<div class="second-column">
<div id="Flashes" class="emph-box white">
-<h3><a href="http://planet.gnu.org/";>Planet GNU</a>
-<a href="http://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
+<h3><a href="https://planet.gnu.org/";>Planet GNU</a>
+<a href="https://planet.gnu.org/rss20.xml";><img src="/feed-icon-10x10.png"
alt="RSS Feed" /></a></h3>
<div class="ltr">
<!--#include virtual="/planetfeeds.html" -->
@@ -354,15 +351,15 @@
<ul>
<li><strong>Support the efforts on net neutrality
-<a href="http://www.savetheinternet.com"; title="Net
+<a href="https://www.freepress.net/issues/free-open-internet/net-neutrality";
title="Net
neutrality in the United States of America">in the USA</a></strong>,
and in your home country.</li>
-<li>Defend <a href="http://www.laquadrature.net/en/Privacy";>
+<li>Defend <a href="https://www.laquadrature.net/en/personnal-data/";>
privacy</a>, and support <a
-href="http://www.laquadrature.net/en/the-eu-commissions-outrageous-attempt-to-avoid-copyright-reform";>
+href="https://www.laquadrature.net/en/?s=copyright";>
global copyright reform</a> with <a
-href="http://www.laquadrature.net/en/";>LQDN</a>.</li>
+href="https://www.laquadrature.net/en/";>LQDN</a>.</li>
<li><strong><a href="http://www.fsf.org/campaigns";>Support current FSF
campaigns</a></strong>.</li>
@@ -376,26 +373,30 @@
</div>
<div id="unmaint" class="emph-box beige">
-<ul>
-<li><strong>Can you contribute to any of
+<p><strong>Can you contribute to any of
these <a href="//www.fsf.org/campaigns/priority-projects/">High
-Priority Areas</a>?</strong> Free phone operating system;
-decentralization, federation, and self-hosting; free drivers,
-firmware, and hardware designs; real-time voice and video chat;
-encourage contribution by people underrepresented in the community,
-and more.</li>
-
-<li><strong>Can you take over an <a
-href="/server/takeaction.html#unmaint">unmaintained GNU
-package</a>?</strong>
-<span class="gnun-split"></span>
+Priority Areas</a>?</strong></p>
+<ul>
+ <li>Free phone operating system,</li>
+ <li>decentralization, federation and self-hosting,</li>
+ <li>free drivers, firmware and hardware designs,</li>
+ <li>real-time voice and video chat,</li>
+ <li>encourage contribution by people underrepresented in the community,</li>
+ <li>and more.</li>
+</ul>
+
+<p><strong>Can you help <a
+href="/server/takeaction.html#unmaint">maintain a GNU package</a>?</strong></p>
+<ul>
+<li><span class="gnun-split"></span>
<a href="/software/cfengine/">cfengine</a>,
<a href="/software/freetalk/">freetalk</a>,
<a href="/software/halifax/">halifax</a>,
<a href="/software/mcron/">mcron</a>,
<a href="/software/quickthreads/">quickthreads</a><span
class="gnun-split"></span>,
-are all <a href="/server/takeaction.html#unmaint">looking for
-maintainers</a>. Also, these packages are looking for co-maintainers:
+are all looking for maintainers.</li>
+
+<li>Also, these packages are looking for co-maintainers:
<span class="gnun-split"></span>
<a href="/software/aspell/">aspell</a>,
<a href="/software/bison/">bison</a>,
@@ -403,9 +404,10 @@
<a href="/software/gnubik/">gnubik</a>,
<a href="/software/metaexchange/">metaexchange</a>,
<a href="/software/powerguru/">powerguru</a>,
- <a href="/software/xboard/">xboard</a><span class="gnun-split"></span>.
-See the package web pages for more information.</li>
+ <a href="/software/xboard/">xboard</a><span class="gnun-split"></span>.</li>
</ul>
+
+<p>See the package web pages for more information.</p>
</div>
<div id="blurb" class="emph-box white">
@@ -424,15 +426,16 @@
</div><!-- /second-column -->
</div><!-- /home -->
-<div class="clear"></div>
+<div style="clear:both"></div>
</div><!-- for id="content", starts in the include above -->
<!--#include virtual="/server/footer.html" -->
<p id="sisters">The <a href="http://www.fsf.org/";>FSF</a> also has sister
organizations in <a href="http://www.fsfe.org";>Europe</a>, <a
href="http://www.fsfla.org/";>Latin America</a> and <a
-href="http://gnu.org.in/";>India</a>.</p>
+href="http://gnu.org.in/";>India</a>.<br />
+Feel free to join them!</p>
<!--#include virtual="/server/fs-gang.html" -->
@@ -481,7 +484,7 @@
There is more detail about copyright years in the GNU Maintainers
Information document, www.gnu.org/prep/maintain. -->
-<p>Copyright © 1996-2018 <a
+<p>Copyright © 1996-2019 <a
href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
<p>This page is licensed under a <a rel="license"
@@ -492,10 +495,10 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2018/11/09 05:16:53 $
+$Date: 2019/06/12 08:43:59 $
<!-- timestamp end -->
</p>
</div>
-</div>
+</div><!-- for class="inner", starts in the banner include -->
</body>
</html>
Index: head-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/fundraiser/head-include-2.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- head-include-2.html 13 Nov 2018 15:25:02 -0000 1.26
+++ head-include-2.html 12 Jun 2019 08:43:59 -0000 1.27
@@ -3,147 +3,135 @@
--><meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css" media="screen">
<!--
-#translations
-{
- border-bottom: .2em solid #001345;
-}
-#gnu-banner
-{
- float: none;
- padding-bottom: 0;
-}
-div#gnu-banner a, div#gnu-banner a strong
-{
- color: white;
-}
-div#gnu-banner a strong, div#fundraiser p.message
-{
- text-shadow: 0 1px 1px rgba(0,0,0,0.95),
- 0 1px 3px rgba(0,0,0,0.65),
- 0 2px 4px rgba(0,0,0,0.2);
-}
-div#header
-{
- direction: ltr;
- background-color: #243386;
- position : relative;
- background-position: center;
- background-size : cover;
- background-repeat : none;
- overflow : hidden;
-}
-div#fundraiser p.message
-{
- font-size: 1.1em;
+#fsf-2019-spring-banner {
+ border-style: solid;
+ border-width: 5px 5px 7px 5px;
+ border-color: #0065ff;
+ background-color: #1d0c3b;
+ min-width: 208px;
+ padding: 5px 5px 2px 5px;
text-align: center;
- padding: .2em 0 .4em;
- color: white;
}
-div#header p.contribute
-{
- line-height: 1.5em;
- font-size: 1.2em;
- text-align: center;
- padding-bottom: .75em;
- margin: 0;
-}
-#header a.join
-{
- display: inline-block;
- width: 4em;
- text-align: center;
- padding: 0 .5em;
- margin: .3em .5em;
- font-weight: bold;
- color: black;
- background-color: #f88d19;
- border: 1px solid white;
- border-radius: 1em;
- -moz-border-radius: 1em;
- -khtml-border-radius: 1em;
- -webkit-border-radius: 1em;
- -opera-border-radius: 1em;
-}
-#header b
-{
- color: yellow;
-}
-div#fundraiser .progress
-{
- width: 100%;
- height: 1.2em;
- line-height: 1.2em;
- text-align: right;
- background: #f9f2d5;
- color: black;
+
+#fsf-2019-spring-banner h1 {
+ border: none;
+ color: #fdd538;
+ display: inline;
+ font-family: sans-serif,"Helvetica",Arial;
font-weight: bold;
- border: 1px solid white;
- margin-bottom: 1em;
+ font-size: 26px;
+ text-shadow: 0px 0px 8px #00378c;
}
-div#fundraiser .progress-bar
-{
- line-height: 1.2em;
- min-width: 2em;
- background: #f88d19;
- color: black;
- text-align: right;
-} -->
-</style>
-<style type="text/css" media="screen"><!--#set var="bar"
- value="div#fundraiser .progress-bar
-{
- width: $progress_width%;
-}
-" --><!--#echo var="bar" -->
-<!--
-div#fundraiser .goal-div
-{
- position: relative;
- bottom: 1.2em;
- margin-right: .1em;
-}
-div#fundraiser .percentage, div#fundraiser .goal
-{
- margin-right: .1em;
-}
-
-@media (max-width: 21em)
-{
- div#fundraiser p.message { font-size: 0.8em; }
-}
-
-@media (min-width: 30em)
-{
- #header {
- background-image:
url("/server/staging/fundraiser/1-departure-md-banner.jpg");
- }
- #fundraiser
- {
- float: left;
- width: 70%;
- }
- div#fundraiser p.message, #gnu-banner
- {
- text-align: left;
- }
- div#header p.contribute
- {
- float: right;
- text-align: right;
- width: 30%;
- margin-top: 4.5em;
+
+#fsf-2019-spring-banner a {
+ color: #fdd538;
+ font-weight: 700;
+ text-decoration: none;
+}
+
+#fsf-2019-spring-banner a:hover {
+ color: #fd8e1b;
+}
+
+#fsf-2019-spring-banner a:focus {
+ color: #fd8e1b;
+}
+
+#fsf-2019-spring-banner a:active {
+ color: #ffac30;
+}
+
+#fsf-2019-spring-banner p {
+ color: #ffffff;
+ font-family: sans-serif,"Helvetica",Arial;
+ font-size: 16px;
+ font-weight: normal;
+ line-height: 20px;
+ margin-top: 8px;
+ margin-bottom: 0px;
+ text-shadow: 0px 0px 8px #4600ba;
+}
+
+@media (max-device-width: 894px) {
+ #fsf-2019-spring-banner {
+ border-width: 4px 4px 6px 4px;
+ padding: 4px;
+ }
+
+ #fsf-2019-spring-banner h1 {
+ font-size: 24px;
+ }
+
+ #fsf-2019-spring-banner p {
+ line-height: 18px;
}
}
-@media (min-width: 60em)
-{
- #fundraiser
- {
- width: 62%;
+@media (max-device-width: 578px) {
+
+ #fsf-2019-spring-banner h1 {
+ font-size: 24px;
}
- div#header p.contribute
- {
- text-align: center;
+
+ #fsf-2019-spring-banner p {
+ margin-top: 6px;
+ }
+}
+
+@media (max-device-width: 544px) {
+ #fsf-2019-spring-banner {
+ border-width: 3px 3px 5px 3px;
+ padding: 3px;
+ }
+
+ #fsf-2019-spring-banner h1 {
+ font-size: 20px;
+ }
+}
+
+@media (max-device-width: 444px) {
+ #fsf-2019-spring-banner {
+ border-width: 3px 3px 5px 3px;
+ padding: 3px;
+ }
+
+ #fsf-2019-spring-banner h1 {
+ font-size: 18px;
+ }
+
+ #fsf-2019-spring-banner p {
+ margin-top: 4px;
+ }
+}
+
+@media (max-device-width: 402px) {
+ #fsf-2019-spring-banner {
+ border-width: 3px 3px 5px 3px;
+ padding: 3px;
+ }
+
+ #fsf-2019-spring-banner h1 {
+ font-size: 16px;
+ }
+
+ #fsf-2019-spring-banner p {
+ font-size: 14px;
+ line-height: 16px;
+ }
+}
+
+@media (max-device-width: 276px) {
+ #fsf-2019-spring-banner {
+ padding: 2px;
+ }
+
+ #fsf-2019-spring-banner h1 {
+ font-size: 14px;
+ }
+
+ #fsf-2019-spring-banner p {
+ font-size: 12px;
+ line-height: 14px;
}
}
-->
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/fundraiser/body-include-2.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- body-include-2.html 13 Nov 2018 17:40:17 -0000 1.16
+++ body-include-2.html 12 Jun 2019 08:43:59 -0000 1.17
@@ -1,34 +1,41 @@
<!-- start of server/body-include-2 -->
+
+<div id="fsf-2019-spring-banner">
+<h1>Help the FSF fight for user freedom!</h1>
+<p>28 days. 200 new members. Join us before July 15.</p>
+<p>Associate members help the Free Software Foundation remain proudly
independent. Small contributions create a big impact!</p>
+<p><a
href="https://www.fsf.org/appeal?pk_campaign=fr_sp2019&pk_kwd=learn-more&pk_source=banner";>READ
MORE</a> | <a
href="https://my.fsf.org/join?pk_campaign=fr_sp2019&pk_source=banner";>JOIN</a></p>
+</div>
+
<div id="header">
+<div id="fsf-frame">
+<div id="fssbox">
+<p><a href="//www.fsf.org/fss">Free Software Supporter</a></p>
+<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
+ method="post" class="header">
+ <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><!-- /fsf-frame -->
<div id="gnu-banner">
<a href="/">
- <img src="/server/staging/fundraiser/heckert_gnu.transp-white.small.png"
+ <img src="/graphics/heckert_gnu.transp.small.png"
alt=" [A GNU head] " /><strong>GNU</strong> Operating System</a>
-</div><!-- /gnu-banner -->
-
-<div id="fundraiser">
-<p class="message">
-With your help, we'll launch free software to new frontiers! Fuel the mission
by
-becoming one of <b>400</b> new Associate Members by <b>January 1st</b> for
-<b>$10 per month</b> ($5 per month for students).</p>
-
-<div class="progress">
-<div class="progress-bar">
-<span class="percentage"><!--#echo encoding="none"
- var="joined" --></span>
-</div>
-<div class="goal-div">
-<span class="goal">400</span>
-</div>
-</div>
-</div><!-- /fundraiser -->
-<p class="contribute">
-<a class="join"
- href="https://my.fsf.org/join?pk_campaign=fall18&pk_kwd=ban";>
-Join</a>
-</p>
+<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
+</div><!-- /gnu-banner -->
+<div style="clear:both"></div>
</div><!-- /header -->
<div id="navigation">
@@ -88,12 +95,12 @@
<!--#if expr="$REQUEST_URI = /^\/(doc|manual)\//" -->
<li id="tabDoc" class="active">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/doc/doc.html">DOCUMENTATION</a>
+ <a href="/doc/doc.html">DOCS</a>
<span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" -->
</li>
<!--#else -->
- <li id="tabDoc"><a href="/doc/doc.html">DOCUMENTATION</a></li>
+ <li id="tabDoc"><a href="/doc/doc.html">DOCS</a></li>
<!--#endif -->
<!--#if expr="$REQUEST_URI = /^\/help\//" -->
<li id="tabHelp" class="active">
@@ -105,6 +112,9 @@
<!--#else -->
<li id="tabHelp"><a href="/help/help.html">HELP GNU</a></li>
<!--#endif -->
+ <li id="more-links"><a href="#fsf-links">More ▼</a></li>
</ul>
+ <div style="clear:both"></div>
</div><!-- /navigation -->
<!-- end of server/body-include-2 -->
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging/fundraiser home.html head-in...,
Therese Godefroy <=