[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 footer-text.ht...
From: |
Therese Godefroy |
Subject: |
www/server/staging/nav-bar/test9 footer-text.ht... |
Date: |
Thu, 27 Feb 2014 12:17:49 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 14/02/27 12:17:49
Modified files:
server/staging/nav-bar/test9: footer-text.html
footer-text.fr.html layout5.css
Log message:
Fix footer-text.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/footer-text.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/footer-text.fr.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout5.css?cvsroot=www&r1=1.17&r2=1.18
Patches:
Index: footer-text.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/footer-text.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- footer-text.html 14 Feb 2014 12:50:01 -0000 1.4
+++ footer-text.html 27 Feb 2014 12:17:48 -0000 1.5
@@ -14,27 +14,21 @@
<div id="mission-statement">
-<blockquote><a href="http://www.fsf.org"><img id="fsfbanner"
src="logo-fsf.org-notext.png" alt=" [Logo de la Free Software Foundation]
"/></a><strong>âOur
-mission is to preserve, protect and promote the freedom to use, study,
-copy, modify, and redistribute computer software, and to defend the
-rights of Free Software users.â</strong></blockquote>
+<blockquote>
+<a href="http://www.fsf.org"><img id="fsfbanner" src="logo-fsf.org-notext.png"
alt=" [FSF logo] "/></a><strong>âOur mission is to preserve, protect and
promote the freedom to use, study, copy, modify, and redistribute computer
software, and to defend the rights of Free Software users.â</strong>
+</blockquote>
-<div id="support-fsf">
-<div id="join-fsf">
- <p><a class="button small"
href="https://www.fsf.org/associate/support_freedom?referrer=4052">
-   JOIN THE FSF!  </a></p>
-</div> <!-- /join-fsf -->
-
-<p>The <a href="http://www.fsf.org">Free Software
-Foundation</a> is the principal organizational sponsor of the <a
-href="http://www.gnu.org/">GNU Operating System</a>. <strong>Support GNU and
the FSF</strong>
- <a href="http://shop.fsf.org/">by <a
-href="http://shop.fsf.org/">buying manuals and gear</a>, <a
-href="http://www.fsf.org/join">joining the FSF as an associate
-member</a> or by making a
-donation, either <a href="http://donate.fsf.org/">directly to the FSF</a>
-or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr">via
Flattr</a>.</p>
-</div> <!-- /support-fsf -->
+<div id="support-gnu-fsf">
+<p>The <a href="http://www.fsf.org">Free Software Foundation</a> is the
principal organizational sponsor of the GNU Operating System. <strong>Support
GNU and the FSF</strong> by</p>
+<ul>
+ <li><a href="http://shop.fsf.org/">buying manuals and gear</a>,</li>
+ <li><a href="https://my.fsf.org/associate/support_freedom?referrer=4052">
+ <strong>joining the FSF</strong></a> as an associate member or</li>
+ <li>making a <strong>donation</strong>,
+ either <a href="http://donate.fsf.org/">directly to the FSF</a>
+ or <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr">via
Flattr</a>.</li>
+</ul>
+</div> <!-- /support-gnu-fsf -->
<p id="backtotop"><a href="#header">Back to Top</a></p>
Index: footer-text.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/footer-text.fr.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- footer-text.fr.html 12 Feb 2014 11:05:43 -0000 1.2
+++ footer-text.fr.html 27 Feb 2014 12:17:48 -0000 1.3
@@ -1,4 +1,4 @@
-<!-- begin server/staging/nav-bar/test9/footer-text.html -->
+<!-- begin server/footer-text.html -->
<div id="fsf-links">
<ul>
@@ -14,31 +14,24 @@
<div id="mission-statement">
-<blockquote><a href="http://www.fsf.org"><img id="fsfbanner"
src="logo-fsf.org-notext.png" alt=" [Logo de la Free Software Foundation]
"/></a><strong>« Notre mission est de préserver, protéger et promouvoir la
liberté d'utiliser, étudier, copier, modifier et redistribuer les programmes
informatiques, et de défendre les droits des utilisateurs de logiciel libre.Â
»</strong></blockquote>
-
-<div id="support-fsf">
-<div id="join-fsf">
- <p><a class="button small"
href="https://www.fsf.org/associate/support_freedom?referrer=4052">
-   JOIN THE FSF!  </a></p>
-</div> <!-- /join-fsf -->
-
-<p>La <a href="http://www.fsf.org"><strong>Fondation pour le logiciel
-libre</strong></a> (<abbr title="Free Software Foundation">FSF</abbr>)
-est le principal sponsor institutionnel du <a href="/">système
-d'exploitation GNU</a>. <strong>Soutenez GNU et la FSF</strong>
- <a href="http://shop.fsf.org/">en achetant des manuels et autres objets</a>,
- <a href="http://www.fsf.org/join">en adhérant à la FSF en tant que membre
associé</a>
-ou en faisant un don, soit <a href="http://donate.fsf.org/">directement à la
FSF</a>, soit <a
-href="http://flattr.com/thing/313733/gnuproject-on-Flattr">via Flattr</a>.</p>
-</div> <!-- /support-fsf -->
-</div> <!-- /mission-statement -->
-
-<div id="sisters">
-<p>La FSF a des organisations sÅurs en <a
href="http://www.fsfe.org">Europe</a>, en <a
-href="http://www.fsfla.org/">Amérique Latine</a> et en <a
-href="http://fsf.org.in/">Inde</a>.</p>
-</div> <!-- /sisters -->
+<blockquote>
+<a href="http://www.fsf.org"><img id="fsfbanner" src="logo-fsf.org-notext.png"
alt=" [Logo de la FSF] "/></a><strong>« Notre mission est de préserver,
protéger et promouvoir la liberté d'utiliser, étudier, copier, modifier et
redistribuer les programmes informatiques, et de défendre les droits des
utilisateurs de logiciel libre. »</strong>
+</blockquote>
+
+<div id="support-gnu-fsf">
+<p>La <a href="http://www.fsf.org"><strong>Fondation pour le logiciel
libre</strong></a> (<abbr title="Free Software Foundation">FSF</abbr>) est le
principal sponsor institutionnel du système d'exploitation GNU.
<strong>Soutenez GNU et la FSF</strong></p>
+<ul>
+ <li><a href="http://shop.fsf.org/">en achetant des manuels</a> et
autres,</li><
+ <li><a href="https://my.fsf.org/associate/support_freedom?referrer=4052">
+ <strong>en adhérant à la FSF</strong></a> en tant que membre
associé,</li>
+ <li>en faisant un <strong>don</strong>,
+ soit <a href="http://donate.fsf.org/">directement à la FSF</a>,
+ soit <a href="http://flattr.com/thing/313733/gnuproject-on-Flattr">via
Flattr</a>.</li>
+</ul>
+</div> <!-- /support-gnu-fsf -->
<p id="backtotop"><a href="#header">Haut de la page</a></p>
+</div> <!-- /mission-statement -->
+
<!-- end server/footer-text.html -->
Index: layout5.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout5.css,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- layout5.css 21 Feb 2014 21:32:13 -0000 1.17
+++ layout5.css 27 Feb 2014 12:17:48 -0000 1.18
@@ -220,13 +220,13 @@
}
#fssbox {
float: right;
- width: 18em; max-width: 100%;
+ width: auto;
font-size: .9em;
text-align: center;
line-height: 1.2em;
padding: .5em .5em .2em .5em;
border: 1px dashed #971611;
- margin: 0 1% .75em 0;
+ margin: 0 1% .6em 0;
}
#fssbox p { margin-top: 0; margin-bottom: .5em; }
@@ -236,7 +236,7 @@
font-family: sans-serif;
font-weight: bold;
line-height: 1.1em;
- padding-top: .8em;
+ padding-top: 1em;
margin-top: .35em;
}
#gnu-banner img {
@@ -255,10 +255,12 @@
color: #971611;
}
#fsf-support {
+ clear: right;
+ text-align: left;
font-size: 1em;
font-weight: bold;
font-style: italic;
- margin: .8em 0 .6em 1%;
+ margin: .5em 1%;
}
#fsf-support a, a:visited { color: #971611; }
#fsf-support a:hover { color: red; }
@@ -360,7 +362,7 @@
}
#transnotes { font-size: .9em; }
-
+#content small { font-size: .9em; }
/*** ADDITIONAL LINKS ***/
@@ -405,9 +407,11 @@
#mission-statement img {
float: left;
height: 2em;
- margin: .5em 1em 1em 0;
+ margin: .3em 1em .3em 0;
}
+#support-gnu-fsf ul { font-size: 1.1em; margin: 0 0 0 15%; }
+
#join-fsf {
float: right;
margin: .5em 0 1em 1em;
@@ -427,7 +431,7 @@
float: right;
font-size: 1.1em;
font-weight: bold;
- margin: 0 0 1.5em 0;
+ margin: .8em 0 1.5em 1em;
}
div#backtotop {
/* For older versions of layout. */
@@ -462,7 +466,7 @@
}
#fs-gang .img-container img { width: 100%; padding: 0; margin: 0; }
-#sisters { font-size: .9em; margin: 1%; }
+#sisters { font-size: .9em; margin: 0 1% 1.5em 1%; }
/*** FOOTER ***/