[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 audio-video.ht...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging/nav-bar/test9 audio-video.ht... |
|
Date: |
Sat, 31 Oct 2015 08:19:37 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 15/10/31 08:19:37
Modified files:
server/staging/nav-bar/test9: audio-video.html
body-include-2.html home5.html
layout7.css
Log message:
layout.css: new version; audio-video: update to boilerplate 1.77;
home5: new look (button, screenshot); body-include-2: remove 'button small'
class, incompatible with this version of the layout.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/audio-video.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/body-include-2.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home5.html?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.110&r2=1.111
Patches:
Index: audio-video.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/audio-video.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- audio-video.html 14 Apr 2014 14:18:59 -0000 1.1
+++ audio-video.html 31 Oct 2015 08:19:33 -0000 1.2
@@ -1,87 +1,110 @@
-<!DOCTYPE html>
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+
<head>
+<!-- start of server/head-include-1.html -->
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:address@hidden"; />
-<link rel="icon" type="image/png"
href="http://www.gnu.org/graphics/gnu-head-mini.png"; />
-<meta name="ICBM" content="42.256233,-71.006581" />
+<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
+<meta name="ICBM" content="42.355469,-71.058627" />
<meta name="DC.title" content="gnu.org" />
-<title>Audio/Video — The GNU Operating System</title>
-<meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation,
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU
HURD, Hurd" />
-<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="What's New"
href="http://www.gnu.org/rss/whatsnew.rss"; type="application/rss+xml" />
-
-<link rel="alternate" title="New Free Software"
href="http://www.gnu.org/rss/quagga.rss"; type="application/rss+xml" />
-
-<style type="text/css" media="all">
address@hidden url(style.css);
-
+<!-- end of server/head-include-1.html -->
+<!-- end of server/header.html -->
+<!-- Parent-Version: 1.77 -->
+
+<title>Audio/Video - GNU Project - Free-Software Foundation</title>
+
+<style type="text/css" media="screen">
address@hidden url('/combo.css');
address@hidden url('layout7.css');
#video-list {margin-top: 1em;}
-
#video-list dt, #video-list dd{margin: 0; padding: 0; font-size: 80%;}
-
-.highlight {padding: 5px;}
-
-tt {font-size: 21px;}
-
-
-
+#listen img { width: 30em; max-width: 100%; }
+#content div.summary p { font-weight: normal }
+#content p.emph-box { padding: 1em; }
+#footer { margin-top: 2em; }
</style>
-
<style type="text/css" media="print">
address@hidden url('http://www.gnu.org/print.css');
address@hidden url('/print.min.css');
+</style>
+<style type="text/css" media="handheld">
address@hidden url('/mini.css');
</style>
-</head>
+<!-- start of server/banner.html -->
+<!-- start of head-include-2.html -->
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<!-- end of head-include-2.html -->
+</head>
<body>
+<div class="inner">
+<!-- start of server/body-include-1.html -->
+<div id="toplinks">
+ <a href="#content">Skip to main text</a>
+</div> <!-- /toplinks -->
+
+<div id="searcher">
+ <form method="get" action="/cgi-bin/estseek.cgi">
+ <div>
+ <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
+ value="Why GNU/Linux?" onfocus="this.value=''" />
+ <input type="submit" value="Search" />
+ </div>
+ </form>
+</div><!-- /searcher -->
+<!-- end of server/body-include-1.html -->
+<!-- start of server/body-include-2 -->
+<div id="header">
+<div id="fsf-frame">
+<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
+<div id="fssbox">
+<p><a href="http://www.fsf.org/fss";>Free Software Supporter</a></p>
+<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
method="post">
+ <div>
+ <input name="postURL" type="hidden" value="" />
+ <input type="hidden" name="group[25]" value="1" />
+ <input name="cancelURL" type="hidden"
value="https://crm.fsf.org/civicrm/profile?reset=1&gid=31"; />
+ <input name="_qf_default" type="hidden" value="Edit:cancel" />
+ </div>
+ <p>
+ <input type="text" id="frmEmail" name="email-Primary" size="18"
maxlength="80"
+ value="email address" onfocus="this.value=''"/>
+ <input type="submit" name="_qf_Edit_next" value="Sign up" />
+ </p>
+</form>
+</div><!-- /fssbox -->
+</div><!-- /fsf-frame -->
+
+<div id="gnu-banner">
+ <a href="/">
+ <img src="/graphics/heckert_gnu.small.png" alt=" [A GNU head] "
/><strong>GNU</strong> Operating System</a>
+</div><!-- /gnu-banner -->
- <div id="toplinks"><span class="netscape4"><a href="#content">Skip to
content</a> | | <a href="#searcher">Skip to search</a> | </span></div>
-
-<div id="null-wrapper">
-
- <div id="header">
-
- <div class="inner">
-
-
-
+<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
- <h1 id="logo"><a href="http://www.gnu.org/";>The GNU Operating
System</a></h1>
+</div><!-- /header -->
- </div>
+<div id="navigation">
- </div>
-
- <div id="navigation">
- <div class="inner">
- <ul>
+<ul>
<li id="tabvideo"><a href="/video">Video</a></li>
<li id="tabaudio"><a href="/audio">Audio</a></li>
- <li id="tabformat"><a href="/docs/formatguide.html">Format
Guide</a></li>
- <li id="tabpeer"><a href="/docs/peertopeer.html">Peer to
Peer</a></li>
- <li id="tabrequest"><a href="/docs/requestrecording.html">Request
Recording</a></li>
- <li id="tabresume"><a href="/docs/resumedownload.html">Resume
Download</a></li>
+ <li id="tabformat"><a
href="/docs/formatguide.html">Format Guide</a></li>
+ <li id="tabpeer"><a
href="/docs/peertopeer.html">Peer to Peer</a></li>
+ <li id="tabrequest"><a
href="/docs/requestrecording.html">Request Recording</a></li>
+ <li id="tabresume"><a
href="/docs/resumedownload.html">Resume Download</a></li>
<li id="tabstreaming"><a href="/docs/index.html">Streaming</a></li>
- <li id="joinfsftab"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>Join the
FSF!</a></li>
- </ul>
-
-
-
- </div>
-
- </div>
-
-<div id="content" class="inner">
-
-
-
+</ul>
-<p class="netscape4">Richard Stallman announced in September 1983 the plan to
develop a free software Unix-like operating system
- called GNU. GNU is the only operating system developed specifically for the
sake of users' freedom.</p>
+</div><!-- /navigation -->
+<!-- end of server/body-include-2 -->
+<div id="content">
+<!-- end of server/banner.html -->
<h2>GNU Audio and Video</h2>
- <p class="c"><img src="http://www.gnu.org/graphics/listen-eighth.jpg"; alt="A
gnu listening to music"></p>
+ <p id="listen" class="c"><img src="/graphics/listen-eighth.jpg" alt=" [A gnu
listening to music] "></p>
<p>Here you can watch video or listen to audio recordings of
speeches and other events related to the Free Software Foundation or the
@@ -112,95 +135,132 @@
href="http://creativecommons.org/licenses/by-nd/3.0/";>Attribution-No
Derivative Works</a> 3.0 license or later versions.</p>
- <h2>Mirror these files</h2>
+<h3>Mirror these files</h3>
<p>If you wish to make a local copy or mirror of our audio/video
files, you can do so with the following command:</p>
- <p class="tt"><tt><a href="http://samba.anu.edu.au/rsync/";>rsync</a>
audio-video.gnu.org::audio-video</tt></p>
-
- <h2>Sitemap</h2>
-
- <div class="inner">
-
-<div class="yui-g" id="fsf-links">
- <ul>
- <li><a href="http://gnu.org/";>GNU home page</a></li>
- <li><a href="http://www.fsf.org/";>FSF home page</a></li>
- <li><a href="http://gnu.org/graphics/graphics.html";>GNU Art</a></li>
- <li><a href="http://gnu.org/fun/fun.html";>GNU Fun</a></li>
- <li><a href="http://gnu.org/people/people.html";>GNU's Who?</a></li>
- <li><a href="http://gnu.org/server/sitemap.html";>Site map</a></li>
- </ul>
-</div>
+ <p class="emph-box"><code><a href="http://samba.anu.edu.au/rsync/";>rsync</a>
audio-video.gnu.org::audio-video</code></p>
-<h2>Feedback</h2>
+<h3>Feedback</h3>
<p> If you find a problem with this server or have a speech
recording to contribute, please report to <a
- href="http://savannah.gnu.org/task/?func=additem&group=audio-video";>Make a
task</a> for maintainers of the project or fill a <a
-
href="http://savannah.gnu.org/support/?func=additem&group=audio-video";>support
+ href="http://savannah.gnu.org/task/?func=additem&group=audio-video";>Make
a task</a> for maintainers of the project or fill a <a
+
href="http://savannah.gnu.org/support/?func=additem&group=audio-video";>support
request</a>.</p>
-
<p> Come visit the Project's homepage on Savannah <a
href="http://savannah.gnu.org/projects/audio-video/";>Audio-Video</a></p>
+
<p> Add yourself to the low traffic mailing <a
href="http://lists.gnu.org/mailman/listinfo/audio-video";>list</a>.</p>
-</div>
-</div>
+</div><!-- for id="content", starts in the include above -->
+<!-- begin server/footer-text.html -->
+<hr class="netscape4" />
+<div id="fsf-links">
+ <ul>
+ <li><a href="//www.fsf.org/">FSF home page</a></li>
+ <li><a href="//directory.fsf.org">Free Software Directory</a></li>
+ <li><a href="//www.gnu.org/graphics/graphics.html">GNU Art</a></li>
+ <li><a href="//www.gnu.org/fun/fun.html">GNU Fun</a></li>
+ <li><a href="//www.gnu.org/people/people.html">GNU's Who?</a></li>
+ <li><a href="//www.gnu.org/server/sitemap.html">Site map</a></li>
+ </ul>
+</div><!-- /fsf-links -->
+<div id="mission-statement">
-<div class="inner">
+<blockquote>
+<p><a href="//www.fsf.org"><img id="fsfbanner"
+src="/graphics/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>
+</blockquote>
+
+<p>The <a href="//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 <a
+href="//shop.fsf.org/">buying manuals and gear</a>, <a
+href="//my.fsf.org/associate/support_freedom?referrer=4052">
+<strong>joining the FSF</strong></a> as an associate member, or making
+a <strong>donation</strong>, either <a
+href="//donate.fsf.org/">directly to the FSF</a> or <a
+href="//flattr.com/thing/313733/gnuproject-on-Flattr">via
+Flattr</a>.</p>
-<h2>Check out other Free Software Foundation campaigns</h2>
+<h3>Check out other Free Software Foundation campaigns</h3>
<ul>
<li><a href="http://defectivebydesign.org/";>Defective by Design</a>, a
campaign against Digital Restrictions Management (DRM)</li>
<li><a href="http://windows7sins.org/";>Windows 7 Sins</a>, the case against
Microsoft and proprietary software</li>
<li><a href="http://playogg.org/";>PlayOgg</a> — support free media
formats</li>
-
</ul>
-</div>
+<p id="backtotop"><a href="#header">back to top</a></p>
-<!-- BEGIN copyleft -->
+</div><!-- /mission-statement -->
+<!-- end server/footer-text.html -->
<div id="footer">
-<!--
- this anchor is referred to from the default
- gendocs_template (available as part of Texinfo) used for
- generating GNU manuals online, so please don't remove it.
--->
-<p>
- Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010
- <a href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
-<p><a href="http://www.fsf.org/about/dmca-notice";>Copyright Infringement
Notification</a></p>
-<p>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://fsf.org.in/";>India</a>.</p>
-
-<p>Verbatim copying and distribution of this entire article are
- permitted worldwide, without royalty, in any medium, provided this
- notice, and the copyright notice, are preserved. </p>
-
-<p>Last Updated:
- <!-- timestamp start -->
- $Date: 2014/04/14 14:18:59 $
- <!-- timestamp end -->
-</p>
+<div class="unprintable">
+<p>Please send general FSF & GNU inquiries to
+<a href="mailto:address@hidden";><address@hidden></a>.
+There are also <a href="//www.gnu.org/contact/">other ways to contact</a>
+the FSF. Broken links and other corrections or suggestions can be sent
+to <a href="mailto:address@hidden";><address@hidden></a>.</p>
+
+<p><!-- TRANSLATORS: Ignore the original text in this paragraph,
+ replace it with the translation of these two:
+
+ We work hard and do our best to provide accurate, good quality
+ translations. However, we are not exempt from imperfection.
+ Please send your comments and general suggestions in this regard
+ to <a href="mailto:address@hidden";>
+ <address@hidden></a>.</p>
+
+ <p>For information on coordinating and submitting translations of
+ our web pages, see <a
+ href="/server/standards/README.translations.html">Translations
+ README</a>. -->
+Please see the <a
+href="//www.gnu.org/server/standards/README.translations.html">Translations
+README</a> for information on coordinating and submitting translations
+of this article.</p>
</div>
-<!-- END copyleft -->
-<!-- BEGIN TranslationList -->
-<div id="translations">
-<!-- <h4><a
href="http://www.gnu.org/server/standards/README.translations.html";>Translations</a>
of this page</h4> -->
-
-<!-- END TranslationList -->
+<!-- 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 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
+ document was modified, or published.
+
+ If you wish to list earlier years, that is ok too.
+ Either "2001, 2002, 2003" or "2001-2003" are ok for specifying
+ years, as long as each year in the range is in fact a copyrightable
+ year, i.e., a year in which the document was published (including
+ being publicly visible on the web or in a revision control system).
+
+ There is more detail about copyright years in the GNU Maintainers
+ Information document, www.gnu.org/prep/maintain. -->
+
+<p>Copyright © 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.</p>
+
+<p>This page is licensed under a <a rel="license"
+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/10/31 08:19:33 $
+<!-- timestamp end -->
+</p>
+</div>
</div>
</body>
</html>
-<!-- END layout -->
-
-
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/body-include-2.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- body-include-2.html 16 Oct 2015 09:51:00 -0000 1.33
+++ body-include-2.html 31 Oct 2015 08:19:35 -0000 1.34
@@ -2,7 +2,7 @@
<div id="header">
<div id="fsf-frame">
-<p id="join-fsf" class="button small"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
+<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
<div id="fssbox">
<p><a href="http://www.fsf.org/fss";>Free Software Supporter</a></p>
<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
method="post">
Index: home5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home5.html,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- home5.html 16 Oct 2015 10:17:45 -0000 1.50
+++ home5.html 31 Oct 2015 08:19:35 -0000 1.51
@@ -9,9 +9,13 @@
<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; margin: 0 !important;
+ float: left;
}
#home .second-column {
width: 37%;
@@ -25,30 +29,21 @@
width: 100%; max-width: 35em;
margin: .5em auto 1em auto;
}
-#home .first-column p.back { margin-bottom: 2.5em; }
-#home .button {
- text-align: center;
- font-weight: bold;
- margin-top: 2em; margin-bottom: 2.5em;
-}
+#home .first-column p.back { margin-bottom: 0; }
#home .second-column h4 img { height: .75em; width: .75em; }
-#home .emph-box {
- 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;
-}
+.emph-box { margin-top: 2.2em; }
#home .emph-box h4 {
text-align: center;
font-size: 1.5em;
}
-#home .emph-box p { font-size: .9em; }
+.emph-box p, #home .emph-box small { font-size: .9em; }
+#software { font-family: "FreeSans", sans-serif; }
+#home .button { text-align: center; margin: 2em 0; }
+#home .button a, #home .button a:visited {
+ font-size: 1.8em;
+ color: #971611; background-color: white;
+}
+#home .button a:hover { color: #777; }
#Action {
text-align: left;
padding: 0 1em;
@@ -60,12 +55,23 @@
color: #171d33;
}
#Action li { margin-bottom: .7em; }
-#home .highlight-para { margin-bottom: 2.5em; }
#backtotop { float: right; margin-top: 2.5em; }
#sisters { font-size: .9em; margin: 0 3% 1.5em 3%; }
+-->
+<!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
+<!--
+#home .first-column {
+ clear: right;
+ float: right;
+}
+#home .second-column, #backtotop { float: left; }
+-->
+<!--#endif -->
+<!--
@media (max-width: 55em) {
#home .first-column, #home .second-column {
- float: none; width: 100%; }
+ float: none; width: 100%;
+ }
}
-->
</style>
@@ -94,7 +100,7 @@
below</a>.</p>
<p class="c"><a href="/distros/screenshot.html"><img
- src="/graphics/t-desktop-4-fixed.jpg" alt="Screenshot of GNU"
+ src="/distros/screenshots/trisquel-medium.jpg" alt="[Screenshot of GNU]"
/></a></p>
<h2>What is the Free Software Movement?</h2>
@@ -174,8 +180,6 @@
<div class="second-column">
-<p class="button c large"><a href="/distros/free-distros.html"
class="button-shadow">Try GNU/Linux!</a></p>
-
<div class="emph-box">
<h4 id="Flashes"><a href="http://planet.gnu.org/";>Planet GNU</a>
@@ -187,12 +191,17 @@
and the list of <a href="/software/recent-releases.html">recent GNU
releases</a>.</p>
+<div id="software">
+<p class="button c"><a
+ href="/distros/free-distros.html">Try GNU/Linux!</a></p>
+
+<p><strong>Today's random package is…</strong></p>
<!--#include virtual="/server/home-pkgselect.html" -->
<!--#include virtual="/server/home-pkgblurbs.html" -->
<p class="back"><a href="/manual/blurbs.html">Short descriptions for all GNU
packages</a></p>
-
+</div><!-- id="software" -->
</div><!-- class="emph-box" -->
<div id="Action">
@@ -213,7 +222,7 @@
<li>Support the efforts on net neutrality in Europe,
<a href="http://www.savetheinternet.com"; title="Net
neutrality in the United States of America">in the USA</a>
-and <a href="http://www.neutrality.ca"; title="Net neutrality in
+and <a href="http://saveournet.ca/"; title="Net neutrality in
Canada">in Canada</a>.</li>
<li><strong>Fight against software patents:</strong>
@@ -313,7 +322,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/16 10:17:45 $
+$Date: 2015/10/31 08:19:35 $
<!-- timestamp end -->
</p>
</div>
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- layout7.css 16 Oct 2015 09:51:00 -0000 1.110
+++ layout7.css 31 Oct 2015 08:19:36 -0000 1.111
@@ -54,8 +54,8 @@
.listing, #footer, .toc, .summary
#e7e9eb html, .button, .lyrics, #join-fsf, submit
#d1d4d7 #edu-navbar, #fsf-links, #searcher + #translations
- #ffc very pale yellow: .highlight-para
- #fff898 pale yellow: table headers, .highlight
+ #ffc very pale yellow: .highlight-para, highlight
+ #fff898 pale yellow: table headers
#ff3 yellow: #urgent
#a50606 intermediate red from #fs-gang gradient: #navigation
@@ -141,9 +141,9 @@
-/**************************************
- ** GENERAL APPEARANCE OF THE PAGE **
- **************************************/
+/*******************
+ ** PAGE LAYOUT **
+ *******************/
html, body {
font-size: 1em;
@@ -171,7 +171,6 @@
box-shadow: 0 0 10px 10px #b9bcbf;
}
-
/* Widths */
/* To avoid a few problems with pages outside www.gnu.org,
@@ -179,7 +178,7 @@
.inner. */
.inner { overflow: hidden; }
-#searcher, #toplinks, #header, #content,
+#searcher, #translations, #header, #content,
#mission-statement, #footer {
padding-left: 3%; padding-right: 3%;
}
@@ -223,16 +222,18 @@
form input { font-family: inherit; }
acronym, abbr { border-bottom: 1px dotted #111; }
pre { overflow: auto; }
+small { font-size: .9em; }
p, pre, ul li, ol li, dt, dd, code, address { line-height: 1.3em; }
p { margin-top: 1em; } /* In combo.css: margin-bottom:1em. */
ul, ol, blockquote { margin: .5em 3% 1em 3%; }
-/* Lists of underlined links are difficult to read. The top margin gives a
- little more spacing between entries. */
+/* 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 description lists from preceding text */
+dl { margin: 2em 0 0 0; }
/* separate the "term" from subsequent "description" */
dt { margin: 1em 0; }
/* separate the "description" from subsequent list item
@@ -264,30 +265,47 @@
** MORE COMPLEX BUILDING BLOCKS **
************************************/
-/*** BUTTONS ***/
+/*** SEPARATOR AND SPACER ***/
-.button a, .button a:visited {
- font-family: "FreeSans", sans-serif;
- font-weight: bold;
- text-decoration: none;
+/* For license-list.html, but could be used elsewhere. */
+hr.separator {
+ display: block;
+ height: .3em;
+ margin-top: 2em;
+ margin-bottom: 2em;
+ color: #999;
+ background-color: #999;
+ border: none;
}
-.button.large a, .button.large a:visited {
- display: inline-block;
- font-size: 1.6em;
- line-height: 1.3em;
- padding: .1em .6em;
- color: #971611;
- background-color: #e7e9eb;
- border: .4em solid #c9cccf;
+
+/* Not found in the www repo. */
+div.spacer {
+ height: .1em; width: 100%;
+ background-color: transparent;
}
-.button.small a {
+
+
+/*** BUTTON ***/
+
+/* Display the button link as block in CSS1-only
+ browsers: they don't support inline-block. */
+.button a, #join-fsf a { display: block; }
+
+/* Display it as inline-block in CSS2+ browsers. */
address@hidden print,screen {
+ .button a, #join-fsf a { display: inline-block; }
+}
+/* Common definitions (color and background are left
+ out because they depend on the environment) */
+.button a, #join-fsf a {
font-size: 1.3em;
- padding: .3em .6em;
- background-color: #e7e9eb;
+ font-weight: bold;
+ line-height: 1.2em;
+ padding: .2em .6em;
border: .1em solid #999;
}
-.button.large a:hover, .button.small a:hover {
- color: #777;
+.button a, .button a:visited {
+ text-decoration: none;
}
@@ -302,7 +320,7 @@
-webkit-border-radius: .4em;
-opera-border-radius: .4em;
}
-.button a, #fssbox input[type="submit"] {
+.button a, #join-fsf a, #fssbox input[type="submit"] {
box-shadow: 0 .15em #171d33;
-moz-box-shadow: 0 .15em #171d33;
-webkit-box-shadow: 0 .15em #171d33;
@@ -318,21 +336,23 @@
/* RETURN LINKS */
-#content p.back, p#backtotop {
- text-align: right; /* p#backtotop is redefined as floating in home.html. */
+.back, #backtotop {
+ text-align: right;
line-height: 1.5em;
font-weight: bold;
- margin: 2em 2% 1.5em 2%;
}
-
-p.back a, .back a:visited,
+p.back { margin: 1.5em 2%; }
+.back a, .back a:visited,
#backtotop a, #backtotop a:visited { color: #333; }
-p.back a:hover,
+.back a:hover,
#backtotop a:hover { color: #777; }
-/* For older versions of layout. */
-div#backtotop { padding-left: 3%; padding-right: 3% }
-div#backtotop { margin-top: 1em; }
+p#backtotop {
+ font-size: 1.1em; /* In #mission-statement, font-size is .9em. */
+ margin: 2em 2%;
+}
+/* For older versions of layout (none in the www repository). */
+div#backtotop { margin: 1.5em 5%; }
/* BIG SECTION HEADERS */
@@ -341,22 +361,19 @@
but could apply elsewhere. */
div.big-section {
- float: left;
+ margin-bottom: .5em;
}
-div.big-section h3 {
- font-size: 1.8em;
+#content div.big-section h3 {
+ display: inline-block;
+ font-size: 1.7em;
padding: .2em 0;
- margin: 1.3em .3em .6em 0 ;
+ margin-right: .3em;
color: black;
border-top: .2em solid #6989b6;
border-bottom: .2em solid #6989b6;
}
-div.big-subsection {
- margin-top: 1.3em;
- margin-bottom: 2em;
-}
-div.big-subsection h4 {
- clear: both;
+div.big-subsection { margin: 1.5em 0; }
+#content div.big-subsection h4 {
display: inline;
font-size: 1.5em;
margin-right: .3em;
@@ -364,19 +381,6 @@
}
-/*** SEPARATOR ***/
-
-/* 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;
-}
-
-
/*** ANCHOR ***/
/* This is used in pages of lists, such as gnu-linux.faq.html,
@@ -387,32 +391,42 @@
span.anchor-reference-id a[href]:hover { color: #777; }
-/*** HIGHLIGHTED STUFF AND INSETS ***/
+/*** NON-FLOATING INSETS AND HIGHLIGHTED STUFF ***/
.highlight, .highlight-para {
- clear: both;
color: black;
}
.highlight {
-/* Please do not add borders. This style is applied to an in-line element. */
+/* Please do not add borders. This style can be applied to in-line
+ elements or next to .summary. */
padding: .2em .5em;
- background-color: #fff898;
+ background-color: #ffc;
border: 0;
}
+/* These can be applied to a single p or a div/blockquote. In the latter
+ case, the top/bottom margins of the contained elements will increase
+ background height. In general, .highlight-para and .emph-box can't be
+ used next to a floating element. */
+.highlight-para, .emph-box {
+ padding: .2em 1.1em .3em 1.1em;
+}
.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;
}
-
-/*** NOTES AND ANNOUNCEMENTS ***/
+.lyrics {
+ max-width: 25em;
+ font-style: italic;
+ padding: 2em;
+ margin-left: 2em; margin-right: 2em;
+ background-color: #f0f2f4;
+ border: 2px solid #e7e9eb;
+}
/* Announcements */
div.announcement {
@@ -426,40 +440,8 @@
margin-left: 0; margin-right: 0;
}
-/* Notes about mailing lists, etc. */
-.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;
-}
-.note p {
- font-size: 1.1em;
- line-height: 1.4em;
- padding: 0 1em ;
- margin: 1em 0;
-}
-#content .note strong { font-size: 1.2em; }
address@hidden (max-width: 46em) {
- #content .note { float: none; margin: auto; }
-}
-
/* Note about Free Software Free Society */
-#content blockquote#fsfs p { padding: .3em 0; }
-
-/* Promotional banner */
-.promo-banner {
- background-position: 99% 9%;
- background-color: #ccc;
- background-repeat: no-repeat;
- font-size: large;
- overflow: hidden;
- padding: 1em 6em 0.25em 6em; /* size-review */
-}
+blockquote#fsfs p { padding: .3em 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
@@ -477,14 +459,50 @@
}
#urgent a:hover { color: #777; }
+/* Promotional banner */
+.promo-banner {
+ background-position: 99% 9%;
+ background-color: #ccc;
+ background-repeat: no-repeat;
+ font-size: large;
+ overflow: hidden;
+ padding: 1em 6em 0.25em 6em; /* size-review */
+}
+
+
+/*** FLOATING NOTES ***/
+
+/* Notes about mailing lists, etc. */
+.note {
+ clear: right;
+ float: right;
+ text-align: center;
+ font-style: normal;
+ /* The next line could be "max-width:20em;". It would work
+ better in modern browsers, but the note wouldn't float in
+ NetSurf 1.2. Same problem with .summary. */
+ width: 20em; max-width: 90%;
+ padding: 0;
+ margin: .3em 0 1em 1.5em;
+ border: .3em solid #3465a4;
+}
+.note p {
+ font-size: 1.1em;
+ line-height: 1.4em;
+ padding: 0 1em ;
+}
+.note strong { font-size: 1.2em; }
address@hidden (max-width: 46em) {
+ .note { float: none; margin: 1em auto; }
+}
+
/*** TABLES OF CONTENTS ***/
/* Common definitions */
div.summary, div.toc {
- padding: 1.5em 1.5em 1.8em 1.5em;
+ padding: .4em 1.5em 1.5em 1.5em;
background: #f0f2f4;
- border: 1px solid #c9cccf;
}
div.summary a, div.toc a {
text-decoration: none;
@@ -496,41 +514,43 @@
margin-top: 0; margin-bottom: 0;
}
div.summary h3, div.toc h3,
-div.summary h4 {
- text-align: center; padding-top: 0; margin-top: .2em;
+ div.summary h4, div.toc h4 {
+ text-align: center;
}
/* Small tables of contents */
div.summary {
clear: right;
float: right;
- max-width: 20em;
- margin: .3em 0 1em 1.5em;
+ width: 20em; max-width: 90%;
+ margin: .3em 0 1em 0;
+ border-left: 1.5em solid white;
}
+/* Big tables of contents */
+div.toc { max-width: 45em; margin: 2.5em auto 2em auto; }
+
@media (max-width: 46em) {
- #content div.summary {
- float: none; max-width: 25em;
- margin: auto; margin-top: 2.5em;
+ div.summary {
+ float: none; width: 30em; max-width: 80%;
+ margin: 2.5em auto 2em auto;
+ border: none;
}
}
-/* Big tables of contents */
-div.toc {
- max-width: 45em;
- margin: 3em auto 2em auto;
-}
-
-/*** LYRICS ***/
+/*** IMAGES ***/
-.lyrics {
- background-color: #f0f2f4; font-style: italic; width: 25em;
- padding: 2em; border: 2px solid #e7e9eb;
- margin-left: 2em; margin-right: 2em;
+/* Still in use, but hopefully not for long */
+#content .photo {
+ float: right;
+ width: 30em; max-width: 100%;
+ margin: .3em 0 1em 0;
}
-
-
-/*** IMAGES ***/
+#content .photo img, #content .photo p {
+ width: 94%;
+ padding: 0 6%;
+}
+#content .photo img.recessed { width: 90%; }
/* For photo-like images */
.portrait, .landscape {
@@ -540,11 +560,11 @@
.portrait img, .landscape img { width: 100%; }
.portrait { width: 22em; }
@media (max-width: 46em) {
- #content .portrait { float: none; margin: auto; }
+ .portrait { float: none; margin: auto; }
}
.landscape { width: 27em; }
@media (max-width: 51em) {
- #content .landscape { float: none; margin: auto; }
+ .landscape { float: none; margin: auto; }
}
/* Still used in /s/cgicc/. */
@@ -641,10 +661,13 @@
#toplinks {
float: left;
- padding-top: .6em; padding-bottom: .3em;
- margin: 0;
+ /* For NetSurf 1.2 and other unfinished browsers. */
+ padding: .5em 2em .3em 2em;
+}
+/* For standard browsers. */
address@hidden (max-width: 500em) {
+ #toplinks { padding: .5em 3% .3em 3%; }
}
-
#toplinks a, #toplinks a:visited {
white-space: nowrap;
/* the next line is a workaround for Midori 0.5.8 */
@@ -654,7 +677,7 @@
color: #404040; text-decoration: none;
margin-right: 1em;
}
-#toplinks a:hover, #home-icon a:hover { color: #777; }
+#toplinks a:hover { color: #777; }
#searcher {
display: block;
@@ -665,7 +688,7 @@
}
#searcher input { margin: 0; }
#searcher input[type="text"] {
- padding: .3em;
+ padding: .2em;
margin: 0;
color: #555;
background: white;
@@ -687,29 +710,31 @@
}
#searcher input[type="submit"]:hover { cursor: pointer; }
+
+/*** TRANSLATIONS ***/
+
#translations {
clear: both;
+ font-size: .9em;
text-align: left;
- line-height: 1.3em;
- padding: 0 3%;
border-bottom: .3em solid #d1d4d7;
}
#translations p {
- font-size: .8em;
- padding: .2em 0;
+ line-height: 1.1em;
+ padding: .1em 0 .2em 0;
margin: 0;
}
#translations span {
white-space: nowrap;
+ font-size: .9em;
margin-right: .5em;
}
-#translations a, #translations a:visited {
+#translations span a, #translations span 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;
+ font-size: 1em; font-weight: bold;
}
#translations span.original a,
#translations span.original a:visited {
@@ -720,6 +745,20 @@
color: #777;
}
+/* For translation lists below the navigation bar */
+#content #translations {
+ margin: .4em -3%;
+ border: none;
+}
+
+/* For translation lists at the bottom (in /software/*) */
+#translations h4 { margin-bottom: .4em; }
+#translations ul { padding-bottom: 1em; margin: 0 1em; }
+#translations li {
+ direction: ltr; display: inline; white-space: nowrap;
+ margin: 0; padding-right: .5em;
+}
+
/*** HEADER ***/
@@ -745,7 +784,6 @@
#fsf-frame p { padding: 0; margin: 0; }
#fsf-frame hr { display: none; }
-#join-fsf { padding: .4em 0; }
#join-fsf a, #join-fsf a:visited {
color: #971611;
}
@@ -904,30 +942,22 @@
/*** CONTENT ***/
-#content {
- text-align: left;
-}
#content h1, #content h2 {
font-weight: bold;
padding: 0;
- margin: 1em 0;
+ margin: 1.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; 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; }
+#content h3 { font-size: 1.4em; margin: 1.2em 0 0.7em 0; }
+#content h4 { font-size: 1.2em; margin: 1.0em 0 0.83em 0; }
+#content h5 { font-size: 1.1em; margin: 1.0em 0 0.91em 0; }
+#content h6 { font-size: 1.0em; margin: 1.0em 0 1.0em 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; }
-#content small { font-size: .9em; }
-
/*** MISSION STATEMENT ***/
@@ -944,10 +974,6 @@
height: 2em;
margin: .3em .5em;
}
-#backtotop {
- font-size: 1.1em;
- margin: 2.5em 2% 1.5em 2%;
-}
/*** FOOTER ***/
@@ -1007,7 +1033,6 @@
/* Translators notes */
.translators-notes {
- clear: both;
font-size: .9em; margin-top: 2.2em;
}
@@ -1042,41 +1067,7 @@
/* make h3 for edu-cases look like h4 for other pages */
#content div.edu-cases h3 {
- font-size: 1.3em;
+ font-size: 1.2em;
margin: 1em 0;
}
-
-
-/*************
- ** UNUSED? **
- *************/
-
-.pad { margin-bottom: 1em; }
-.pad td { padding-left: 1em; padding-right: 1em; }
-div.spacer { height: .1em; width: 100%; background-color: transparent; }
-
-/* For the old version of education.html, but could apply elsewhere. */
-#content .yui-gc h2 {
- text-shadow: none;
- margin-bottom: .7em;
-}
-
-/* For translation lists below the navigation bar. */
-#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-top: 1em;
-}
-#translations ul { padding-bottom: 1em; }
-#translations li {
- direction: ltr; display: inline; white-space: nowrap;
-}
-
-/* Still used in some old /server/banner.*.html? */
-#links { display: none !important; }
-
- www/server/staging/nav-bar/test9 audio-video.ht...,
Therese Godefroy <=