[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 body-include-2...
From: |
Therese Godefroy |
Subject: |
www/server/staging/nav-bar/test9 body-include-2... |
Date: |
Wed, 07 Oct 2015 10:37:30 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 15/10/07 10:37:30
Modified files:
server/staging/nav-bar/test9: body-include-2.html
edu-cases-india-ambedkar.html
edu-cases-india-irimpanam.html
edu-software-gcompris.html
edu-software-gimp.html
edu-software-tuxpaint.html
education.html
essays-and-articles.html
footer-text.html
fs-gang-definitions.html
home2.fr.html home5.html
layout7.css license-list.html
philosophy-menu.html
philosophy.html software.html
style.css style.rtl.css
Added files:
server/staging/nav-bar/test9: fsf-logo-notext-small.png
Log message:
Reorganize layout.css: many small changes (Ineiev), move page-specific
definitions to the page itself (home5.html and home2.fr.html); adjust style.css
and style.rtl.css; use a smaller image for fsf-logo.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-cases-india-ambedkar.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-cases-india-irimpanam.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gcompris.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gimp.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/essays-and-articles.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/footer-text.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/fs-gang-definitions.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home2.fr.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home5.html?cvsroot=www&r1=1.45&r2=1.46
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.101&r2=1.102
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/license-list.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy-menu.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/software.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/style.css?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/style.rtl.css?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/fsf-logo-notext-small.png?cvsroot=www&rev=1.1
Patches:
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- body-include-2.html 22 Sep 2015 10:49:34 -0000 1.30
+++ body-include-2.html 7 Oct 2015 10:37:26 -0000 1.31
@@ -44,7 +44,7 @@
<!--#else -->
<li id="tabAboutGNU"><a href="/gnu/gnu.html">About GNU</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/philosophy\//" -->
+<!--#if expr="$REQUEST_URI = /\/philosophy/ || $REQUEST_URI =
/^\/proprietary\// || $REQUEST_URI = /\/essays-and-articles\//" -->
<li id="tabPhilosophy" class="active">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/philosophy.html">Philosophy</a>
@@ -54,7 +54,7 @@
<!--#else -->
<li id="tabPhilosophy"><a
href="/philosophy/philosophy.html">Philosophy</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/licenses\// || $REQUEST_URI =
/^\/copyleft\//" -->
+<!--#if expr="$REQUEST_URI = /\/license/" -->
<li id="tabLicenses" class="active">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/licenses/licenses.html">Licenses</a>
@@ -64,7 +64,7 @@
<!--#else -->
<li id="tabLicenses"><a href="/licenses/licenses.html">Licenses</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /edu/" -->
+<!--#if expr="$REQUEST_URI = /\/edu/" -->
<li id="tabEducation" class="active">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/education.html">Education</a>
@@ -74,7 +74,7 @@
<!--#else -->
<li id="tabEducation"><a href="/education/education.html">Education</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/software\// || $REQUEST_URI =
/^\/help\/gethelp/" -->
+<!--#if expr="$REQUEST_URI = /\/software/" -->
<li id="tabSoftware" class="active">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/software/software.html">Software</a>
@@ -84,7 +84,7 @@
<!--#else -->
<li id="tabSoftware"><a href="/software/software.html">Software</a></li>
<!--#endif -->
-<!--#if expr="$REQUEST_URI = /^\/doc\// || $REQUEST_URI = /^\/manual\//" -->
+<!--#if expr="$REQUEST_URI = /^\/doc\// || $REQUEST_URI = /^\/manual\// ||
$REQUEST_URI = /other-free-books/" -->
<li id="tabDoc" class="active">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/doc/doc.html">Documentation</a>
Index: edu-cases-india-ambedkar.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-cases-india-ambedkar.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- edu-cases-india-ambedkar.html 22 Sep 2015 10:55:34 -0000 1.17
+++ edu-cases-india-ambedkar.html 7 Oct 2015 10:37:27 -0000 1.18
@@ -134,7 +134,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server//staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -163,17 +163,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/22 10:55:34 $
+$Date: 2015/10/07 10:37:27 $
<!-- timestamp end -->
</p>
</div>
Index: edu-cases-india-irimpanam.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-cases-india-irimpanam.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- edu-cases-india-irimpanam.html 22 Sep 2015 10:49:35 -0000 1.16
+++ edu-cases-india-irimpanam.html 7 Oct 2015 10:37:27 -0000 1.17
@@ -223,7 +223,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server//staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -252,17 +252,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/22 10:49:35 $
+$Date: 2015/10/07 10:37:27 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software-gcompris.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-gcompris.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- edu-software-gcompris.html 22 Sep 2015 10:55:34 -0000 1.14
+++ edu-software-gcompris.html 7 Oct 2015 10:37:27 -0000 1.15
@@ -131,7 +131,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server//staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -160,17 +160,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/22 10:55:34 $
+$Date: 2015/10/07 10:37:27 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software-gimp.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-software-gimp.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- edu-software-gimp.html 22 Sep 2015 10:55:34 -0000 1.9
+++ edu-software-gimp.html 7 Oct 2015 10:37:27 -0000 1.10
@@ -263,7 +263,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server//staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -292,17 +292,17 @@
of this article.</p>
</div>
-<p>Copyright © 2012, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2012 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/22 10:55:34 $
+$Date: 2015/10/07 10:37:27 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software-tuxpaint.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- edu-software-tuxpaint.html 22 Sep 2015 10:55:34 -0000 1.14
+++ edu-software-tuxpaint.html 7 Oct 2015 10:37:27 -0000 1.15
@@ -218,7 +218,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server//staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -247,17 +247,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/22 10:55:34 $
+$Date: 2015/10/07 10:37:27 $
<!-- timestamp end -->
</p>
</div>
Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- education.html 23 Sep 2015 15:51:49 -0000 1.28
+++ education.html 7 Oct 2015 10:37:27 -0000 1.29
@@ -23,7 +23,7 @@
#content #indepth ul { padding: 0 1em; margin-top: 0; }
#content #indepth li { padding-bottom: 1em; }
#content #indepth h3 { padding: 1em; margin: 0; }-->
-<!--#if expr="$LANGUAGE_SUFFIX = /\\.(ar|fa|he)/" -->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
<!--
#content #indepth { text-align: right; margin: 1em 1em 0 0; }
#content #video-container { float: right; } -->
@@ -54,7 +54,6 @@
<!-- end edu navigation bar -->
</div> <!-- id="education-content" -->
-
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -169,7 +168,7 @@
</div> <!-- /#education -->
</div> <!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -198,17 +197,17 @@
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2014, 2015 Free Software Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2014 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/23 15:51:49 $
+$Date: 2015/10/07 10:37:27 $
<!-- timestamp end -->
</p>
</div>
Index: essays-and-articles.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/essays-and-articles.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- essays-and-articles.html 7 Sep 2015 22:11:16 -0000 1.4
+++ essays-and-articles.html 7 Oct 2015 10:37:28 -0000 1.5
@@ -7,7 +7,6 @@
<!--#include virtual="/philosophy/po/essays-and-articles.translist" -->
<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
<!--#include virtual="/server/staging/nav-bar/test9/philosophy-menu.html" -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
@@ -16,7 +15,7 @@
<!--#include virtual="/server/top-addendum.html" -->
<!--#endif -->
<!--#endif -->
-<h2 class="c">Essays and Articles</h2>
+<h2>Essays and Articles</h2>
<div class="summary">
<ul>
@@ -31,8 +30,8 @@
<li><a href="#patents">Patents</a></li>
<li><a href="#ns">Network Services</a></li>
<li><a href="#cultural">Cultural and Social Issues</a></li>
- <li><a href="#misc">Misc</a></li></li>
- </ul>
+ <li><a href="#misc">Misc</a></li>
+ </ul></li>
<li><a href="#terminology">Terminology and Definitions</a></li>
<li><a href="#upholding">Upholding Software Freedom</a></li>
<li><a href="#humor">Philosophical Humor</a></li>
@@ -101,7 +100,7 @@
<h3 id="aboutgnu">About the GNU Operating System</h3>
-<ul class="list-links">
+<ul>
<li><a href="/gnu/initial-announcement.html">Initial announcement of
the GNU Operating System</a></li>
<li><a href="/gnu/manifesto.html">The GNU Manifesto</a></li>
@@ -115,7 +114,7 @@
<h3 id="LicensingFreeSoftware">Licensing Free Software</h3>
-<ul class="list-links">
+<ul>
<li><a href="/licenses/licenses.html">General information on licensing
and copyleft</a></li>
<li><a href="/licenses/license-list.html">A list of specific free
@@ -194,8 +193,8 @@
<h3 id="Laws">Laws and Issues</h3>
<h4 id="copyright">Copyright</h4>
-
<ul>
+
<li><a href="/philosophy/public-domain-manifesto.html">Why I Will Not Sign
the Public Domain Manifesto</a></li>
@@ -254,11 +253,12 @@
<li><a href="/philosophy/is-ever-good-use-nonfree-program.html">
Is It Ever a Good Thing to Use a Nonfree Program?</a> By
<a href="http://www.stallman.org"> Richard Stallman</a></li>
+
</ul>
<h4 id="drm">Digital Restrictions Management</h4>
-<ul class="list-links">
+<ul>
<li><a href="/philosophy/correcting-france-mistake.html">
Correcting My Mistake about French Law</a></li>
<li><a href="/philosophy/the-root-of-this-problem.html">The problem is
@@ -296,7 +296,7 @@
term <a href="/philosophy/words-to-avoid.html#IntellectualProperty">
“Intellectual Property”</a></h4>
-<ul class="list-links">
+<ul>
<li><a href="/philosophy/komongistan.html">The Curious History of
Komongistan (Busting the term “intellectual property”)</a></li>
@@ -320,8 +320,7 @@
</ul>
<h4 id="patents">Patents</h4>
-
-<ul class="list-links">
+<ul>
<li><a href="/philosophy/limit-patent-effect.html">Giving the Software
Field Protection from Patents</a></li>
@@ -383,8 +382,7 @@
</ul>
<h4 id="ns">Network Services</h4>
-
-<ul class="list-links">
+<ul>
<li><a href="/philosophy/network-services-arent-free-or-nonfree.html">
Network Services Aren't Free or Nonfree; They Raise Other Issues</a> an
article by Richard Stallman.</li>
@@ -396,7 +394,7 @@
<h4 id="cultural">Cultural and Social Issues</h4>
-<ul class="list-links">
+<ul>
<li><a href="/philosophy/technological-neutrality.html">
Technological Neutrality and Free Software</a>
by Richard Stallman</li>
@@ -443,11 +441,12 @@
Free Software and Sustainable Development</a> — A short
article by Richard Stallman regarding the use of proprietary
software in cultural development.</li>
+
</ul>
-<h4 id="misc">Misc</h4>
-<ul class="list-links">
+<h4 id="misc">Misc</h4>
+<ul>
<li><a href="/philosophy/proprietary.html">Clearly established
cases of proprietary software that does nasty things to the
users</a>.</li>
@@ -487,7 +486,7 @@
<h3 id="terminology">Terminology and Definitions</h3>
-<ul class="list-links">
+<ul>
<li><a href="/philosophy/free-hardware-designs.html">
Free Hardware and Free Hardware Designs</a></li>
<li><a href="/philosophy/words-to-avoid.html">Confusing Words</a>
@@ -513,7 +512,7 @@
<h3 id="upholding">Upholding Software Freedom</h3>
-<ul class="list-links">
+<ul>
<li><a href="/philosophy/use-free-software.html">The Free Software
Community After 20 Years</a>, With great but incomplete success,
what now?</li>
@@ -528,14 +527,14 @@
<h3 id="humor">Philosophical humor</h3>
-<ul class="list-links">
+<ul>
<li><a href="/fun/humor.html#Philosophy">Philosophy Humor</a>.
We don't have to be serious <i>all</i> the time.</li>
</ul>
<h3>Links to more philosophy articles</h3>
-<ul class="list-links">
+<ul>
<li id="Speeches"><a href="/philosophy/speeches-and-interview.html">
Speeches and interviews</a></li>
<li id="ThirdPartyIdeas"><a href="/philosophy/third-party-ideas.html">
@@ -581,7 +580,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/07 22:11:16 $
+$Date: 2015/10/07 10:37:28 $
<!-- timestamp end -->
</p>
</div>
Index: footer-text.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/footer-text.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- footer-text.html 22 Sep 2015 10:51:03 -0000 1.18
+++ footer-text.html 7 Oct 2015 10:37:28 -0000 1.19
@@ -1,4 +1,5 @@
<!-- begin server/footer-text.html -->
+<hr class="no-display" />
<div id="fsf-links">
<ul>
<li><a href="http://www.fsf.org/">FSF home page</a></li>
@@ -14,7 +15,7 @@
<blockquote>
<p><a href="http://www.fsf.org"><img id="fsfbanner"
-src="/graphics/fsf-logo-notext.png" alt=" [FSF logo] "/></a><strong>“Our
+src="/server/staging/nav-bar/test9/fsf-logo-notext-small.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></p>
@@ -31,7 +32,7 @@
href="http://flattr.com/thing/313733/gnuproject-on-Flattr">via
Flattr</a>.</p>
-<p id="backtotop"><a href="#header">back to top</a></p>
+<p id="backtotop"><a href="#header">Back to top</a></p>
</div><!-- /mission-statement -->
<!-- end server/footer-text.html -->
Index: fs-gang-definitions.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/fs-gang-definitions.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fs-gang-definitions.html 15 Sep 2015 21:25:56 -0000 1.4
+++ fs-gang-definitions.html 7 Oct 2015 10:37:28 -0000 1.5
@@ -4,7 +4,6 @@
/* Common clauses for the Free Software Gang banner. */
#fs-gang .img-container {
text-align: left;
- font-size: 1em;
padding-top: .5em;
height: 100%; max-width: 40em; margin: auto;
}
@@ -25,7 +24,7 @@
/* screen-specific fs-gang-definitions */
#fs-gang {
clear: both;
- margin: 0 -3.2%;
+ margin: 0;
background-color: #a50606; /* Fallback from gradient */
background: -moz-linear-gradient(#820202, #f71111); /* FF 3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,
#820202), color-stop(100%, #f71111)); /* Safari 4+, Chrome 2+ */
Index: home2.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home2.fr.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- home2.fr.html 15 Sep 2015 21:25:57 -0000 1.15
+++ home2.fr.html 7 Oct 2015 10:37:28 -0000 1.16
@@ -1,6 +1,6 @@
<!--#set var="ENGLISH_PAGE" value="/home.en.html" -->
+
<!--#include virtual="/server/header.fr.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
<!-- Parent-Version: 1.77 -->
<!-- This file is automatically generated by GNUnited Nations! -->
@@ -14,7 +14,83 @@
partager et d'améliorer les logiciels qu'ils utilisent." />
<link rel="alternate" title="Planet GNU"
href="http://planet.gnu.org/rss20.xml" type="application/rss+xml" />
-<!--#include virtual="/server/staging/nav-bar/test9/fs-gang-definitions.html"
-->
+<style type="text/css" media="screen">
+<!--
+#home:after {
+ clear: both; content: ""; display: block;
+ height: 0px; visibility: hidden; width: 0px;
+}
+#home .first-column {
+ width: 60%;
+ float: left;
+}
+#home .second-column {
+ width: 37%;
+ float: right;
+}
+#home .first-column, #home .second-column {
+ margin: 0;
+}
+
+#home h2 {
+ text-shadow: none;
+ padding: 0;
+ margin-top: .9em; margin-bottom: .6em;
+}
+#home .first-column img {
+ width: 100%; max-width: 35em;
+ margin: .5em auto 1em auto;
+}
+#home .second-column h4 img { height: .75em; width: .75em; }
+
+#home .button {
+ text-align: center;
+ font-weight: bold;
+ margin-top: 2em; margin-bottom: 2.5em;
+}
+#home .emph-box {
+ padding-bottom: 1.7em;
+ border-top-left-radius: 2em;
+ border-top-right-radius: 2em;
+ -moz-border-top-left-radius: 2em;
+ -moz-border-top-right-radius: 2em;
+ -khtml-border-top-left-radius: 2em;
+ -khtml-border-top-right-radius: 2em;
+ -webkit-border-top-left-radius: 2em;
+ -webkit-border-top-right-radius: 2em;
+ -opera-border-top-left-radius: 2em;
+ -opera-border-top-right-radius: 2em;
+}
+#home .emph-box p { font-size: .9em; }
+
+#Action {
+ text-align: left;
+ padding: 0 1em;
+ margin: 2.5em 0;
+ border-left: .4em solid #b9bcbf; border-right: .4em solid #b9bcbf;
+}
+#Action h2 {
+ float: none;
+ text-align: center;
+ padding-top: 0;
+ color: #171d33;
+}
+#Action li { margin-bottom: .7em; }
+
address@hidden (max-width: 55em) {
+ #home .first-column, #home .second-column {
+ float: none; width: 100%; }
+}
+#content .emph-box h4 {
+ text-align: center;
+ font-size: 1.5em;
+}
+#sisters { font-size: .9em; margin: 0 3% 1.5em 3%; }
+-->
+
+</style>
+
+<!--#include virtual="/server/fs-gang-definitions.html" -->
<!--#include virtual="/po/home.translist" -->
<!--#include virtual="/server/staging/nav-bar/test9/banner.fr.html" -->
<p class="no-display">GNU est le seul système d'exploitation qui ait été
développé spécialement
@@ -22,6 +98,7 @@
liberté parle-t-on ?</p>
<div id="home">
+
<div class="first-column">
<h2>Qu'est-ce que GNUÂ ?</h2>
@@ -112,14 +189,15 @@
initié en 1990 (avant le début de Linux). Des bénévoles continuent à le
développer parce que c'est un projet technique intéressant.</p>
-<p class="back"><a href="/gnu/gnu.html">Plus d'informations</a>.</p>
+<p class="back"><a href="/gnu/gnu.html">More information</a></p>
</div>
<!-- /first-column -->
<div class="second-column">
-<p class="button c large"><a href="/distros/free-distros.html"
class="button-shadow">Essayer GNU/Linux</a></p>
+<p class="button c large"><a href="/distros/free-distros.html"
class="button-shadow">Try
+GNU/Linux!</a></p>
<div class="emph-box">
@@ -133,8 +211,7 @@
<!--#include virtual="/server/home-pkgselect.html" -->
<!--#include virtual="/server/home-pkgblurbs.fr.html" -->
-<p class="back"><a href="/manual/blurbs.html">Brèves descriptions de tous les
logiciels
-GNU</a></p>
+<p class="back"><a href="/manual/blurbs.html">Short descriptions for all GNU
packages</a></p>
</div>
@@ -179,15 +256,13 @@
<li><a href="/server/takeaction.html#directory">Complétez le répertoire du
logiciel libre</a>.</li>
-
-<p class="back"><a href="/server/takeaction.html">Toutes les actions</a></p>
-
</ul>
-<!-- END TakeAction -->
+<p class="back"><a href="/server/takeaction.html">More action items</a></p>
+
</div>
-<!-- /Action -->
+<!-- /Action -->
<div class="highlight-para">
<p><strong>Pouvez-vous contribuer à certains de ces <a
@@ -201,14 +276,11 @@
href="/server/takeaction.html#unmaint">paquet GNU non
maintenu</a>Â ?</strong>
- <a href="/software/gleem/">gleem</a>, <a
-href="/software/gnukart/">gnukart</a>, <a
-href="/software/halifax/">halifax</a>, <a
+ <a href="/software/halifax/">halifax</a>, <a
href="/software/jwhois/">jwhois</a>, <a
href="/software/metahtml/">metahtml</a>, <a
href="/software/orgadoc/">orgadoc</a>, <a
-href="/software/polyxmass/">polyxmass</a>, <a
-href="/software/superopt/">superopt</a> et <a
+href="/software/polyxmass/">polyxmass</a> et <a
href="/software/teximpatient/">teximpatient</a> sont tous <a
href="/server/takeaction.html#unmaint">Ã la recherche d'un
repreneur</a>. Et ceux-ci sont à la recherche d'un comainteneur :
@@ -217,10 +289,13 @@
href="/software/metaexchange/">metaexchange</a>, <a
href="/software/powerguru/">powerguru</a>. Consultez les pages web de ces
logiciels pour plus ample information.</p>
-</div><!-- /highlight-para -->
-</div><!-- /second-column -->
-</div><!-- /home -->
+</div>
+<!-- /highlight-para -->
+</div>
+<!-- /second-column -->
+</div>
+<!-- /home -->
<div class="translators-notes">
<!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
@@ -273,7 +348,7 @@
<p class="unprintable"><!-- timestamp start -->
Dernière mise à jour :
-$Date: 2015/09/15 21:25:57 $
+$Date: 2015/10/07 10:37:28 $
<!-- timestamp end -->
</p>
Index: home5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home5.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- home5.html 15 Sep 2015 21:25:56 -0000 1.45
+++ home5.html 7 Oct 2015 10:37:28 -0000 1.46
@@ -7,7 +7,81 @@
<meta http-equiv="Description" content="Since 1983, developing the free Unix
style operating system GNU, so that computer users can have the freedom to
share and improve the software they use." />
<link rel="alternate" title="Planet GNU"
href="http://planet.gnu.org/rss20.xml" type="application/rss+xml" />
-<!--#include virtual="/server/staging/nav-bar/test9/fs-gang-definitions.html"
-->
+<style type="text/css" media="screen">
+<!--
+#home:after {
+ clear: both; content: ""; display: block;
+ height: 0px; visibility: hidden; width: 0px;
+}
+#home .first-column {
+ width: 60%;
+ float: left;
+}
+#home .second-column {
+ width: 37%;
+ float: right;
+}
+#home .first-column, #home .second-column {
+ margin: 0;
+}
+
+#home h2 {
+ text-shadow: none;
+ padding: 0;
+ margin-top: .9em; margin-bottom: .6em;
+}
+#home .first-column img {
+ width: 100%; max-width: 35em;
+ margin: .5em auto 1em auto;
+}
+#home .second-column h4 img { height: .75em; width: .75em; }
+
+#home .button {
+ text-align: center;
+ font-weight: bold;
+ margin-top: 2em; margin-bottom: 2.5em;
+}
+#home .emph-box {
+ padding-bottom: 1.7em;
+ border-top-left-radius: 2em;
+ border-top-right-radius: 2em;
+ -moz-border-top-left-radius: 2em;
+ -moz-border-top-right-radius: 2em;
+ -khtml-border-top-left-radius: 2em;
+ -khtml-border-top-right-radius: 2em;
+ -webkit-border-top-left-radius: 2em;
+ -webkit-border-top-right-radius: 2em;
+ -opera-border-top-left-radius: 2em;
+ -opera-border-top-right-radius: 2em;
+}
+#home .emph-box p { font-size: .9em; }
+
+#Action {
+ text-align: left;
+ padding: 0 1em;
+ margin: 2.5em 0;
+ border-left: .4em solid #b9bcbf; border-right: .4em solid #b9bcbf;
+}
+#Action h2 {
+ float: none;
+ text-align: center;
+ padding-top: 0;
+ color: #171d33;
+}
+#Action li { margin-bottom: .7em; }
+
address@hidden (max-width: 55em) {
+ #home .first-column, #home .second-column {
+ float: none; width: 100%; }
+}
+#content .emph-box h4 {
+ text-align: center;
+ font-size: 1.5em;
+}
+#sisters { font-size: .9em; margin: 0 3% 1.5em 3%; }
+-->
+</style>
+<!--#include virtual="/server/fs-gang-definitions.html" -->
<!--#include virtual="/po/home.translist" -->
<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
@@ -191,14 +265,11 @@
href="/server/takeaction.html#unmaint">unmaintained GNU
package</a>?</strong>
<span class="gnun-split"></span>
- <a href="/software/gleem/">gleem</a>,
- <a href="/software/gnukart/">gnukart</a>,
<a href="/software/halifax/">halifax</a>,
<a href="/software/jwhois/">jwhois</a>,
<a href="/software/metahtml/">metahtml</a>,
<a href="/software/orgadoc/">orgadoc</a>,
<a href="/software/polyxmass/">polyxmass</a>,
- <a href="/software/superopt/">superopt</a>,
<a href="/software/teximpatient/">teximpatient</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:
@@ -254,7 +325,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/15 21:25:56 $
+$Date: 2015/10/07 10:37:28 $
<!-- timestamp end -->
</p>
</div>
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- layout7.css 24 Sep 2015 08:02:37 -0000 1.101
+++ layout7.css 7 Oct 2015 10:37:28 -0000 1.102
@@ -46,7 +46,6 @@
#004780 greenish blue: normal links
#100070 purplish blue: normal visited links
blue #urgent links
- #171d33 dark blue (from screenshot): #Action h2
#971611 red from GNU banner: .button link, #join-fsf
Backgrounds
@@ -55,23 +54,19 @@
.listing, #footer, .toc, .summary
#e7e9eb html, .button, .lyrics, #join-fsf, submit
#d1d4d7 #edu-navbar, #fsf-links, #searcher + #translations
- #ddd gray (looks purplish): #gpl-compat-matrix
- #ccffcc light green: #gpl-compat-matrix
- #e4ffcc light yellowish green: #gpl-compat-matrix
#ffc very pale yellow: .highlight-para
- #fff898 pale yellow: table headers, .highlight, nav-bar hover
+ #fff898 pale yellow: table headers, .highlight
#ff3 yellow: #urgent
#a50606 intermediate red from #fs-gang gradient: #navigation
- [#fs-gang gradient: #820202-#f71111]
- #820202-#f71111: #fs-gang gradient
Borders
black, #111, #333, #666: tables
- #b9bcbf bluish gray: body, #Action, .highlight-para, .announcement
+ #b9bcbf bluish gray: body, .highlight-para, .announcement
#c9cccf bluish gray: .button, .toc, submit
#d1d4d7 bluish gray: #translations, #outdated
#3465a4 blue (slightly lighter than GNU banner): edu-cases ridges, .note
- #171d33 dark blue: box-shadow behind buttons, focused inputs
+ #171d33 dark blue from screenshot in home.html: box-shadow behind
+ buttons, focused inputs
#6989b6 light blue: border for h3 (license-list.html)
*/
@@ -129,7 +124,26 @@
*/
-/*** SCREEN LAYOUT ***/
+/* MAIN DIVS */
+
+/*
+From top to bottom:
+ #searcher + #toplinks [body-include-1.html]
+ #translations [body-include-1.html]
+ #header (#gnu-banner, #fsf-frame) [body-include-2.html]
+ #navigation [body-include-2.html]
+ (#edu-navigation in a few pages) [<page>.html]
+ #content [<page>.html]
+ #fsf-links [footer-text.html]
+ #mission-statement + #backtotop [footer-text.html]
+ #footer [<page>.html]
+*/
+
+
+
+/**************************************
+ ** GENERAL APPEARANCE OF THE PAGE **
+ **************************************/
html, body {
font-size: 1em;
@@ -146,7 +160,7 @@
consistency with fsf.org. */
body {
max-width: 74.92em;
- margin: auto;
+ margin: 0 auto 1em auto;
background-color: white;
border-left: .2em solid #b9bcbf;
border-right: .2em solid #b9bcbf;
@@ -158,62 +172,81 @@
}
-/*** MAIN DIVS ***/
+/* Widths */
-/* Width (class inner throughout the page) */
-.inner { margin: 0 3%; }
+/* To avoid a few problems with pages outside www.gnu.org,
+ the paddings and margins are defined without using
+ .inner. */
-#searcher, #translations, #header, #footer,
- #navigation, ul#edu-navigation, #fsf-links {
- margin-left: -3.2%; margin-right: -3.2%;
-}
-#searcher, #translations, #header, #footer {
- padding-left: 3.2%; padding-right: 3.2%;
+.inner { overflow: hidden; }
+
+#searcher, #toplinks, #header, #content,
+ #mission-statement, #footer {
+ padding-left: 3%; padding-right: 3%;
}
-#navigation, ul#edu-navigation, #fsf-links {
- padding-left: .3em; padding-right: .3em;
+#content ul#edu-navigation {
+ margin-left: -3.2%; margin-right: -3.2%;
}
-/* Background */
-#searcher, #edu-navigation, #fsf-links { background-color: #c9cccf; }
+
+/* Backgrounds */
+
+#searcher, #edu-navigation, #fsf-links {
+ background-color: #c9cccf;
+}
#translations, #footer { background-color: #f0f2f4; }
-#header { background-color: white; }
+
#navigation { background-color: #a50606; }
-/* Font */
-#searcher, #toplinks, #translations, #header, #navigation, #edu-navigation,
+
+/* Fonts */
+
+#searcher, #toplinks, #translations, #header,
+ #navigation, #edu-navigation,
#fsf-links { font-family: "FreeSans", sans-serif; }
-/*** GENERAL SETTINGS ***/
+
+/***********************
+ ** SIMPLE ELEMENTS **
+ ***********************/
a[href] { color: #005090; }
a[href]:visited { color: #100070; }
a[href]:active, a[href]:hover { color: #777; }
-blockquote { margin: 1em; font-style: italic; }
+/* The default color (black) is too dark for large text in
+ bold font. */
+h1, h2, h3, h4 { color: #333; }
+h5, h6, dt { color: #222; }
+
+blockquote { font-style: italic; }
+ul li { list-style: square; }
+form input { font-family: inherit; }
acronym, abbr { border-bottom: 1px dotted #111; }
-
img { border: 0; }
-address { margin-bottom: 1em; }
+pre { overflow: auto; }
-/* separate the "term" from subsequent "description" */
-dt { margin-bottom: 1em; color: #222; }
+p, pre, ul li, ol li, dt, dd, code, address { line-height: 1.3em; }
+ul, ol, blockquote { margin: .5em 3% 1em 3%; padding: 0; }
+/* Lists of underlined links are difficult to read. The top margin gives a
+ little more spacing between entries. */
+ul li, ol li { margin: .2em 1em 0 1em; }
+
+dl { margin: 0; }
+/* separate the "term" from subsequent "description" */
+dt { margin: 1em 0; }
/* separate the "description" from subsequent list item
when the final <dd> child is an anonymous box */
-dd { margin-bottom: 2em; }
-
+dd { margin: 1em 3% 2em 3%; }
/* separate anonymous box (used to be the first element in <dd>)
from subsequent <p> */
dd p { margin-top: 1em; }
-pre { overflow: auto; }
-
-
-/*** CLASSES ***/
+address { margin-bottom: 1em; }
.center, .c { text-align: center; }
#content .nocenter{ text-align: left; }
@@ -221,14 +254,22 @@
.underline { text-decoration: underline; }
.nounderline { text-decoration: none; }
-.imgright { float: right; margin: 1em; margin-right: 0; }
-.imgleft { float: left; margin: 1em; margin-left: 0; }
+.imgright { float: right; margin: .3em 0 1em 1.5em; }
+.imgleft { float: left; margin: .3em 1.5em 1em 0; }
.big { font-size: 130%; padding-top: 0.7em; }
.inline-list li { display: inline }
-.netscape4, .no-display { display: none !important; }
+.netscape4, .no-display { display: none; }
+
+
+
+/************************************
+ ** MORE COMPLEX BUILDING BLOCKS **
+ ************************************/
+
+/*** BUTTONS ***/
.button a, .button a:visited {
color: #971611;
@@ -251,7 +292,8 @@
background-color: #e7e9eb;
}
-/*** SPECIAL FEATURES ***/
+
+/*** SPECIAL BORDERS ***/
#searcher input[type="text"], #searcher input[type="submit"],
#fssbox input[type="text"],
@@ -277,223 +319,94 @@
}
-/*** TOP OF THE PAGE ***/
+/*** SEPARATOR ***/
-#toplinks {
- float: left;
- padding: .5em 0 .4em 0;
- margin: 0;
+/* For license-list.html, but could be used elsewhere. */
+hr.separator {
+ display: block;
+ height: .3em;
+ margin-bottom: 1.2em;
+ color: #999;
+ background-color: #999;
+ border: none;
}
-#toplinks a, #toplinks a:visited,
- #home-icon a, #home-icon a:visited {
- white-space: nowrap;
- /* the next line is a workaround for Midori 0.5.8 */
- display: inline-block;
- font-weight: bold;
- font-size: .9em;
- color: #404040; text-decoration: none;
- margin-right: 1em;
-}
-#toplinks a:hover, #home-icon a:hover { color: #777; }
-#searcher {
- display: block;
- text-align: right;
- font-weight: bold;
- padding-top: .3em; padding-bottom: .3em;
-}
-#searcher input {
- font-family: "FreeSans", sans-serif;
- font-size: .9em;
- margin: 0;
-}
-#searcher input[type="text"] {
- padding: .2em;
- margin: 0;
- color: #555;
- background: white;
- border: .1em solid #999;
-}
-#searcher input[type="submit"] {
- padding: .2em .4em;
- margin: 0;
- color: #333;
- background: #e7e9eb;
- border: .1em solid #999;
-}
-#searcher input[type="text"]:focus {
- color: #333;
- border: .1em solid #334683;
-}
-#searcher input[type="text"]:focus + input[type="submit"] {
- border: .1em solid #334683;
-}
-#searcher input[type="submit"]:hover {
- cursor: pointer;
-}
+/*** ANCHOR ***/
-#translations {
+/* This is used in pages of lists, such as gnu-linux.faq.html,
+ to give readers a hint that they can link directly to a given item.
+ We make it less obtrusive than the item heading it follows. */
+.anchor-reference-id { font-size: 80%; font-weight: normal; }
+span.anchor-reference-id a { color: #333; }
+span.anchor-reference-id a[href]:hover { color: #777; }
+
+
+/*** HIGHLIGHTED STUFF AND INSETS ***/
+
+.highlight, .highlight-para {
clear: both;
- text-align: left;
- line-height: 1.3em;
- border-bottom: .3em solid #d1d4d7;
-}
-#translations p {
- font-size: .8em;
- padding: .2em 0;
- margin: 0;
-}
-#translations span {
- white-space: nowrap;
- margin-right: .5em;
-}
-#translations a, #translations a:visited {
- color: #222; text-decoration: none;
+ color: black;
}
-/* Highlight the link to the original page */
-#translations span.original {
- font-size: 1.1em; font-weight: bold;
- padding-top: .3em;
+.highlight {
+/* Please do not add borders. This style is applied to an in-line tag. */
+ padding: .2em .5em;
+ background-color: #fff898;
+ border: 0;
}
-#translations span.original a,
-#translations span.original a:visited {
- color: #334683;
+.highlight-para {
+ padding: 0 1.2em;
+ background-color: #ffc;
+ border: 2px solid #b9bcbf;
}
-#translations a:hover,
-#translations span.original a:hover {
- color: #777;
+
+.emph-box {
+ padding: 0 1em;
+ background-color: #f0f2f4;
+ border: 1px solid #c9cccf;
}
-/*** HEADER ***/
+/*** NOTES AND ANNOUNCEMENTS ***/
-#header:after {
- clear: both; content: ""; display: block;
- height: 0px; visibility: hidden; width: 0px;
+/* Announcements */
+#content div.announcement {
+ font-size: 1.1em; font-weight: bold;
+ padding: 0 1em;
+ margin: 1.5em 0;
+ color: #333;
+ border-left: .5em solid #b9bcbf;
+}
+#content div.announcement blockquote {
+ margin-left: 0; margin-right: 0;
}
-#fsf-frame {
+/* Notes about mailing lists, etc. */
+#content .note {
+ clear: right;
float: right;
- font-size: .9em;
text-align: center;
- line-height: 1.3em;
- width: auto;
+ font-style: normal;
+ max-width: 20em;
padding: 0;
- margin: 1.2em 0 1em 0;
+ margin: .3em 0 1em 1.5em;
+ border: .3em solid #3465a4;
}
-#fsf-frame a, #fsf-frame a:visited {
+#content .note p {
font-size: 1.1em;
- font-weight: bold;
- text-decoration: none;
-}
-#fsf-frame p { padding: 0; margin: 0; }
-#fsf-frame hr { display: none; }
-
-#join-fsf { padding: .4em 0; }
-#join-fsf a, #join-fsf a:visited {
- padding: .3em 1em;
- color: #971611;
- background: #e7e9eb;
- border: .1em solid #999;
-}
-#fssbox {
- padding: 0;
- margin-top: 1.3em;
-}
-#fssbox a, #fssbox a:visited {
- color: #334683;
-}
-#fssbox form p { margin-top: .2em; }
-#fssbox input {
- font-family: "FreeSans", sans-serif;
- font-weight: bold;
-}
-#fssbox input[type="text"] {
- padding: .2em;
- margin: 0;
- color: #555;
- background: #f0f2f4;
- border: .1em solid #999;
-}
-#fssbox input[type="submit"] {
- padding: .2em .4em;
- margin: 0;
- color: #333;
- background: #e7e9eb;
- border: .1em solid #999;
-}
-#fssbox input[type="text"]:focus {
- color: #333;
- border: .1em solid #334683;
-}
-#fssbox input[type="submit"]:hover {
- cursor: pointer;
-}
-#fssbox input[type="text"]:focus + input[type="submit"] {
- border: .1em solid #334683;
-}
-#fsf-frame a:hover { color: #777; }
-
-/* Try to optimize #fsf-frame for narrow screens. */
address@hidden (max-width: 55em) {
- #header #gnu-banner { clear: both; padding-top: 1em; }
- #fsf-frame { float: none; margin: 0; }
- #fsf-frame #fssbox { float: right; padding-top: .8em; margin: 0; }
- #fsf-frame #join-fsf { float: left; padding: 1.2em 0 .5em 0; margin-left:
2em; }
-}
address@hidden (max-width: 35em) { #fsf-frame { display: none; }}
-
-#gnu-banner {
- font-size: 1.8em;
- font-weight: bold;
- line-height: 1.3em;
- padding-top: 1.1em;
-}
-#gnu-banner img {
- float: left;
- height: 2.4em;
- margin: 0 .15em;
- position: relative; bottom: .4em;
-}
-#gnu-banner a {
- color: #334683; text-decoration: none;
-}
-#gnu-banner a strong {
- font-size: 1.4em;
- color: #971611;
-}
-#fsf-support {
- text-align: left;
- font-size: .9em;
- font-weight: bold;
- font-style: italic;
- padding: .5em 0 .8em 0;
- margin: 0;
- color: #555;
-}
-#fsf-support a, #fsf-support a:visited { color: #555; }
-#fsf-support a:hover { color: black; }
-
-/* For the pages still using style.css */
-#logo {
- background:url(/graphics/topbanner.png) no-repeat;
- float: left;
- padding:0; margin:0; border:0;
+ line-height: 1.4em;
+ padding: 0 1em ;
+ margin: 1em 0;
}
-#logo a {
- display:block; overflow:hidden;
- width:550px;
- height:0px !important;
- text-decoration:none;
- padding:0; padding-top:101px;
- margin:0; border:0;
- cursor:pointer;
+#content .note strong { font-size: 1.2em; }
address@hidden (max-width: 45em) {
+ #content .note { float: none; margin: auto; }
}
+/* Note about Free Software Free Society */
+#content blockquote#fsfs p { padding: .3em 0; }
-/*** PROMOTIONAL BANNER ***/
-
+/* Promotional banner */
.promo-banner {
background-position: 99% 9%;
background-color: #ccc;
@@ -503,7 +416,413 @@
padding: 1em 6em 0.25em 6em; /* size-review */
}
-
+/* the urgent div should be enabled when we have something urgent to
+ appear on every page - these typically come from johns, peterb or rms
+ at the fsf */
+#urgent {
+ text-align: center;
+ font-size: .9em; font-weight: bold;
+ line-height: 2.6em;
+ color: black;
+ background-color: #ff3;
+ border-bottom: .3em solid #333;
+}
+#urgent a, #urgent a:visited {
+ color: blue; text-decoration: underline;
+}
+#urgent a:hover { color: #777; }
+
+
+/*** TABLES OF CONTENTS ***/
+
+/* Common definitions */
+#content div.summary, #content div.toc {
+ padding: 1.5em 1.5em 1.8em 1.5em;
+ background: #f0f2f4;
+ border: 1px solid #c9cccf;
+}
+#content div.summary a, #content div.toc a {
+ text-decoration: none;
+}
+#content div.summary a:hover, #content div.toc a:hover {
+ color: black; text-decoration: underline;
+}
+#content div.summary ul, #content div.toc ul {
+ margin-top: 0; margin-bottom: 0;
+}
+#content div.summary h3, #content div.toc h3,
+#content div.summary h4 {
+ text-align: center; padding-top: 0; margin-top: .2em;
+}
+
+/* Small tables of contents */
+#content div.summary {
+ clear: right;
+ float: right;
+ max-width: 20em;
+ margin: .3em 0 1em 1.5em;
+}
address@hidden (max-width: 46em) {
+ #content div.summary {
+ float: none; max-width: 25em;
+ margin: auto; margin-top: 2.5em;
+ }
+}
+
+/* Big tables of contents */
+#content div.toc {
+ max-width: 45em;
+ margin: 3em auto 2em auto;
+}
+
+
+/*** LISTINGS ***/
+
+.listing,
+.stx table {
+ /* The default table for document listings. Contains name, document types,
+ modification times etc in a file-browser-like fashion */
+ border-collapse: collapse;
+ border: 1px solid #666666;
+ margin: 1em 0em 1em 0em;
+}
+
+.listing th,
+.stx table th {
+ background: #fff898;
+ color: black;
+ font-weight: bold !important;
+ border: 1px solid #666666;
+ font-weight: normal;
+ padding: .7em;
+}
+
+.listing td a { display: block; }
+.listing .top {
+ border-top: 1px solid #666666;
+ text-align: right ! important;
+ padding: 0em 0em 1em 0em;
+}
+
+.listing .odd {
+ /*every second line should be shaded */
+ background-color: transparent;
+}
+.listing .even {
+ background-color: #f0f2f4;
+}
+.listing .listingCheckbox {
+ text-align: center;
+}
+.listing td,
+.stx table td {
+ border: 1px solid #666666;
+ padding: 1em;
+ text-align: center;
+ line-height: 1.3em
+}
+
+.listing a:hover {
+ text-decoration: underline;
+}
+
+.listing img {
+ vertical-align: middle;
+}
+
+.listing { width: 100%; }
+
+/* For wide tables, e.g. in doc/other-free-books.html */
+table.listing {
+ display: block;
+ overflow: auto;
+ padding: .1em;
+ margin: 2em auto;
+}
+
+
+/* BIG SECTION HEADERS */
+
+/* For license-list.html, but could apply elsewhere. */
+
+#content div.big-section {
+ float: left;
+}
+#content div.big-section h3 {
+ font-size: 1.8em;
+ padding: .2em 0;
+ margin: 1.3em .3em .6em 0 ;
+ color: black;
+ border-top: .2em solid #6989b6;
+ border-bottom: .2em solid #6989b6;
+}
+#content div.big-subsection {
+ margin-top: 1.3em;
+ margin-bottom: 2em;
+}
+#content div.big-subsection h4 {
+ clear: both;
+ display: inline;
+ font-size: 1.5em;
+ margin-right: .3em;
+ color: black;
+}
+
+
+/*** IMAGES ***/
+
+/* For wide rectangular images */
+#content .photo {
+ float: right;
+ width: 27em; max-width: 100%;
+ margin: .3em 0 1em 1.5em;
+}
+#content .photo img { width: 100%; }
+
address@hidden (max-width: 50em) {
+ #content .photo { float: none; margin: auto; }
+}
+
+/* Still used in /s/cgicc/. */
+#gplv3-dogear {
+ position: absolute;
+ top: -1px;
+ left: -1px;
+}
+#gplv3-dogear h3 {margin: 0;}
+#gplv3-dogear a {
+ background-image: url('/graphics/dogear.png');
+ border: 0;
+ display: block;
+ overflow: hidden;
+ height: 0px !important;
+ width: 64px;
+ padding: 0;
+ padding-top: 64px;
+ cursor: pointer;
+}
+
+
+/*** MUSIC AND POEMS ***/
+
+#content .caption { color: #334683; font-size: 1.5em; margin:0; }
+
+.lyrics {
+ background-color: #f0f2f4; font-style: italic; width: 25em;
+ padding: 2em; border: 2px solid #e7e9eb;
+ margin-left: 2em; margin-right: 2em;
+}
+
+
+
+/************************
+ ** PAGE DESCRIPTION **
+ ************************/
+
+/*** TOP OF THE PAGE ***/
+
+#toplinks {
+ float: left;
+ padding-top: .6em; padding-bottom: .3em;
+ margin: 0;
+}
+
+#toplinks a, #toplinks a:visited {
+ white-space: nowrap;
+ /* the next line is a workaround for Midori 0.5.8 */
+ display: inline-block;
+ font-weight: bold;
+ font-size: .9em;
+ color: #404040; text-decoration: none;
+ margin-right: 1em;
+}
+#toplinks a:hover, #home-icon a:hover { color: #777; }
+
+#searcher {
+ display: block;
+ text-align: right;
+ font-size: .9em;
+ font-weight: bold;
+ padding-top: .3em; padding-bottom: .3em;
+}
+#searcher input { margin: 0; }
+#searcher input[type="text"] {
+ padding: .3em;
+ margin: 0;
+ color: #555;
+ background: white;
+ border: .1em solid #999;
+}
+#searcher input[type="submit"] {
+ padding: .2em .4em;
+ margin: 0;
+ color: #333;
+ background: #e7e9eb;
+ border: .1em solid #999;
+}
+#searcher input[type="text"]:focus {
+ color: #333;
+ border: .1em solid #334683;
+}
+#searcher input[type="text"]:focus + input[type="submit"] {
+ border: .1em solid #334683;
+}
+#searcher input[type="submit"]:hover { cursor: pointer; }
+
+#translations {
+ clear: both;
+ text-align: left;
+ line-height: 1.3em;
+ padding: 0 3%;
+ border-bottom: .3em solid #d1d4d7;
+}
+#translations p {
+ font-size: .8em;
+ padding: .2em 0;
+ margin: 0;
+}
+#translations span {
+ white-space: nowrap;
+ margin-right: .5em;
+}
+#translations a, #translations a:visited {
+ color: #222; text-decoration: none;
+}
+/* Highlight the link to the original page */
+#translations span.original {
+ font-size: 1.1em; font-weight: bold;
+ padding-top: .3em;
+}
+#translations span.original a,
+#translations span.original a:visited {
+ color: #334683;
+}
+#translations a:hover,
+#translations span.original a:hover {
+ color: #777;
+}
+
+
+/*** HEADER ***/
+
+#header:after {
+ clear: both; content: ""; display: block;
+ height: 0px; visibility: hidden; width: 0px;
+}
+
+#fsf-frame {
+ float: right;
+ font-size: .9em;
+ text-align: center;
+ line-height: 1.3em;
+ width: auto;
+ padding: 0;
+ margin: 1.2em 0 1em 0;
+}
+#fsf-frame a, #fsf-frame a:visited {
+ font-size: 1.1em;
+ font-weight: bold;
+ text-decoration: none;
+}
+#fsf-frame p { padding: 0; margin: 0; }
+#fsf-frame hr { display: none; }
+
+#join-fsf { padding: .4em 0; }
+#join-fsf a, #join-fsf a:visited {
+ padding: .3em 1em;
+ color: #971611;
+ background: #e7e9eb;
+ border: .1em solid #999;
+}
+#fssbox {
+ padding: 0;
+ margin-top: 1.3em;
+}
+#fssbox a, #fssbox a:visited {
+ color: #334683;
+}
+#fssbox form p { margin-top: .2em; }
+#fssbox input { font-weight: bold; }
+#fssbox input[type="text"] {
+ padding: .2em;
+ margin: 0;
+ color: #555;
+ background: #f0f2f4;
+ border: .1em solid #999;
+}
+#fssbox input[type="submit"] {
+ padding: .2em .4em;
+ margin: 0;
+ color: #333;
+ background: #e7e9eb;
+ border: .1em solid #999;
+}
+#fssbox input[type="text"]:focus {
+ color: #333;
+ border: .1em solid #334683;
+}
+#fssbox input[type="submit"]:hover {
+ cursor: pointer;
+}
+#fssbox input[type="text"]:focus + input[type="submit"] {
+ border: .1em solid #334683;
+}
+#fsf-frame a:hover { color: #777; }
+
+#gnu-banner {
+ font-size: 1.8em;
+ font-weight: bold;
+ line-height: 1.3em;
+ padding-top: 1.1em;
+}
+#gnu-banner img {
+ float: left;
+ height: 2.4em;
+ margin: 0 .3em 0 0;
+ position: relative; bottom: .3em;
+}
+#gnu-banner a {
+ color: #334683; text-decoration: none;
+}
+#gnu-banner a strong {
+ font-size: 1.4em;
+ color: #971611;
+}
+#fsf-support {
+ text-align: left;
+ font-size: .9em;
+ font-weight: bold;
+ font-style: italic;
+ padding: .5em 0 1em 0;
+ margin: 0;
+ color: #555;
+}
+#fsf-support a, #fsf-support a:visited { color: #555; }
+#fsf-support a:hover { color: black; }
+
+/* Try to optimize the header for narrow screens. */
address@hidden (max-width: 55em) {
+ #header #gnu-banner {
+ clear: both;
+ padding-top: .6em;
+ }
+ #fsf-support { font-size: .8em; }
+ #fsf-frame { float: none; margin: 0; }
+ #fsf-frame #fssbox {
+ float: right; padding-top: .8em; margin: 0;
+ }
+ #fsf-frame #join-fsf {
+ float: left;
+ padding: 1.2em 0 .5em 0;
+ margin-left: 2em;
+ }
+}
address@hidden (max-width: 35em) {
+ #header { font-size: .8em; }
+ #header #gnu-banner img { bottom: .2em; }
+}
+
+
/*** NAVIGATION BARS ***/
#navigation, #fsf-links {
@@ -524,6 +843,10 @@
line-height: 1.7em;
margin: 0;
}
+/* To avoid size change when active. */
+#navigation li { border: .1em solid #a50606; }
+ul#edu-navigation li, #fsf-links li { border: .1em solid #c9cccf; }
+
#navigation li a, ul#edu-navigation li a, #fsf-links li a {
padding: .3em .5em;
text-decoration: none;
@@ -534,10 +857,8 @@
#navigation li a:hover, ul#edu-navigation li a:hover,
#fsf-links li a:hover { text-decoration: underline; }
-#navigation li.active, #edu-navigation li.active {
- background-color: white;
-}
#navigation li.active, ul#edu-navigation li.active {
+ background-color: white;
border: .1em solid #999;
}
#navigation li.active a, #edu-navigation li.active a { color: #333; }
@@ -571,297 +892,91 @@
text-align: left;
}
#content h1, #content h2 {
- font-weight:bold;
- padding: 0;
- margin: 1em 0;
- color: #334683; text-shadow: #999 1px 1px 0;
-}
-#content h1 { font-size: 2.4em; }
-#content h2 { font-size: 2em; }
-#content h4, #content h5, #content h6, #content p {
- margin-top: 1em ;
-}
-#content h3 { font-size: 1.6em; color: #333; margin: 1.2em 0 .7em 0; }
-#content h4 { font-size: 1.3em; color: #333; margin-bottom: .6em; }
-#content h5 { font-size: 1.1em; margin-bottom: .7em; }
-#content h6 { font-size: 1em; }
-#content ul li, #fsf-campaigns ul li { list-style: square; }
-#content ol {
- list-style: decimal; margin-left: 1em; margin-right: 1em;
-}
-#content li, #fsf-campaigns li { line-height: 1.4em; margin-top: .2em; }
-#content dd, #content p, #content pre, #content dt,
- #content code, #content address { line-height: 1.3em; }
-
-#content h3 a[href]:visited, #content h4 a[href]:visited { color: #334683; }
-#content h3 a[href]:hover, #content h4 a[href]:hover { color: #777; }
-
-#content small { font-size: .9em; }
-
-/* Equivalent of #backtotop within a section */
-#content p.back {
- text-align: right;
- font-weight: bold;
- line-height: 1.5em;
- padding: 0 2%;
- margin-top: 2em;
-}
-#content p.back a, .back a:visited { color: #333; }
-#content p.back a:hover { color: #777; }
-
-
-/*** FSF STUFF ***/
-
-#mission-statement { margin: 2em 0 1em 0; }
-
-#mission-statement {
- font-size: 0.9em;
-}
-#mission-statement blockquote {
- font-weight: bold;
- margin: 1em 0;
-}
-#mission-statement img {
- float: left;
- height: 2em;
- margin: .3em .5em;
-}
-#mission-statement p { margin: 0 0 .2em 0; }
-
-#backtotop a {
- clear: both;
- float: right;
- font-size: 1.1em;
- font-weight: bold;
- margin: 2.5em 2% 1.5em 2%;
-}
-#backtotop a, #backtotop a:visited { color: #333; }
-#backtotop a:hover { color: #777; }
-
-#sisters { font-size: .9em; margin: 0 0 1.5em 0; }
-
-
-/*** FOOTER ***/
-
-#footer {
- clear: both;
- color: #333;
- padding-top: 1em; padding-bottom: 1em;
- margin-bottom: 1em;
- border-top: 1px solid #c9cccf;
-}
-#footer p { font-size: .9em; margin-bottom: 0; }
-
-#footer .unprintable, #footer .translators-credits {
- margin-bottom: .7em;
-}
-
-#bottom-notes { margin-top: .7em; }
-
-
-/*** HOME PAGE ***/
-
-#home:after {
- clear: both; content: ""; display: block;
- height: 0px; visibility: hidden; width: 0px;
-}
-#home .first-column {
- width: 60%;
- float: left;
-}
-#home .second-column {
- width: 37%;
- float: right;
-}
-#home .first-column, #home .second-column {
- margin: 0;
-}
-
-#home h2 {
- text-shadow: none;
- padding: 0;
- margin-top: .9em; margin-bottom: .6em;
-}
-#home .first-column img {
- width: 100%; max-width: 35em;
- margin: .5em auto 1em auto;
-}
-#home .second-column h4 img { height: .75em; width: .75em; }
-
-#home .button {
- text-align: center;
font-weight: bold;
- margin-top: 2em; margin-bottom: 2.5em;
-}
-#home .emph-box {
- padding-bottom: .7em;
- border-top-left-radius: 2em;
- border-top-right-radius: 2em;
- -moz-border-top-left-radius: 2em;
- -moz-border-top-right-radius: 2em;
- -khtml-border-top-left-radius: 2em;
- -khtml-border-top-right-radius: 2em;
- -webkit-border-top-left-radius: 2em;
- -webkit-border-top-right-radius: 2em;
- -opera-border-top-left-radius: 2em;
- -opera-border-top-right-radius: 2em;
-}
-#home .emph-box p { font-size: .9em; }
-
-#Action {
- text-align: left;
- padding: 0 1em;
- margin: 2.5em 0;
- border-left: .4em solid #b9bcbf; border-right: .4em solid #b9bcbf;
-}
-#Action h2 {
- float: none;
- text-align: center;
- padding-top: 0;
- color: #171d33;
-}
-#Action li { margin-bottom: .7em; }
-
address@hidden (max-width: 55em) {
- #home .first-column, #home .second-column {
- float: none; width: 100%; }
-}
-
-
-/*** HIGHLIGHTED STUFF AND INSETS ***/
-
-.highlight, .highlight-para {
- clear: both;
- color: black;
-}
-.highlight {
-/* Please do not add borders. This style is applied to an in-line tag. */
- padding: .2em .5em;
- background-color: #fff898;
- border: 0;
-}
-.highlight-para {
- padding: 0 1.2em;
- background-color: #ffc;
- border: 2px solid #b9bcbf;
-}
-
-.emph-box {
- padding: 0 1em;
- background-color: #f0f2f4;
- border: 1px solid #c9cccf;
-}
-#content .emph-box h4 {
- text-align: center;
- font-size: 1.5em;
-}
-
-
-/*** NOTES AND ANNOUNCEMENTS ***/
-
-/* For the announcements */
-#content div.announcement {
- font-size: 1.1em; font-weight: bold;
- padding: 0 1em;
- margin: 1.5em 0;
- color: #333;
- border-left: .5em solid #b9bcbf;
-}
-#content div.announcement blockquote {
- margin-left: 0; margin-right: 0;
-}
-
-/* the urgent div should be enabled when we have something urgent to
- appear on every page - these typically come from johns, peterb or rms
- at the fsf */
-#urgent {
- text-align: center;
- font-size: .9em; font-weight: bold;
- line-height: 2.6em;
- color: black;
- background-color: #ff3;
- border-bottom: .3em solid #333;
-}
-#urgent a, #urgent a:visited {
- color: blue; text-decoration: underline;
-}
-#urgent a:hover { color: #777; }
-
-/* For the notes about mailing lists, etc. */
-#content .note {
- clear: right;
- float: right;
- text-align: center;
- font-style: normal;
- max-width: 20em;
padding: 0;
- margin: .3em 0 1em 1.5em;
- border: .3em solid #3465a4;
-}
-#content .note p {
- font-size: 1.1em;
- line-height: 1.4em;
- padding: 0 1em ;
margin: 1em 0;
+ color: #334683; text-shadow: #999 1px 1px 0;
}
-#content .note strong { font-size: 1.2em; }
address@hidden (max-width: 45em) {
- #content .note { float: none; margin: auto; }
+#content h1 { font-size: 2.4em; }
+#content h2 { font-size: 2em; }
+#content h4, #content h5, #content h6, #content p {
+ margin-top: 1em;
}
+#content h3 { font-size: 1.6em; margin: 1.2em 0 .7em 0; }
+#content h4 { font-size: 1.3em; margin-bottom: .6em; }
+#content h5 { font-size: 1.1em; margin-bottom: .7em; }
+#content h6 { font-size: 1em; }
-/* For the note about Free Software Free Society */
-#content blockquote#fsfs p { padding: .3em 0; }
-
+#content h3 a[href]:visited, #content h4 a[href]:visited { color: #334683; }
+#content h3 a[href]:hover, #content h4 a[href]:hover { color: #777; }
-/*** TABLES OF CONTENTS ***/
+#content small { font-size: .9em; }
-/* Common definitions */
-#content div.summary, #content div.toc {
- padding: 1.5em; padding-bottom: 1.8em;
- background: #f0f2f4;
- border: 1px solid #c9cccf;
-}
-#content div.summary a, #content div.toc a {
- text-decoration: none;
-}
-#content div.summary a:hover, #content div.toc a:hover {
- color: black; text-decoration: underline;
+/* Equivalent of #backtotop within a section */
+#content p.back {
+ text-align: right;
+ font-weight: bold;
+ line-height: 1.5em;
+ padding: 0 2%;
+ margin-top: 2em; margin-bottom: 0;
}
-#content div.summary strong, #content div.toc strong {
- display: block; padding-top: .5em;
+#content p.back a, .back a:visited { color: #333; }
+#content p.back a:hover { color: #777; }
+
+
+/*** MISSION STATEMENT + BACK TO TOP ***/
+
+#mission-statement {
+ font-size: 0.9em;
+ margin: 2em 0 1em 0;
}
-#content div.summary ul, #content div.toc ul {
- margin-top: 0; margin-bottom: 0;
+#mission-statement blockquote {
+ font-weight: bold;
+ margin: 1em 0;
}
-#content div.summary h3, #content div.toc h3,
-#content div.summary h4 {
- text-align: center; padding-top: 0; margin-top: 0;
+#mission-statement img {
+ float: left;
+ height: 2em;
+ margin: .3em .5em;
}
+#mission-statement p { margin: 0 0 .2em 0; }
-/* Small tables of contents */
-#content div.summary {
- clear: right;
+#backtotop a {
+ clear: both;
float: right;
- max-width: 20em;
- margin: .3em 0 1.5em 1.5em;
+ font-size: 1.1em;
+ font-weight: bold;
+ margin: 2.5em 2% 1.5em 2%;
}
address@hidden (max-width: 46em) {
- #content div.summary {
- float: none; max-width: 25em;
- margin: auto; margin-top: 2.5em;
- }
+#backtotop a, #backtotop a:visited { color: #333; }
+#backtotop a:hover { color: #777; }
+
+
+/*** FOOTER ***/
+
+#footer {
+ clear: both;
+ color: #333;
+ padding: 1em 3%;
+ border-top: 1px solid #c9cccf;
}
+#footer p { font-size: .9em; margin: 0; }
-/* Big tables of contents */
-#content div.toc {
- max-width: 45em;
- margin: 3em auto 2em; auto;
+#footer .unprintable, #footer .translators-credits {
+ margin-bottom: .7em;
}
+#bottom-notes { margin-top: .7em; }
+
+
-/*** TRANSLATED PAGES ***/
+/*********************
+ ** SPECIAL PAGES **
+ *********************/
-/* For the note saying the page is a translation. */
+/*** TRANSLATIONS ***/
+
+/* Note saying the page is a translation. */
#content .trans-disclaimer {
text-align: center;
font-weight: bold;
@@ -872,7 +987,7 @@
#content .trans-disclaimer a:visited { color: #333; }
#content .trans-disclaimer a:hover { color: #777; }
-/* For outdated translations */
+/* Outdated translations */
#outdated {
text-align: center;
padding: .7em 3%;
@@ -891,44 +1006,35 @@
#outdated p {
margin: 0.2em 0;
}
-/* In the out-of-date notice, we use <br> elements to separate
- translatable texts from automatically generated items. */
-#outdated br { display: none }
-#outdated a:visited { color: #334683; }
-#outdated a:hover { color: #777; }
-/* For translators notes */
+/* Translators notes */
#content .translators-notes {
clear: both;
font-size: .9em; margin-top: 2.2em;
}
-#content .translators-notes hr {
- width: 20em;
- text-align: left; margin-left: 0 !important;
-}
/*** EDUCATION ***/
-/* definitions for /education-specific navigation bar
- and breadcrumbs for education */
+/* Breadcrumbs */
#content .edu-breadcrumb {
- font-family: "FreeSans", sans-serif;
+ font-size: .9em;
font-weight: bold;
text-align: left;
- margin: .4em 0 0 0;
- color: #555;
+ padding-top: .4em;
+ margin-top: 0;
+ color: #333;
}
#content .edu-breadcrumb a,
#content .edu-breadcrumb a:visited {
- color: #555;
+ color: #334683;
text-decoration: none;
}
#content .edu-breadcrumb a:hover {
- color: black;
+ color: #777;
}
-/* styles for subsections of /education "Case Studies" */
+/* Subsections of /education "Case Studies" */
div.edu-cases {
border-top: 5px ridge #3465a4;
border-bottom: 5px ridge #3465a4;
@@ -948,225 +1054,41 @@
margin: 0; margin-bottom: .1em;
}
-/* For images in the Education section (and elsewhere?) */
-#content .photo {
- float: right;
- width: 27em; max-width: 100%;
- margin: .3em 0 1em 1.5em;
-}
-#content .photo img { width: 100%; }
-
address@hidden (max-width: 50em) {
- #content .photo { float: none; margin: auto; }
-}
-
-/* End items specific to education */
-
-
-/*** LISTINGS AND TABLES ***/
-
-.listing,
-.stx table {
- /* The default table for document listings. Contains name, document types,
- modification times etc in a file-browser-like fashion */
- border-collapse: collapse;
- border: 1px solid #666666;
- margin: 1em 0em 1em 0em;
-}
-
-.listing th,
-.stx table th {
- background: #fff898;
- color: black;
- font-weight: bold !important;
- border: 1px solid #666666;
- font-weight: normal;
- padding: .7em;
-}
-
-.listing td a { display: block; }
-.listing .top {
- border-top: 1px solid #666666;
- text-align: right ! important;
- padding: 0em 0em 1em 0em;
-}
-
-.listing .odd {
- /*every second line should be shaded */
- background-color: transparent;
-}
-.listing .even {
- background-color: #f0f2f4;
-}
-.listing .listingCheckbox {
- text-align: center;
-}
-.listing td,
-.stx table td {
- border: 1px solid #666666;
- padding: 1em;
- text-align: center;
- line-height: 1.3em
-}
-
-.listing a:hover {
- text-decoration: underline;
-}
-
-.listing img {
- vertical-align: middle;
-}
-
-.listing { width: 100%; }
-
-/* For wide tables, e.g. in doc/other-free-books.html */
-table.listing {
- display: block;
- overflow: auto;
- padding: .1em;
- margin: auto;
-}
-
-/* This is for licenses/gpl-faq.html. */
-table#gpl-compat-matrix {
- display: block;
- width: 100%;
- overflow: auto;
- padding: .1em;
- margin: auto;
- border-collapse: collapse;
-}
-
-table#gpl-compat-matrix td, th.gpl-matrix-border {
- text-align: center;
- padding: .3em;
- margin: 0;
- border: 1px solid black;
-}
-
-table#gpl-compat-matrix td.ok { background-color: #ccffcc; }
-table#gpl-compat-matrix td.mok { background-color: #e4ffcc; }
-table#gpl-compat-matrix td.nok { background-color: #dddddd; }
-th.gpl-matrix-license { text-align: right; }
-tr.gpl-matrix-use-type { border-top: 2px solid black; }
-
-/* This is used in pages of lists, such as gnu-linux.faq.html,
- to give readers a hint that they can link directly to a given item.
- We make it less obtrusive than the item heading it follows. */
-.anchor-reference-id { font-size: 80%; font-weight: normal; }
-
-span.anchor-reference-id a { color: #333; }
-span.anchor-reference-id a[href]:hover { color: #777; }
-
-/* For license-list.html. */
-#content div.big-section {
- float: left;
-}
-#content div.big-section h3 {
- font-size: 1.8em;
- padding: .2em 0;
- margin: 1.3em .3em .6em 0 ;
- color: black;
- border-top: .2em solid #6989b6;
- border-bottom: .2em solid #6989b6;
-}
-#content div.big-subsection {
- margin-top: 1.3em;
- margin-bottom: 2em;
-}
-#content div.big-subsection h4 {
- clear: both;
- display: inline;
- font-size: 1.5em;
- margin-right: .3em;
- color: black;
-}
-
-hr.separator {
- display: block;
- height: .3em;
- margin-bottom: 1.2em;
- color: #999;
- background-color: #999;
- border: none;
-}
-/* End license-list definitions */
-
-
-/*** MUSIC ***/
-
-#content .caption { color: #334683; font-size: 1.5em; margin:0; }
-
-.lyrics {
- background-color: #f0f2f4; font-style: italic; width: 25em;
- padding: 2em; border: 2px solid #e7e9eb;
- margin-left: 2em; margin-right: 2em;
-}
-
-
-/*** IMAGES ***/
-
-/* Still used in /s/cgicc/. */
-#gplv3-dogear {
- position: absolute;
- top: -1px;
- left: -1px;
-}
-#gplv3-dogear h3 {margin: 0;}
-#gplv3-dogear a {
- background-image: url('/graphics/dogear.png');
- border: 0;
- display: block;
- overflow: hidden;
- height: 0px !important;
- width: 64px;
- padding: 0;
- padding-top: 64px;
- cursor: pointer;
-}
-
-/*** UNUSED? ***/
+/*************
+ ** UNUSED? **
+ *************/
.pad { margin-bottom: 1em; }
.pad td { padding-left: 1em; padding-right: 1em; }
div.spacer { height: .1em; width: 100%; background-color: transparent; }
-/* For column headers in education.html, but could apply elsewhere. */
+/* For the old version of education.html, but could apply elsewhere. */
+/* Are the .yui-* classes still in use?? */
#content .yui-gc h2 {
text-shadow: none;
margin-bottom: .7em;
}
/* For translation lists below the navigation bar. */
-#content #translations { background: white; }
-#content #translations p {
- padding: .2em .5em .3em .5em;
- margin: 1em 0 0 0;
- background: #e7e9eb;
+#content #translations {
+ background-color: #e7e9eb; border: none;
}
+#content #translations p { line-height: 1.8em; margin: 0; }
/* Still used in some outdated translations? */
#translations h3, #translations h4 {
- font-size: 1em; font-weight: bold;
- padding: 1em 3% 0 3%;
- margin: 0;
-}
-#translations ul {
- margin: 1em 3%;
- background: #f0f2f4;
+ font-size: 1em; font-weight: bold; padding-top: 1em;
}
+#translations ul { padding-bottom: 1em; }
#translations li {
direction: ltr; display: inline; white-space: nowrap;
- padding-left: 0.25em; padding-right: 0.25em;
}
/* Still used in some old /server/banner.*.html? */
#links { display: none !important; }
/* For older versions of layout. */
-div#backtotop {
- margin: .7em 0 0 0;
- text-align: right; padding: 1em;
-}
+div#backtotop { padding-left: 3%; padding-right: 3%; }
+div#backtotop a { margin-top: 1em; }
Index: license-list.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/license-list.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- license-list.html 24 Sep 2015 08:02:41 -0000 1.36
+++ license-list.html 7 Oct 2015 10:37:28 -0000 1.37
@@ -8,8 +8,9 @@
<!--
/* These statements are commented out in HTML to
make them untranslatable. */
+#content #TableOfContents { padding-top: .9em; }
#content p.back { margin-top: 3em; }
-#content blockquote.note { margin-top: -4.6em; }
+#content blockquote#fsf-licensing { margin-top: 1.3em; }
/* Definitions for color-coded border */
#content dl.green, #content dl.orange,
#content dl.red, #content dl.blue, #content dl.purple {
@@ -31,9 +32,20 @@
@media print,screen {
#content div#legend { display: block; }
}
-#content div#legend { max-width: 17.4em; padding-top: 0; margin-top: 2.4em; }
address@hidden (max-width: 46em) { #content div#legend { max-width: 30em; }}
-
+#content div#legend {
+ float: right;
+ max-width: 18.4em;
+ font-style: normal;
+ padding: 0 1em 1em 1em;
+ margin: 2.4em 0 1.5em 1.5em;
+ background: #f0f2f4;
+ border: 1px solid #c9cccf;
+}
address@hidden (max-width: 46em) {
+ #content div#legend {
+ float: none; max-width: 30em; margin: 2.4em auto 1.5em auto;
+ }
+}
#content div#legend dl { margin: 1em 0 0 0; }
#content div#legend dt { padding: 1em 0; margin: 0; }
#content div#legend dd { margin: 0; }
@@ -72,43 +84,36 @@
</style>
<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
-<h2 class="c">Various Licenses and Comments about Them</h2>
+<h2>Various Licenses and Comments about Them</h2>
-<div class="toc">
+<div id="TableOfContents" class="toc">
-<h3 id="TableOfContents">Table of Contents</h3>
+<p><strong><a href="#Introduction">Introduction</a></strong></p>
+<p><strong><a href="#SoftwareLicenses">Software Licenses</a></strong></p>
<ul>
-<li><strong><a href="#Introduction">Introduction</a></strong></li>
-
-<li><strong><a href="#SoftwareLicenses">Software Licenses</a></strong>
- <ul>
<li><a href="#GPLCompatibleLicenses">
GPL-Compatible Free Software Licenses</a></li>
<li><a href="#GPLIncompatibleLicenses">
GPL-Incompatible Free Software Licenses</a></li>
<li><a href="#NonFreeSoftwareLicenses">Nonfree Software Licenses</a></li>
- </ul>
-</li>
+</ul>
-<li><strong><a href="#DocumentationLicenses">Licenses For
Documentation</a></strong>
- <ul>
+<p><strong><a href="#DocumentationLicenses">Licenses For
Documentation</a></strong></p>
+<ul>
<li><a href="#FreeDocumentationLicenses">Free Documentation Licenses</a></li>
<li><a href="#NonFreeDocumentationLicenses">
Nonfree Documentation Licenses</a></li>
- </ul>
-</li>
+</ul>
-<li><strong><a href="#OtherLicenses">Licenses for Other Works</a></strong>
- <ul>
+<p><strong><a href="#OtherLicenses">Licenses for Other Works</a></strong></p>
+<ul>
<li><a href="#OtherLicenses">Licenses for Works of Practical Use
besides Software and Documentation</a></li>
<li><a href="#Fonts">Licenses for Fonts</a></li>
<li><a href="#OpinionLicenses">Licenses for Works stating a Viewpoint
(e.g., Opinion or Testimony)</a></li>
<li><a href="#Designs">Licenses for Designs for Physical Objects</a></li>
- </ul>
-</li>
</ul>
</div> <!-- /class="toc" -->
@@ -178,7 +183,7 @@
their licensing information.</p>
-<div id="legend" class="summary">
+<div id="legend">
<blockquote></blockquote>
<dl class="green"><dt></dt><dd></dd></dl>
<dl class="purple"><dt></dt><dd></dd></dl>
@@ -1983,7 +1988,9 @@
commercial redistribution. In addition, condition 4 substantively
restricts the functionality of modified versions.</p>
-<p>Fortunately Scratch 2.0 is now distributed under the GNU GPL.</p></dd>
+<p>Newer versions Scratch software are distributed under the GNU GPL,
+but some of those newer version we do not recommend, because they
+depend on the proprietary software, Adobe Air. </p></dd>
<dt><a id="SML" href="http://directory.fsf.org/wiki/License:SimpleM">
@@ -2552,9 +2559,9 @@
Creative Commons licenses is ok for them.</p>
-<p class="back"><a href="/licenses/licenses.html">More about licenses</a></p>
+<p class="back"><strong><a href="/licenses/licenses.html">More about
licenses</a></strong></p>
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/footer.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -2592,7 +2599,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/24 08:02:41 $
+$Date: 2015/10/07 10:37:28 $
<!-- timestamp end -->
</p>
</div>
Index: philosophy-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/philosophy-menu.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- philosophy-menu.html 7 Sep 2015 22:11:17 -0000 1.5
+++ philosophy-menu.html 7 Oct 2015 10:37:29 -0000 1.6
@@ -2,13 +2,13 @@
<!-- begin edu navigation bar -->
<ul id="edu-navigation">
- <li><a
href="essays-and-articles.html">Essays & articles</a></li>
+ <li><a
href="/philosophy/essays-and-articles.html">Essays & articles</a></li>
<li><a
href="/philosophy/speeches-and-interview.html">Speeches & interviews</a></li>
<li><a
href="/philosophy/third-party-ideas.html">Third party ideas</a></li>
<li><a
href="/server/sitemap.html#directory-philosophy">All articles</a></li>
<li><a
href="http://audio-video.gnu.org/">Audio & video</a></li>
</ul>
<!-- end edu navigation bar -->
-<!--#include virtual="/server/staging/nav-bar/test9/page-tags.html" -->
+<!-- include virtual="/server/page-tags.html" -->
<!-- end philosophy/philosophy-menu.html -->
Index: philosophy.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/philosophy.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- philosophy.html 7 Sep 2015 22:11:18 -0000 1.11
+++ philosophy.html 7 Oct 2015 10:37:29 -0000 1.12
@@ -7,7 +7,6 @@
<!--#include virtual="/philosophy/po/philosophy.translist" -->
<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/tag-base.html" -->
<!--#include virtual="/server/staging/nav-bar/test9/philosophy-menu.html" -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
@@ -17,7 +16,7 @@
<!--#endif -->
<!--#endif -->
-<h2 class="c">Philosophy of the GNU Project</h2>
+<h2>Philosophy of the GNU Project</h2>
<blockquote><p>
See <a href="http://audio-video.gnu.org/">audio-video.gnu.org</a>
@@ -48,7 +47,7 @@
<h3 id="introduction">Introduction</h3>
-<ul class="link-lists">
+<ul>
<li><a href="/philosophy/free-sw.html">What is Free Software?</a></li>
<li><a href="/philosophy/free-software-even-more-important.html">
Why we must insist on free software</a></li>
@@ -114,7 +113,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 4.0. Please do NOT change or remove this
+ be under CC BY-ND 3.0 US. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -132,14 +131,14 @@
<p>Copyright © 2013, 2015 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/07 22:11:18 $
+$Date: 2015/10/07 10:37:29 $
<!-- timestamp end -->
</p>
</div>
Index: software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/software.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- software.html 23 Sep 2015 16:03:14 -0000 1.14
+++ software.html 7 Oct 2015 10:37:29 -0000 1.15
@@ -8,7 +8,7 @@
<!--
#dynamic-duo {
float: right;
- max-width: 20.5em;
+ max-width: 20.6em;
font-style: normal;
text-align: center;
padding: .8em;
@@ -25,9 +25,9 @@
margin: .5em;
border-width: 1px;
} -->
-<!--#if expr="$LANGUAGE_SUFFIX = /\\.(ar|fa|he)/" -->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
<!--
-#content #dynamic-duo { float: left; margin: .3em 1.5em 1em 0; }
+#content #dynamic-duo { float: left; margin: .3em 1.5em 1em 0; } -->
<!--#endif -->
<!--
@media (max-width: 46em) {
@@ -35,12 +35,11 @@
} -->
</style>
-<!--#include virtual="/server/staging/nav-bar/test9/fs-gang-definitions.html"
-->
+<!--#include virtual="/server/fs-gang-definitions.html" -->
<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
-<h2 class="c">GNU Software</h2>
+<h2>GNU Software</h2>
<div class="summary">
-<h4 class="c">A few useful links</h4>
<ul>
<li><strong><a href="/distros/free-distros.html">Wholly free GNU/Linux
Distributions</a></strong></li>
<li><a href="/distros/distros.html">GNU/Linux Distributions</a></li>
@@ -316,7 +315,7 @@
<!-- Regarding copyright, in general, standalone pages (as opposed to
files generated as part of manuals) on the GNU web server should
- be under CC BY-ND 4.0. Please do NOT change or remove this
+ be under CC BY-ND 3.0 US. Please do NOT change or remove this
without talking with the webmasters or licensing team first.
Please make sure the copyright date is consistent with the
document. For web pages, it is ok to list just the latest year the
@@ -334,14 +333,14 @@
<p>Copyright © 2015 Free Software Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
-href="http://creativecommons.org/licenses/by-nd/4.0/">Creative
-Commons Attribution-NoDerivatives 4.0 International License</a>.</p>
+href="http://creativecommons.org/licenses/by-nd/3.0/us/">Creative
+Commons Attribution-NoDerivs 3.0 United States License</a>.</p>
<!--#include virtual="/server/bottom-notes.html" -->
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/09/23 16:03:14 $
+$Date: 2015/10/07 10:37:29 $
<!-- timestamp end -->
</p>
</div>
Index: style.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/style.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- style.css 14 Sep 2015 18:47:39 -0000 1.9
+++ style.css 7 Oct 2015 10:37:29 -0000 1.10
@@ -1,6 +1,6 @@
/* this stylesheet is used by older resources, as well as manuals. */
address@hidden url('combo.css');
address@hidden url('/combo.css');
@import url('layout7.css');
/* some very basic styling for the pages that still use this. */
@@ -9,10 +9,10 @@
/* For pages which don't use #null-wrapper or .inner (Emacs manual,
for example) */
body h2, body h3, body h4, body h5, body p {
- margin-left: 1.5%; margin-right: 1.5%;
+ margin-left: 3%; margin-right: 3%;
}
body ul, body ol, body dl, body blockquote {
- padding-left: 1.5%; padding-right: 1.5%;
+ padding-left: 3%; padding-right: 3%;
}
/* Specifically for sections of the Emacs manual which start at the top
@@ -22,11 +22,29 @@
/* This restores the normal margin for pages which use #null-wrapper
or .inner. */
#null-wrapper h2, #null-wrapper h3, #null-wrapper h4, #null-wrapper h5,
-#null-wrapper p, .inner h2, .inner h3, .inner h4, .inner h5, .inner p,
-#null-wrapper #content div.inner { margin-left: 0; margin-right: 0; }
-
-/* For pages which don't use .inner for all divs.*/
-#searcher, #navigation, #footer, #translations {
+ #null-wrapper p, .inner h2, .inner h3, .inner h4, .inner h5, .inner p {
margin-left: 0; margin-right: 0;
}
-#toplinks { margin-left: 2.2em; }
+
+/* For audio-video.gnu.org and other old-style pages. */
+#logo {
+ background:url(/graphics/topbanner.png) no-repeat;
+ float: left;
+ padding:0; margin:0; border:0;
+}
+#logo a {
+ display:block; overflow:hidden;
+ width:550px;
+ height:0px;
+ text-decoration:none;
+ padding:0; padding-top:101px;
+ margin:0; border:0;
+ cursor:pointer;
+}
+img { width: 30em; max-width: 100%; }
+body .inner h2 { margin-left: 3% !important; }
+body div.inner#content h2 { margin-left: 0 !important; }
+#fsf-links { margin-top: 0; }
+.inner ul { margin-bottom: 1.5em; }
+#translations { border: none; }
+
Index: style.rtl.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/style.rtl.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- style.rtl.css 23 Sep 2015 15:51:48 -0000 1.3
+++ style.rtl.css 7 Oct 2015 10:37:29 -0000 1.4
@@ -15,8 +15,6 @@
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software. */
-ul, ol, dl { margin-right: 2em; }
-
.nocenter, #fsf-support, #content, #Action, html, body,
#content .edu-breadcrumb {
text-align: right;
@@ -61,10 +59,4 @@
float: left;
margin: .3em 1.5em 1em 0;
}
-#content .translators-notes hr {
- text-align: right; margin-right: 0 !important;
-}
address@hidden (max-width: 46em) {
- #content .note { float: none; margin: .3em auto 1em auto; }
-}
Index: fsf-logo-notext-small.png
===================================================================
RCS file: fsf-logo-notext-small.png
diff -N fsf-logo-notext-small.png
Binary files /dev/null and /tmp/cvswZgywl differ
- www/server/staging/nav-bar/test9 body-include-2...,
Therese Godefroy <=