[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging body-include-1.html body-inc...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging body-include-1.html body-inc... |
|
Date: |
Sun, 16 Feb 2020 12:22:59 -0500 (EST) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 20/02/16 12:22:59
Modified files:
server/staging : body-include-1.html body-include-2.html
edu-software.html education-menu.html
education.css layout.css
server/staging/nav-bar/test9: edu-software-tuxpaint.html
footer-text.html
philosophy-menu.html
server/staging/proprietary: malware-microsoft.html
proprietary-menu.html
Log message:
* Move #navlinks to the bottom of #content.
* Make *-menu.html GNUN-compatible; append the closing tag of
div#content to avoid adding translators notes after #navlinks.
* body-include-1 & body-include-2: test the widest translations,
minor rearrangements.
* footer-text: cosmetic changes.
* Reorganize stylesheets, add definitions to avoid breaking
current includes with the new version of layout.css,
restyle some links, adjust font sizes & media queries, etc.
* edu-software, free-sw, edu-software-tuxpaint, malware-microsoft:
replace closing tag of div#content with *.menu.html.
* free-sw: add a table of contents.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-1.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-2.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-software.html?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education-menu.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education.css?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout.css?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/footer-text.html?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy-menu.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/malware-microsoft.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/proprietary/proprietary-menu.html?cvsroot=www&r1=1.3&r2=1.4
Patches:
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-1.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- body-include-1.html 1 Feb 2020 13:02:05 -0000 1.24
+++ body-include-1.html 16 Feb 2020 17:22:57 -0000 1.25
@@ -1,11 +1,10 @@
<!-- start of server/body-include-1.html -->
-<div id="toplinks">
-
<a class="skip" href="#content"><b>Skip to main text</b></a>
+<div id="fsf-frame">
<div id="join-fsf" class="button"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
-JOIN THE FSF</a></div>
+Prisijunkite prie FSF</a></div>
<form id="fssbox"
action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
method="post" class="header">
@@ -14,15 +13,14 @@
<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" />
- <label for="frmEmail"><a href="//www.fsf.org/fss">Free Software
Supporter</a>:</label>
+ <label for="frmEmail"><a href="//www.fsf.org/fss">Laisvos programinÄs
įrangos palaikytojas</a>:</label>
<div>
- <input type="text" id="frmEmail" name="email-Primary" size="18"
maxlength="80"
+ <input type="text" id="frmEmail" name="email-Primary" size="18"
value="email address" onfocus="this.value=''"/>
- <input type="submit" name="_qf_Edit_next" value="Sign up" />
+ <input type="submit" name="_qf_Edit_next" value="Prisiregistruokite" />
</div>
</fieldset>
</form>
-
<div style="clear: both"></div>
</div>
<!-- end of server/body-include-1.html -->
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-2.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- body-include-2.html 1 Feb 2020 13:08:32 -0000 1.22
+++ body-include-2.html 16 Feb 2020 17:22:57 -0000 1.23
@@ -3,6 +3,14 @@
<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
<div id="header">
+<p id="gnu-banner">
+ <a href="/">
+ <img src="/graphics/heckert_gnu.transp.small.png" height="48"
+ alt=" [A GNU head] " /><strong>GNU</strong><span
+ class="hide">ãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã </span></a><br />
+ <span id="fsf-support"><a
href="#mission-statement">ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³</a>主å¬</span>
+</p><!-- /gnu-banner -->
+
<div id="switches">
<label for="navbar-input" id="navbar-button" class="switch">
<img id="navbar-icon" width="1" height="1"
@@ -19,15 +27,7 @@
src="/server/staging/layout/flags.1.png"
alt=" [Languages] " /></a><!--#endif -->
</div>
-
-<p id="gnu-banner">
- <a href="/">
- <img src="/graphics/heckert_gnu.transp.small.png"
- alt=" [A GNU head] " /><strong>GNU</strong><span
- class="hide"> Operating System</span></a><br />
- <span id="fsf-support" class="hide">Sponsored by the <a
- href="#mission-statement">Free Software Foundation</a></span>
-</p><!-- /gnu-banner -->
+</div><!-- /#header -->
<div style="clear: both"></div>
<input type="checkbox" id="navbar-input" tabindex="-1" />
@@ -106,7 +106,5 @@
<li id="more-links"><a href="#fsf-links">More ▼</a></li>
</ul>
<div style="clear: both"></div>
-</div>
-
-</div>
+</div><!-- /"navigation -->
<!-- end of server/body-include-2 -->
Index: edu-software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-software.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- edu-software.html 31 Jan 2020 13:42:38 -0000 1.18
+++ edu-software.html 16 Feb 2020 17:22:58 -0000 1.19
@@ -20,32 +20,23 @@
</style>
<!--#include virtual="/server/staging/edu-software.translist" -->
<!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/education-menu.html" -->
-<div id="main-text">
-<p id="breadcrumb">
-<a href="/education/education.html">Education</a> →
-<a href="/education/edu-contents.html">Contents</a> →
-<a href="/education/edu-resources.html">Resources</a> →
-Educational Free Software
+<div id="main">
+
+ <a id="sect-menu-button" class="switch" href="#navlinks">
+ <img id="sect-menu-icon" height="32"
+ src="/server/staging/layout/sect-menu.png"
+ alt="Section menu" /></a>
+<p class="breadcrumb">
+ <a href="/education/education.html">Education</a> >
+ <a href="/education/edu-contents.html">Contents</a> >
+ <a href="/education/edu-resources.html">Resources</a> >
+ Educational Free Software
</p>
-<label for="outdated-input" id="outdated-button" class="switch">
- <img id="outdated-icon" width="1" height="1"
- src="/server/staging/layout/flags-warn.png"
- alt=" [Show/hide outdated-translation warning] " />
-</label>
-<input type="checkbox" id="outdated-input" />
-<div id="outdated">
-<p>
-This translation may not reflect the changes made since
-2020-13-32 in the <a href="/education/edu-software.en.html">
-English original</a>. Please see the <a
-href="/server/standards/README.translations.html">Translations README</a>
-for information on maintaining translations of this article.</p>
-</div>
+
+<p class="trans-disclaimer"><a
href="/education/edu-software-gimp.en.html">[Translated from English]</a></p>
<h2 id="main-heading">Educational Free Software</h2>
-<div class="article">
<hr class="thin" />
<p><em>The GNU project maintains a <a
href="/software/free-software-for-education.html">list of high
@@ -121,9 +112,8 @@
<a href="mailto:address@hidden";><address@hidden></a>.
</p></div>
-</div><!-- /.article -->
-</div><!-- /#main-text -->
-</div><!-- for id="content", starts in the include above -->
+</div><!-- /#main -->
+<!--#include virtual="/server/staging/education-menu.html" -->
<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -163,7 +153,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/01/31 13:42:38 $
+$Date: 2020/02/16 17:22:58 $
<!-- timestamp end -->
</p>
</div>
Index: education-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/education-menu.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- education-menu.html 1 Feb 2020 13:02:05 -0000 1.10
+++ education-menu.html 16 Feb 2020 17:22:58 -0000 1.11
@@ -1,143 +1,111 @@
+<hr class="no-display" />
<div id="navlinks">
-<a class="skip" href="#main-heading"><b>Skip directory contents</b></a>
-<h3>Education</h3>
-<ul>
- <!--#if expr="$REQUEST_URI = /\/edu-contents/" --><li class="current">
- <!--#echo encoding="none" var="MARK_START" -->
- <a href="/education/edu-contents.html#content">Contents</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-contents.html#content">Contents</a>
- <!--#endif --></li>
- <!--#if expr="$REQUEST_URI = /\/edu-cases[^-]*$/" --><li class="current">
+ <a class="backtotop" href="#main"><span>TOP </span>▲</a>
+ <h3>Education menu</h3>
+ <dl>
+ <!--#if expr="$REQUEST_URI = /\/education.html/" --><dt class="current">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/education/education.html#content">Main page</a>
+ <!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
+ <a href="/education/education.html#content">Main page</a></dt><!--#endif
-->
+ <!--#if expr="$REQUEST_URI = /\/edu-contents/" --><dt class="current">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/education/edu-contents.html#content">Detailed contents</a>
+ <!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
+ <a href="/education/edu-contents.html#content">Detailed
contents</a></dt><!--#endif -->
+ <!--#if expr="$REQUEST_URI = /\/edu-cases[^-]*$/" --><dt class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-cases.html#content">Case studies</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-cases.html#content">Case studies</a>
- <!--#endif -->
+ <!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
+ <a href="/education/edu-cases.html#content">Case
studies</a></dt><!--#endif -->
+ <dd>
<ul>
<!--#if expr="$REQUEST_URI = /\/edu-cases-argentina[^-]*$/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/education/-argentina.html#content">Argentina</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
<a href="/education/edu-cases-argentina.html#content">Argentina</a>
- <!--#endif -->
- <ul>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/education/edu-cases-argentina.html#content">Argentina</a><span
class="gnun-split"></span><!--#endif -->
+ <ul class="inline-list">
<!--#if expr="$REQUEST_URI = /\/edu-cases-argentina-ecen/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-cases-argentina-ecen.html#content">ECEN</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-cases-argentina-ecen.html#content">ECEN</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a
href="/education/edu-cases-argentina-ecen.html#content">ECEN</a></li><!--#endif
-->
</ul>
</li>
<!--#if expr="$REQUEST_URI = /\/edu-cases-india[^-]*$/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-cases-india.html#content">India</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-cases-india.html#content">India</a>
- <!--#endif -->
- <ul>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a href="/education/edu-cases-india.html#content">India</a><span
class="gnun-split"></span><!--#endif -->
+ <ul class="inline-list">
<!--#if expr="$REQUEST_URI = /\/edu-cases-india-ambedkar/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a
href="/education/edu-cases-india-ambedkar.html#content">Ambedkar</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a
href="/education/edu-cases-india-ambedkar.html#content">Ambedkar</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a
href="/education/edu-cases-india-ambedkar.html#content">Ambedkar</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/edu-cases-india-irimpanam/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a
href="/education/edu-cases-india-irimpanam.html#content">Irimpanam</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a
href="/education/edu-cases-india-irimpanam.html#content">Irimpanam</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a
href="/education/edu-cases-india-irimpanam.html#content">Irimpanam</a></li><!--#endif
-->
</ul>
</li>
</ul>
- </li>
- <!--#if expr="$REQUEST_URI = /\/edu-resources/" --><li class="current">
+ </dd>
+ <!--#if expr="$REQUEST_URI = /\/edu-resources/" --><dt class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-resources.html#content">Resources</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-resources.html#content">Resources</a>
- <!--#endif -->
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><dt>
+ <a href="/education/edu-resources.html#content">Resources</a><span
class="gnun-split"></span><!--#endif --></dt>
+ <dd>
<ul>
<!--#if expr="$REQUEST_URI = /\/edu-software[^-]*$/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/education/edu-software.html#content"><b>Educational
Software</b></a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-software.html#content"><b>Educational
Software</b></a>
- <!--#endif -->
- <ul>
+ <a href="/education/edu-software.html#content">Educational Software</a>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a href="/education/edu-software.html#content">Educational
Software</a><span class="gnun-split"></span><!--#endif -->
+ <ul class="inline-list">
<!--#if expr="$REQUEST_URI = /\/edu-software-gcompris/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a
href="/education/edu-software-gcompris.html#content">Gcompris</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a
href="/education/edu-software-gcompris.html#content">Gcompris</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a
href="/education/edu-software-gcompris.html#content">Gcompris</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/edu-software-gimp/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-software-gimp.html#content">Gimp</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-software-gimp.html#content">Gimp</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a
href="/education/edu-software-gimp.html#content">Gimp</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/edu-software-tuxpaint/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-software-tuxpaint.html#content">Tux
Paint</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-software-tuxpaint.html#content">Tux
Paint</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/education/edu-software-tuxpaint.html#content">Tux
Paint</a></li><!--#endif -->
</ul>
</li>
<!--#if expr="$REQUEST_URI = /\/edu-projects/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-projects.html#content">Groups &
projects</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-projects.html#content">Groups &
projects</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/education/edu-projects.html#content">Groups &
projects</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/edu-free-learning-resources/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-free-learning-resources.html#content">Free
learning</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-free-learning-resources.html#content">Free
learning</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/education/edu-free-learning-resources.html#content">Free
learning</a></li><!--#endif -->
</ul>
- </li>
- <!--#if expr="$REQUEST_URI = /\/edu-faq/" --><li class="current">
+ </dd>
+ <!--#if expr="$REQUEST_URI = /\/edu-faq/" --><dt class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-faq.html#content">FAQ</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-faq.html#content">FAQ</a>
- <!--#endif --></li>
- <!--#if expr="$REQUEST_URI = /\/edu-team/" --><li class="current">
+ <!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
+ <a href="/education/edu-faq.html#content">FAQ</a></dt><!--#endif -->
+ <!--#if expr="$REQUEST_URI = /\/edu-team/" --><dt class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-team.html#content">Our team</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/education/edu-team.html#content">Our team</a>
- <!--#endif --></li>
-</ul>
+ <!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
+ <a href="/education/edu-team.html#content">Our team</a></dt><!--#endif -->
+ </dl>
</div>
+
+</div><!-- for id="content", starts in the include above -->
Index: education.css
===================================================================
RCS file: /webcvs/www/www/server/staging/education.css,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- education.css 15 Jan 2020 19:25:46 -0000 1.22
+++ education.css 16 Feb 2020 17:22:58 -0000 1.23
@@ -2,6 +2,7 @@
created November 27, 2019.
This file is in the public domain. */
+
/***********************************************/
/* Page navigation for CSS3-unaware browsers */
/***********************************************/
@@ -41,45 +42,90 @@
display: inline-block;
padding: .1em .4em;
margin: .3em;
- border: 1px solid #d9d8d3;
+ border: .1em solid #ccc;
}
/* Section menu */
-#navlinks {
- display: none;
+#content {
+ position: relative;
+ padding-bottom: 0;
+ margin-bottom: 0;
+}
+#main {
+ max-width: 50em;
+ padding-bottom: 2em;
+ margin: 0 auto;
}
#navlinks {
- font-size: 1.0rem;
- padding: 0 0 1em;
- margin: 0;
+ display: block;
+ padding: 1em 3.2%;
+ margin: 0 -3.2%;
+ background: #fffcf5;
+ border-top: 3px solid #ddd;
}
#navlinks h3 {
- font-size: 1.1em;
- text-align: center;
- padding: .3em 0;
- margin: .5em 0;
-}
-#navlinks ul, #navlinks ul li {
- line-height: 1.2em;
- padding: 0;
+ display: inline-block;
+ vertical-align: top;
+ font-size: 1em;
+ padding: .2em .3em;
margin: 0;
- list-style: none;
}
-#navlinks a {
- display: block;
+a.backtotop {
+ display: inline-block;
+ padding: .1em .3em .3em;
+ margin-left: -.5em;
+}
+.backtotop span { display: none; }
+
+#navlinks dl, #navlinks > ul {
+ font-size: .9375em;
line-height: 1.2em;
- font-weight: bold;
- padding: .3em .5em .3em 1em;
+}
+#navlinks dl {
+ width: 45em;
+ max-width: 100%;
+ margin: .7em auto 0;
+}
+#navlinks ul {
+ margin: 0 0 0 1.5em;
+ border-left: 1px solid #999;
+}
+#navlinks dl dt, #navlinks dl dd, #navlinks li {
margin: .2em 0;
}
-#navlinks li li a {
- font-weight: normal;
- padding-left: 2.5em;
+#navlinks li { list-style: none; }
+#navlinks ul.inline-list li { display: inline-block; }
+#navlinks dl a {
+ display: inline-block;
+ line-height: 1.2em;
+ padding: .25em .5em;
}
-#navlinks li li li a {
- padding-left: 4.0em;
+
+
+/* Breadcrumb */
+
+.breadcrumb {
+ line-height: 1.7em;
+ padding: .4em 0 0;
+ margin: 0 0 .5em;
+}
+.breadcrumb a { line-height: 1.6em; }
+
+@media (min-width: 25em) {
+ .breadcrumb a { display: inline-block; }
+}
+
+
+/* Section menu icon */
+
+a#sect-menu-button {
+ float: right;
+ line-height: 1.7em;
+ height: 1.5em;
+ margin: .3em 0 0 1em;
}
+#sect-menu-button img { height: 100%; }
/***************************************/
@@ -87,91 +133,59 @@
/***************************************/
@media (min-width: 55em) {
- #content { position: relative }
-
+ #main, #main ~ .translators-notes {
+ padding: 0 2em 2em 14.1rem;
+ max-width: 50rem;
+ margin: 0 auto;
+ }
#navlinks {
display: inline-block;
- width: 14rem;
+ width: 12rem;
height: 100%;
position: absolute;
- top: 0;
- left: 0;
+ top: 0; left: 0;
overflow: auto;
- padding-bottom: 3em;
- }
- #main-text, #main-text ~ .translators-notes {
- padding: 0 1em 0 15.1rem;
+ padding: 0;
+ margin: 0;
+ border-top: none;
+ border-right: .1em solid #ccc;
}
-}
-
-
-/***************************/
-/* Page navigation style */
-/***************************/
+ #navlinks h3 { margin: 1em 0 0 .7em; }
+ #navlinks dl { width: auto; }
+ #navlinks ul.inline-list li, #navlinks dl a { display: block; }
+ #navlinks a.backtotop { display: none; }
+ #navlinks dt a { padding-left: 1.1em; }
-#navlinks {
- background: white; /* #f7f7f7; */
- border-right: .1em solid #ddd;
-}
-
-.menu a, #TOC a, #navlinks a {
- background: #f3f3f3;
-}
-.menu a[href], .menu a[href],:hover,
-#TOC a[href], #TOC a[href]:hover,
-#navlinks a[href], #navlinks a[href]:hover {
- text-decoration: none;
+ a#sect-menu-button { display: none; }
}
-#navlinks li.current > a {
- background: #e6e6e6;
- font-style: italic;
+@media (min-width: 60em) {
+ #navlinks { width: 14rem; }
+ #main, #main ~ .translators-notes { padding-left: 16.1rem; }
}
-/*****************************/
-/* For the Malware section */
-/*****************************/
+/**********************/
+/* Navigation links */
+/**********************/
-#about-dir {
- font-size: .9em;
- color: #444;
-}
-#about-page {
- font-style: italic;
-}
-#about-dir p, #about-page p {
- margin: .5em 0;
-}
-
-
-/*******************************/
-/* For the Education section */
-/*******************************/
-
-.edu-breadcrumb {
- line-height: 1.7em;
- font-size: .9em;
- padding: .6em 0 0;
- margin: 0;
-}
-.edu-breadcrumb a[href]:link, .edu-breadcrumb a[href]:visited {
+.breadcrumb a[href]:link, .breadcrumb a[href]:visited,
+.menu a[href]:link, .menu a[href]:visited,
+#TOC a[href]:link, #TOC a[href]:visited,
+#navlinks a[href]:link, #navlinks a[href]:visited {
text-decoration: none;
}
-.edu-breadcrumb a[href]:link:hover, .edu-breadcrumb a[href]:visited:hover {
- text-decoration: underline #006400 dotted;
-}
-/* Subsections of /education "Case Studies" */
-.edu-cases {
- width: 52em; max-width: 100%;
- padding: 0 0 .8em;
- margin: 2em auto;
- border-top: 3px ridge #3465a4;
- border-bottom: 3px ridge #3465a4;
-}
-.edu-cases ul, .edu-cases ol {
- margin: 1em 4%;
+.breadcrumb a[href]:hover,
+.menu a[href]:hover,
+#TOC a[href]:hover,
+#navlinks a[href]:hover {
+ background: #e7f2e2;
}
-.edu-cases h3 {
- font-size: 1.3em;
+
+#navlinks li.current > a[href], #navlinks li.current > a[href]:hover {
+ color: #333;
+ font-style: italic;
+ text-decoration: none;
+ background: none;
+ cursor: default;
}
Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/layout.css,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- layout.css 2 Feb 2020 10:30:12 -0000 1.15
+++ layout.css 16 Feb 2020 17:22:58 -0000 1.16
@@ -3,8 +3,7 @@
(This version should be used with reset.css. A few basic parameters that used
to be set in combo.css are now defined here.)
-Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011,
- 2013, 2014, 2015, 2016, 2017, 2019 Free Software Foundation
+Copyright (C) 2006-2011, 2013-2017, 2019, 2020 Free Software Foundation
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -34,14 +33,46 @@
*/
+/* CONTRAST
+
+ source: http://springmeier.org/www/contrastcalculator/index.php (dead)
+ http://juicystudio.com/services/luminositycontrastratio.php
+
+ Color1 Color 2 contrast Color
+ ratio difference
+Black-gray
+ #000 white 21.3 765
+ #000 #ff3 19.6 561
+ #222 white 15.91 663
+ #333 white 12.63 612
+ #333 #eee 10.89 561
+ #404040 #d4d4d4 6.99 444
+ #555 white 7.46 510
+
+Red
+ #a42e2b white 6.99 630
+ #850803 #d4d4d4 6.97
+
+Blue links
+ #004caa white 8.03 443
+ #004caa #e4ffcc 7.45 365
+ #004caa #fff1c0 7.11 366
+ #004caa #f3f3f3 7.24 407
+ #004caa #ccffcc 7.17 341
+ #004caa #777 1.79 137
+ #004caa #333 1.57 169
+ #004caa black 2.61 322
+*/
+
+
/* PAGE STRUCTURE
From top to bottom:
- #toplinks (skiplink, #fssbox, #join-fsf) [body-include-1.html]
- #header (#switches, #gnu-banner,
- #languages, #navigation) [body-include-2.html]
- (#edu-navigation in a few pages) [<page>.html]
+ skiplink, #fsf-frame (#join-fsf, #fssbox) [body-include-1.html]
+ #header (#switches, #gnu-banner, #navigation) [body-include-2.html]
+ (#edu-navigation / #navlinks in a few pages) [<page>.html]
#content [<page>.html]
+ #languages [footer-text.html]
#fsf-links [footer-text.html]
#mission-statement [footer-text.html]
#footer [<page>.html]
@@ -50,32 +81,141 @@
/* TABLE OF CONTENTS
- * Invariant (html, body, .inner, basic styles)
- * Layout of building blocks (paragraphs, headers, lists, tables, separators,
- forms, buttons & links, emphasized text, images)
- * Layout of main divs
- - Header & navigation for CSS3-unaware browsers
- - CSS3 media queries for header & navigation (#navigation,
#edu-navigation,
- #fsf-links, #back-to-top)
+ * PAGE STRUCTURE
+ - html, body, .inner
+ - header for CSS3-unaware browsers
+ #gnu-banner
+ #languages
+ searcher, languages & menu icons
+ - media queries for header
+ #fsf-frame
- #content
- - #mission-statement
- - #footer
- * Font family
- * Color, background, border
+ #main-text
+ breadcrumb & edu-breadcrumb
+ article
+ byline
+ reduced-width
+ columns
+ infobox
+ trans-disclaimer
+ #outdated
+ translators-notes
+ - #mission-statement & footer
+
+ * BUILDING BLOCKS
+ - simple text styling (small, strong, em, etc.)
+ - basic classes, mostly replacing inline elements
+ - blocks of text (p, blockquote, etc.)
+ - h* headers
+ - lists
+ - separators
+ - tables
+
+ * IMAGES & EMPHASIZED TEXT
+ - images
+ - text with no background or border
+ - text with background (layout, style)
+ - text with left border (layout, style)
+ - notes (layout, style)
+ - table of contents: toc & summary (layout, style)
+ - media queries for note & summary
+
+ * INTERACTIVE ELEMENTS
+ - links (special links, style)
+ - forms & buttons (layout, style)
+ - navbars & back-to-top (layout, style)
*/
+/************************************/
+/* Transition from previous version */
+/************************************/
+
+
+#header #fsf-frame { display: none; }
+#navlinks { display: none; }
+
+/*** TOPLINKS ***/
+
+#toplinks {
+ float: left;
+ font-size: .9em;
+ padding: .5em 2em .3em;
+}
+@media (min-width: 0) {
+ #toplinks { padding: .6em 3% .3em; }
+}
+#toplinks a {
+ white-space: nowrap;
+ display: inline-block;
+ font-family: "FreeSans", sans-serif;
+ font-weight: bold;
+ margin-right: 1em;
+}
+#toplinks a[href]:link, #toplinks a[href]:link:visited {
+ color: #444;
+ text-decoration: none;
+}
+#toplinks a[href]:link:hover, #toplinks a[href]:link:visited:hover {
+ color: #008400;
+ text-decoration: underline #008400 dotted;
+}
+
+/*** SEARCHER ***/
+
+div#searcher {
+ display: block;
+ font-size: .9em;
+ text-align: right;
+ padding: .2em 3%;
+ background-color: #eee;
+}
+
+/*** TRANSLATION LIST ***/
+
+.inner > #translations {
+ clear: both;
+ font-size: .9em;
+ text-align: left;
+ border-bottom: .2em solid #ddd;
+}
+.inner > #translations p {
+ line-height: 1.2em;
+ padding: 0 3%;
+ margin: 0;
+}
+.inner > #translations span {
+ display: inline;
+ white-space: nowrap;
+ font-size: .9em;
+ margin-right: .5em;
+}
+.inner > #translations span a, #translations span a:visited {
+ color: #222; text-decoration: none;
+}
+.inner > #translations span.original {
+ font-size: 1em; font-weight: bold;
+}
+
+/*** BANNER ***/
+
+div#gnu-banner { padding: .4em 0; }
-/*============================================================================*/
-/* INVARIANT
*/
-/*============================================================================*/
+/*====================================================================*/
+/* MAIN DIVS & CONSTANT FEATURES */
+/*====================================================================*/
+
+
+html, body, .inner
html, body {
- font-size: 1em;
+ font-size: 1em; /* 16px */
text-align: left;
text-decoration: none;
+ color: #222;
}
+html { background: #e4e4e4; }
/* This specifies the basic width of our web pages. Don't change it
without discussion on www-discuss. The magic 74.92 is for
@@ -84,427 +224,754 @@
max-width: 74.92em; /* About 1200px */
margin: auto;
}
-.inner { overflow: hidden; }
-
-
-/*** BASIC STYLES ***/
-
-small { font-size: .9em; }
-strong { font-weight: bold; }
-em, cite { font-style: italic; }
-em i, em cite, cite i, cite em { font-style: normal; }
-acronym, abbr {
- text-decoration: none;
- border-bottom: 1px dotted #000;
- cursor: help;
+.inner {
+ max-width: 74.92em;
+ overflow: hidden;
+ background: white;
+ border: .1em solid #bbb;
+ border-top: 3px solid #a42e2b;
+ -moz-box-shadow: 0 0 5px 5px #bbb;
+ -webkit-box-shadow: 0 0 5px 5px #bbb;
+ -icab-box-shadow: 0 0 5px 5px #bbb;
+ -o-box-shadow: 0 0 5px 5px #bbb;
+ box-shadow: 0 0 5px 5px #bbb;
}
-.italic { font-style: italic; }
-.italic em, .italic cite, .italic i { font-style: normal; }
-.center, .c { text-align: center; }
-.nocenter{ text-align: left; }
-.underline { text-decoration: underline; }
-.nounderline { text-decoration: none; }
-.small { font-size: .9em; }
-.big { font-size: 1.1em; }
-.inline-list li { display: inline }
-.no-bullet li { list-style: none; }
-.no-display { display: none; }
-
-/* Rarely used */
-del { text-decoration: line-through; }
-caption { margin-bottom: .5em; text-align: center; }
-sup { vertical-align: super; }
-sub { vertical-align: sub; }
+/**************************************/
+/* HEADER FOR CSS3-UNAWARE BROWSERS */
+/**************************************/
-/*============================================================================*/
-/* LAYOUT OF BUILDING BLOCKS
*/
-/*============================================================================*/
+/*** TOP LINKS ***/
+.skip, #fsf-frame {
+ position: fixed;
+ top: -200px;
+}
-/*** PARAGRAPHS ***/
+/*** BANNER ***/
-p, pre { line-height: 1.5em; }
-address { line-height: 1.3em; }
-blockquote { margin: 1em 3%; }
+#header {
+ display: table;
+ width: 94%;
+ padding: 0 3%;
+ text-align: center;
+}
+#gnu-banner {
+ display: table-cell;
+ vertical-align: middle;
+ font-size: 1.75em; /* 28px */
+ text-align: center;
+ line-height: 1em;
+ padding: .3em 0 .3em 1em;
+}
+/*
+#gnu-banner strong {
+ font-weight: normal;
+}
+*/
+#gnu-banner img {
+ height: 1.6em;
+ vertical-align: bottom;
+ margin: 0 .15em 0 0;
+}
+#fsf-support { display: none; }
-/* The top margin should be sufficient. The bottom margin is only useful
- if the element that follows is an anonymous box. */
-p, pre, address { margin: 1em 0; }
-pre { padding-bottom: .3em; overflow: auto; }
+/*** SEARCHER, LANGUAGES & MENU ICONS ***/
-/*** <h*> HEADERS ***/
+#switches {
+ display: table-cell;
+ vertical-align: top;
+ line-height: 2em;
+ padding: .2em 0 0 1em;
+}
+.switch {
+ display: inline-block;
+ height: 1.5em;
+ margin-left: .4em;
+}
+.switch img {
+ display: inline-block;
+ vertical-align: top;
+ height: 100%;
+ width: auto;
+ padding: .1em;
+ margin: 0;
+}
+.switch img:hover {
+ background: #eee;
+ cursor: pointer;
+}
-h1, h2, h3, h4, h5, h6 { font-weight: bold; }
+#navbar-input, #outdated-input,
+#navbar-button, #outdated-button {
+ display: none;
+}
-h1 { font-size: 2.4em; margin: 1em 0 1.1em; }
-h2 { font-size: 2.0em; margin: 1em 0 1.1em; }
-h3 { font-size: 1.5em; margin: 1.2em 0 .80em; }
-h4 { font-size: 1.2em; margin: 1.2em 0 .83em; }
-h5 { font-size: 1.1em; margin: 1em 0 .91em; }
-h6 { margin: 1em 0; }
-/** Big section headers **/
+/***************/
+/* LANGUAGES */
+/***************/
-/* For browsers that don't support inline-block */
-.big-section {
- clear: left;
- float: left;
+#languages {
+ font-size: .9375em; /* 15px */
+ line-height: 1.2em;
+ padding: .6em 3%;
+ margin: 0;
+ background: #f5f5f5;
+ border-top: 3px solid #ddd;
}
-.big-section h3 {
- display: inline-block;
- font-size: 1.7em;
- padding: .2em 0;
- margin: 1em .3em .5em 0;
+#set-language {
+ float: right;
+ margin: .2em 0 0 1em;
}
-.big-subsection {
- margin: 1.5em 0;
+#set-language + p {
+ display: inline-block;
+ font-size: 1em; /* 15px */
+ margin: .45em 0 0;
}
-.big-subsection h4 {
- display: inline;
- font-size: 1.5em;
- margin-right: .3em;
+
+/* Could apply to div#translations or p#translations. */
+#translations {
+ padding: .4em 0;
+ margin: 0;
}
-/* The next two statements adjust line spacing in Netsurf 1.2 */
-.big-subsection {
- line-height: 2.0em;
+#translations p { margin: 0; }
+#translations span {
+ display: inline-block;
+ width: 18.5em;
+ line-height: 1.2em;
+ padding: .35em 0;
}
-.big-subsection h4 {
+#translations span.original { font-weight: bold; }
+#translations span a {
line-height: 1.2em;
+ padding: .25em;
}
-/** Article headers **/
-.article h2 {
- font-size: 1.7em;
- margin: .8em 0;
- padding: .2em .3em;
- border-left: .7em solid #eee;
-}
-.article h3 { font-size: 1.4em; }
-.article h4 { font-size: 1.15em; }
-.article .big-section h3 { font-size: 1.6em; }
-.article .big-subsection h4 { font-size: 1.4em; }
+/*****************************************/
+/* MEDIA QUERIES FOR HEADER & LANGUAGES */
+/*****************************************/
+@media (min-width: 0) {
+ #header, #gnu-banner, #switches { display: block; }
-/*** LISTS ***/
+ #gnu-banner {
+ padding: .2em 0;
+ margin: 0;
+ }
+ #gnu-banner .hide { display: none; }
-ol li { list-style: decimal outside; }
-ul li { list-style: square outside; }
-ul ul li, ol ul li { list-style: circle; }
+ #switches { padding: .2em 0; }
+ .switch { margin: 0 3%; }
-li, dt, dd { line-height: 1.5em; }
-ul, ol { margin: 1em 1.5%; }
+ #navbar-button { display: inline-block; }
+ #navigation { height: 3px; }
+ #navigation ul { display: none; }
+ #navbar-input:checked ~ #navigation { height: auto; }
+ #navbar-input:checked ~ #navigation ul { display: block; }
-/* Lists of underlined links are difficult to read. The top margin
- gives a little more spacing between entries. */
-ol li { margin: 1em 0 0 1em; }
-ul li, ul ol li { margin: .5em 0 0 1em; }
-ul li p, ul li pre, ul ul li, ul li blockquote, table li {
- margin-top: .3em; margin-bottom: .3em;
-}
-ul ul, ol ul, table ul { margin: 0 1.5%; }
+ ul#edu-navigation { display: none; }
-ul.blurbs li { margin-top: 1em; }
-ul.blurbs ul li, ul.blurbs ol li, ul.blurbs dl li {
- margin-top: .5em;
+ #outdated-button {
+ display: inline-block;
+ float: right;
+ margin-right: 0;
+ }
+ #outdated { display: none; }
+ #outdated-input:checked ~ #outdated { display: block; }
}
-/* Separate description lists from preceding text */
-dl { margin: 1.5em 0 0 0; }
-/* separate the "term" from subsequent "description" */
-dt { font-weight: bold; margin: 1em 0; }
-/* separate the "description" from subsequent list item
- when the final <dd> child is an anonymous box */
-dl dd { margin: 1em 3% 1.5em 3%; }
+@media (min-width: 19.5em) { /* 312px */
+ #header { display: table; }
-dl.compact { margin: .5em 0; }
-dl.compact dt {
- font-weight: normal;
- font-style: italic;
- margin: .5em 0 0;
+ #gnu-banner, #switches { display: table-cell; }
+ #gnu-banner { padding: .3em 0; }
+ #switches { max-width: 4em; }
+ .switch { margin: 0 0 0 .4em; }
}
-dl.compact dd { margin: .3em 3% 0; }
-dl.compact dd p { margin: .3em 0 0; }
-dl.compact dd ul { margin: .3em 1.5% 0; }
+@media (min-width: 42em) { /* 672px */
+ #gnu-banner { padding-top: .1em; }
+ p#gnu-banner img { position: relative; top: .2em; }
+ #gnu-banner .hide { display: inline; }
+ #fsf-support {
+ display: inline-block;
+ line-height: .6em;
+ font-size: .5em; /* 13px */
+ font-style: italic;
+ margin: .3em 0 0;
+ }
+ #fsf-support a { font-weight: bold; }
-/*** TABLES ***/
+ #switches {
+ max-width: none;
+ text-align: right;
+ padding: .2em 0 .2em 1em;
+ }
+ .switch { margin: 0 0 .4em .5em; }
-th, td {
- border: 1px solid #bbb; /* default */
- padding: .5em;
-}
-th { font-weight: bold; text-align: center; }
-table { margin: 1em 0; }
+ #outdated-button { display: none; }
+ #outdated { display: block; }
-.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;
- margin: 1em 0;
-}
-.listing th,
-.stx table th {
- font-weight: normal;
- padding: .7em;
-}
-/* This doesn't work if the a element is within normal text. */
-.listing td a { display: block; }
-.listing .top {
- text-align: right;
- padding: 0 0 1em 0;
-}
-.listing .listingCheckbox {
- text-align: center;
+ #navbar-button { display: none; }
+ #navigation { height: auto; }
+ #navigation ul, ul#edu-navigation {
+ display: block;
+ text-align: left;
+ }
}
-.listing td,
-.stx table td {
- padding: 1em;
- text-align: center;
- line-height: 1.3em
+
+@media (min-width: 57em) { /* 912px */
+ #fsf-frame {
+ position: static;
+ font-size: .875em; /* 14px */
+ width: 94%;
+ padding: .3em 3%;;
+ background: #eee;
+ }
+ #fssbox { margin: 0; }
+ #fssbox a { font-weight: bold; }
+ #fssbox fieldset { margin: 0; }
+ #fssbox div {
+ display: inline;
+ white-space: nowrap;
+ }
+ p#join-fsf { margin: 0; }
+ #join-fsf a {
+ float: right;
+ margin: 0 0 0 2em;
+ }
}
-.listing img {
- vertical-align: middle;
+
+@media (min-width: 75em) { /* 1200px */
+ body {
+ max-width: 90em;
+ position: relative;
+ }
}
-.listing {
- width: 100%;
- display: block;
- overflow: auto;
- padding: .1em;
- margin: auto;
+
+@media (min-width: 90em) { /* 1440px */
+ .inner { overflow: visible; }
+
+ #language-button { display: none; }
+ #languages {
+ width: 14rem;
+ position: absolute;
+ left: 75.7rem;
+ padding: .2em 0 .2em .8em;
+ top: 7rem;
+ border: .1em solid #bbb;
+ border-radius: .5em;
+ }
+ #translations { width: auto; }
+ #translations span { width: 13.5rem; }
+ #set-language {
+ float: none;
+ margin: .4em 0;
+ }
}
-/*** SEPARATORS ***/
+/*************/
+/* CONTENT */
+/*************/
-hr {
- display: block;
- margin: 1.2em 0;
+#content {
+ padding: 0 3%;
+ margin-bottom: 2.5em;
}
-/* For license-list.html, but could be used elsewhere. */
-hr.separator {
- height: .3em;
- border: none;
-}
-hr.thin {
- clear: both;
- height: 1px;
- margin: 1.5em 0;
- border: none;
+
+/** Navigation; see education.css **/
+
+.edu-breadcrumb {
+ line-height: 1.7em;
+ padding: .4em 0 0;
+ margin: 0 0 .5em;
}
-/* Can be applied to div or hr. */
-.column-limit {
- height: .4em;
- width: 10%;
- margin: 2em auto;
- border: none;
- background: #bbb; /* default */
+.edu-breadcrumb a { line-height: 1.6em; }
+
+@media (min-width: 25em) {
+ .edu-breadcrumb a { display: inline-block; }
}
-/*** FORMS, BUTTONS & LINKS ***/
+/** Author line after the main heading **/
-fieldset { margin: 1em 0; }
-optgroup { font-weight: normal; }
-button, input[type="checkbox"], input[type="radio"],
-input[type="reset"], input[type="submit"] {
- padding: 1px;
-}
-form.header input, .button a {
- line-height: 1.1em;
- padding: .4em .5em .3em;
+p.byline {
+ font-size: 1.0625em; /* 17px - assumes #content > p.byline */
+ margin-bottom: 1.5em;
}
-form.header input[type="submit"], .button a {
- font-weight: bold;
- margin: 0;
+
+
+/** Text of the article **/
+
+.article { font-size: 1.0625em; } /* 17px */
+
+/* Narrower paragraphs surrounded by full-width text or columns.
+ Useless next to a side menu: line width is already limited
+ to 50em; */
+.reduced-width {
+ width: 45em;
+ max-width: 100%;
+ margin: 1.5em auto;
}
-.button a {
- display: block;
+
+/* Columns */
+.columns p.inline-block {
display: inline-block;
+ margin: 0;
}
-/* Return link */
-.back {
- line-height: 1.5em;
- text-align: right;
- font-weight: bold;
- margin: 2em 2%;
+@media (min-width: 55em) {
+ .columns {
+ -webkit-column-count: 2;
+ -webkit-column-gap: 1.5em;
+ -moz-column-count: 2;
+ -moz-column-gap: 1.5em;
+ column-count: 2;
+ column-gap: 1.5em;
+ }
+ .columns > *:first-child { margin-top: 0 }
+ .columns > *:last-child { margin-bottom: 0; }
}
-/* Anchor - 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-weight: normal; font-size: .8em; }
-
-
-/*** SPECIAL TEXT WITH NO BACKGROUND OR LEFT BORDER ***/
-/* For comments within or at the beginning of an article. Can be used
- with .important or .big. */
-.comment { margin: 1.5em 6%; }
+/** Metadata or footnotes at the end of articles **/
-@media (max-width: 30em) {
- .comment { margin: 1.5em 3%; }
+.infobox {
+ font-size: .9375em; /* 15px - assumes #content > .infobox */
+ line-height: 1.3em;
+ margin: 2.5em 0 0;
+}
+.infobox h3 {
+ font-size: 1.267em; /* 19px - assumes #content > .infobox */
+ margin-top: 0;
+}
+.infobox p {
+ margin: .3em 0 0;
+}
+.infobox hr {
+ display: block;
+ width: 15em; max-width: 100%;
+ height: 1px;
+ border: none;
+ margin: 0 0 1em 0;
}
-/* Note about Free Software Free Society */
-blockquote#fsfs p { padding: .3em 0; }
-/* For the note saying the page is a translation. */
+/** Translations **/
+
+/* For the note saying the page is a translation */
.trans-disclaimer {
- font-size: .9em;
+ font-size: .9375em; /* 15px */
text-align: center;
- font-weight: bold;
font-style: italic;
- margin-bottom: 0;
- margin-top: 1.2em;
+ line-height: 1.7em;
+ margin: .5em 0 0;
+}
+.trans-disclaimer a {
+ display: inline-block;
+ line-height: 1.6em;
+}
+@media (min-width: 45em) {
+ .trans-disclaimer { text-align: right; max-width: 90%; }
}
/* For outdated translations */
#outdated {
- font-size: .9em;
+ font-size: .9375em; /* 15px */
text-align: center;
padding: .5em;
margin: .8em 0;
+ color: black;
+ border: .2em solid #fc7;
}
#outdated p { margin: 0; }
+/* For translators notes */
+.translators-notes {
+ clear: left;
+ line-height: 1.5em;
+ margin-top: 2em;
+}
+.translators-notes hr {
+ height: 1px;
+ margin: 1.7em 0 1.2em;
+ border: none;
+}
+.translators-notes h3 { font-size: 1.125em; } /* 18px */
-/*** TEXT WITH BACKGROUND ***/
+.translators-notes p, .translators-notes ul, .translators-notes ol {
+ margin-bottom: 0;
+}
+.translators-notes ol li { margin: .5em 1.1em 0; }
-/* NetSurf collapses the bottom border of the last element with that of its
- parent div, even when the div has a padding or border.
- To fix this, strip the bottom margin of <p> and <pre>. If another element
- comes last, it may need a special clause. */
-div.highlight-para p, div.highlight-para pre, div.highlight-para ul,
-div.emph-box p, div.emph-box pre, div.emph-box ul,
- .lyrics p { margin-bottom: 0; }
-/* .highlight doesn't have a border. It can be applied to in-line elements.
- .highlight-para and .emph-box have borders. They are used for block
elements.
- highlight-para can be used next to .note or .summary without special
- precaution because it only has top and bottom borders. */
+/** Subsections of /education "Case Studies" **/
-div.highlight-para, div.emph-box { padding: .2em 1.2em 1.2em; }
+.edu-cases {
+ font-size: 1.0625em; /* 17 px */
+ width: 50em; max-width: 100%;
+ padding: 0 0 .8em;
+ margin: 2em auto;
+ border-top: 3px ridge #3465a4;
+ border-bottom: 3px ridge #3465a4;
+}
+.edu-cases ul, .edu-cases ol { margin: 1em 4%; }
+.edu-cases h3 { font-size: 1.3em; }
-.highlight-para, p.highlight,
-p.emph-box, pre.emph-box { padding: .6em 1.2em; }
-.lyrics {
- max-width: 25em;
- font-style: italic;
- padding: 1em 2em 2em;
- margin-left: 3%; margin-right: 3%;
-}
+/** Introduction of malware pages **/
+#about-dir { color: #444; }
+#about-page { font-style: italic; }
+#about-dir p, #about-page p { margin: .5em 0; }
-/*** TEXT WITH LEFT BORDER ***/
-.announcement, .important {
- font-size: inherit;
- padding: .1em 1em .7em;
- margin: 1.5em 0;
- background: none;
+/***********************/
+/* MISSION STATEMENT */
+/***********************/
+
+#mission-statement {
+ clear: both;
+ padding: 1.8em 3% 2em;
+ background: white;
}
-.announcement blockquote { margin: 0; }
-.announcement p, .important p { margin: .5em 0 0; }
-.announcement ul, .important ul { margin: 0 1em; }
-.announcement ul li, .important ul li { margin-top: .5em; }
-.announcement h3, .important h3 {
- font-size: 1.3em;
- margin: .4em 0;
+#mission-statement blockquote {
+ font-size: .9375em; /* 15px */
+ font-weight: bold;
+ font-style: italic;
+ margin: 0 3% .8em;
+}
+#mission-statement p { margin: 0; }
+#mission-statement img {
+ float: left;
+ height: 2em;
+ margin: .5em;
+}
+#support-the-fsf {
+ clear: both;
+ text-align: center;
}
-/*** NOTES ***/
+/************/
+/* FOOTER */
+/************/
-.note, .edu-note {
- text-align: center;
- margin: 2em auto;
+#footer {
+ font-size: .875em; /* 14px */
+ padding: 1.5em 3%;
+ color: #333;
+ background: #f5f5f5;
+ border-top: .1em solid #ddd;
}
-
-/* Single <p> */
-.edu-note p {
- font-style: italic;
- padding: .8em 1em;
+#footer p, #bottom-notes {
+ line-height: 1.3em;
margin: 0;
}
-/* Baby NetSurf (1.2) would hurt itself using these definitions.
- Place them out of reach. Too bad for its older brother (2.9). */
-@media (min-width: 0) {
- .edu-note {
- width: 40em;
- max-width: 100%;
- }
+.unprintable { margin-bottom: .7em; }
+
+.translators-credits { margin: .7em 0; }
+
+#footer p.unprintable, #generic p { margin-top: .7em; }
+
+
+
+/*====================================================================*/
+/* BUILDING BLOCKS */
+/*====================================================================*/
+
+
+/*************************/
+/* SIMPLE TEXT STYLING */
+/*************************/
+
+small { font-size: .875em; } /* 16px -> 14px */
+strong { font-weight: bold; }
+em, cite { font-style: italic; }
+em i, em cite, cite i, cite em { font-style: normal; }
+acronym, abbr {
+ text-decoration: none;
+ border-bottom: 1px dotted #000;
+ cursor: help;
}
+/* Rarely used */
+del { text-decoration: line-through; }
+sup { vertical-align: super; }
+sub { vertical-align: sub; }
-/* Several <p>'s */
-.note {
- padding: .4em 3%;
- background: white;
+
+/*******************/
+/* BASIC CLASSES */
+/*******************/
+
+/* Please use .italic and .small for whole paragraphs, rather that <em>
+and <small>. Translators will thank you. */
+
+.italic { font-style: italic; }
+.italic em, .italic cite, .italic i { font-style: normal; }
+.center, .c { text-align: center; }
+.nocenter{ text-align: left; }
+.underline { text-decoration: underline; }
+.nounderline { text-decoration: none; }
+.small { font-size: .875em; } /* 16px -> 14px */
+.big { font-size: 1.125em; } /* 16px -> 18px */
+.inline-list li { display: inline }
+.no-bullet li { list-style: none; }
+.no-display { display: none; }
+.clear { clear: both; }
+
+
+/********************/
+/* BLOCKS OF TEXT */
+/********************/
+
+p, pre { line-height: 1.5em; }
+address { line-height: 1.3em; }
+caption { margin-bottom: .5em; text-align: center; }
+blockquote { margin: 1em 3%; }
+
+/* The top margin should be sufficient. The bottom margin is only useful
+ if the element that follows is an anonymous box. */
+p, pre, address { margin: 1em 0; }
+pre { padding-bottom: .3em; overflow: auto; }
+
+
+/****************/
+/* H* HEADERS */
+/****************/
+
+h1 { font-size: 2.375em; margin: .5em 0 .9em; padding: .2em 0; } /* 38px */
+h2 { font-size: 2.0em; margin: .5em 0 .9em; padding: .2em 0; } /* 32px */
+h3 { font-size: 1.5em; margin: 1.2em 0 .8em; } /* 24px */
+.article h3 { font-size: 1.41em; } /* 24px */
+h4 { font-size: 1.25em; margin: 1.2em 0 .85em; } /* 20px */
+.article h4 { font-size: 1.18em; } /* 20px */
+h5 { font-size: 1.125em; margin: 1em 0 .9em; } /* 18px */
+h6 { margin: 1em 0; }
+
+h1, h2, h3, h4, h5, h6 { font-weight: bold; }
+
+/* The default color is too dark for large text in bold font. */
+h3, h4, h5, h6, dt { color: #333; }
+
+h2#main-heading {
+ padding: .2em 0 .2em .3em;
+ border-left: .7em solid #eee; /* default color */
}
-.note p {
- padding: .4em 0;
- margin: 0;
+h3.subheader {
+ padding-bottom: .2em;
+ border-bottom: 1px solid #bbb;
}
-@media (min-width: 0) {
- .note { max-width: 44.7em; }
+
+/** BIG SECTION HEADERS **/
+
+/* For browsers that don't support inline-block */
+.big-section {
+ clear: left;
+ float: left;
+}
+.big-section h3 {
+ display: inline-block;
+ font-size: 1.75em; /* 28px */
+ padding: .2em 0;
+ margin: 1em .3em .5em 0;
+ color: black;
+ border-top: .12em solid #e74c3c;
+ border-bottom: .12em solid #e74c3c;
}
+.article .big-section h3 { font-size: 1.647em; } /* 28px */
+.big-subsection { margin: 1.5em 0; }
+.big-subsection h4 {
+ display: inline;
+ font-size: 1.5em; /* 24px */
+ margin-right: .3em;
+ color: black;
+}
+.article .big-subsection h4 { font-size: 1.41em; } /* 24px */
+
+/* The next two statements adjust line spacing in Netsurf 1.2 */
+.big-subsection {
+ line-height: 2.0em;
+}
+.big-subsection h4 {
+ line-height: 1.2em;
+}
-/*** TABLES OF CONTENTS ***/
+/** HEADERS ON NARROW SCREENS **/
-.summary, .toc {
- padding: 1em 3% 1.7em;
- margin: 2.5em auto 1.5em;
+@media (max-width: 30em) { /* 480 px */
+ h2#main-heading { border-left: .4em solid #eee; }
+ h1 { font-size: 2.0625em; } /* 33px */
+ h2 { font-size: 1.75em; } /* 28px */
+ h3 { font-size: 1.375em; } /* 22px */
+ .article h3 { font-size: 1.29em; } /* 22px */
+ h4 { font-size: 1.1875em; } /* 19px */
+ .article h4 { font-size: 1.12em; } /* 19px */
+ h5 { font-size: 1.0625em; } /* 17px */
+
+ .big-section h3 { font-size: 1.5em; } /* 25px */
+ .article .big-section h3 { font-size: 1.47em; } /* 25px */
+ .big-subsection h4 { font-size: 1.375em; } /* 22px */
+ .article .big-subsection h4 { font-size: 1.294em; } /* 22px */
}
-.summary ul, .toc ul {
- margin: 0 1.5%;
+
+
+/***********/
+/* LISTS */
+/***********/
+
+ol li { list-style: decimal outside; }
+ul li { list-style: square outside; }
+ul ul li, ol ul li { list-style: circle; }
+
+li, dt, dd { line-height: 1.5em; }
+ul, ol { margin: 1em 1.5%; }
+
+/* Lists of underlined links are difficult to read. The top margin
+ gives a little more spacing between entries. */
+ol li { margin: 1em 0 0 1em; }
+ul li, ul ol li { margin: .5em 0 0 1em; }
+ul li p, ul li pre, ul ul li, ul li blockquote, table li {
+ margin-top: .3em; margin-bottom: .3em;
}
-.summary h3, .toc h3 {
- font-size: 1.3em;
+ul ul, ol ul, table ul { margin: 0 1.5%; }
+
+ul.blurbs li { margin-top: 1em; }
+ul.blurbs ul li, ul.blurbs ol li, ul.blurbs dl li {
margin-top: .5em;
- text-align: center;
}
-.summary h4, .toc h4 {
- font-size: 1.1em;
+
+/* Separate description lists from preceding text */
+dl { margin: 1.5em 0 0 0; }
+/* separate the "term" from subsequent "description" */
+dt { font-weight: bold; margin: 1em 0; }
+/* separate the "description" from subsequent list item
+ when the final <dd> child is an anonymous box */
+dl dd { margin: 1em 3% 1.5em 3%; }
+
+dl.compact { margin: .5em 0; }
+dl.compact dt {
+ font-weight: normal;
+ font-style: italic;
+ margin: .5em 0 0;
}
-@media (min-width: 0) {
- .summary { width: 30em; }
- .toc { width: 45em; }
- .summary, .toc { max-width: 94%; }
+dl.compact dd { margin: .3em 3% 0; }
+dl.compact dd p { margin: .3em 0 0; }
+dl.compact dd ul { margin: .3em 1.5% 0; }
+
+
+/****************/
+/* SEPARATORS */
+/****************/
+
+hr {
+ display: block;
+ margin: 1.2em 0;
+ color: #999;
+ background: #999;
+}
+
+/* For license-list.html, but could be used elsewhere. */
+hr.separator {
+ height: .3em;
+ border: none;
+}
+hr.thin {
+ clear: both;
+ height: 1px;
+ margin: 1.5em 0;
+ border: none;
+}
+/* Can be applied to div or hr. */
+.column-limit {
+ height: .4em;
+ width: 10%;
+ margin: 2em auto;
+ border: none;
+ background: #bbb; /* default */
+ background-image: linear-gradient(to right, white, #bbb, white);
}
-/*** NOTE AND SUMMARY ON WIDE SCREENS (FLOAT) ***/
+/************/
+/* TABLES */
+/************/
-@media (min-width: 48em) {
- .note, .summary {
- clear: right;
- float: right;
- width: 20em;
- max-width: 40%;
- margin: .3em 0 1em 2em;
-/* This keeps an adjacent background (e.g. highlight-para)
- from touching the note or summary. */
- box-shadow: 0 0 0 1em white;
- -moz-box-shadow: 0 0 0 1em white;
- -webkit-box-shadow: 0 0 0 1em white;
- -icab-box-shadow: 0 0 0 1em white;
- -o-box-shadow: 0 0 0 1em white;
- }
- .summary { padding: 1em 1.2em 1.5em; }
- .note { padding: .4em 1.2em; }
+th, td {
+ border: 1px solid #bbb; /* default */
+ padding: .5em;
+}
+th { font-weight: bold; text-align: center; }
+table { margin: 1em 0; }
+
+.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;
+ margin: 1em 0;
+ border: 1px solid #666;
+}
+.listing th,
+.stx table th {
+ font-weight: normal;
+ padding: .7em;
+ color: black;
+ background: #fff1c0;
+ border: 1px solid #666;
+}
+/* This doesn't work if the a element is within normal text. */
+.listing td a { display: block; }
+.listing .top {
+ text-align: right;
+ padding: 0 0 1em 0;
+ border-top: 1px solid #666;
+}
+.listing .listingCheckbox {
+ text-align: center;
+}
+.listing td,
+.stx table td {
+ padding: 1em;
+ text-align: center;
+ line-height: 1.3em;
+ border: 1px solid #666;
+}
+.listing img {
+ vertical-align: middle;
+}
+.listing {
+ width: 100%;
+ display: block;
+ overflow: auto;
+ padding: .1em;
+ margin: auto;
+}
+.listing .odd {
+ /*every second line should be shaded */
+ background: transparent;
+}
+.listing .even {
+ background: #f5f5f5;
}
-/*** IMAGES ***/
+/*====================================================================*/
+/* IMAGES & EMPHASIZED TEXT */
+/*====================================================================*/
+
+
+/************/
+/* IMAGES */
+/************/
.imgright, imgleft { max-width: 100%; }
.imgright { float: right; margin: .3em 0 1em 2em; }
@@ -519,7 +986,7 @@
.pict p {
text-align: center;
font-style: italic;
- font-size: .9em;
+ font-size: .875em; /* 14px */
margin-top: .5em;
}
@@ -543,610 +1010,228 @@
}
+/***************************************/
+/* TEXT WITH NO BACKGROUND OR BORDER */
+/***************************************/
-/*============================================================================*/
-/* LAYOUT OF MAIN DIVS & CONSTANT FEATURES
*/
-/*============================================================================*/
+/* For comments within or at the beginning of an article. Can be used
+ with .important or .big. */
+.comment { margin: 1.5em 6%; }
+@media (max-width: 30em) {
+ .comment { margin: 1.5em 3%; }
+}
-/***************************************************/
-/* HEADER & NAVIGATION FOR CSS3-UNAWARE BROWSERS */
-/***************************************************/
+/* Note about Free Software Free Society */
+blockquote#fsfs p { padding: .3em 0; }
-/*** FSF STUFF ***/
+/**************************/
+/* TEXT WITH BACKGROUND */
+/**************************/
+
+/** LAYOUT **/
+
+/* NetSurf collapses the bottom border of the last element with that of
+ its parent div, even when the div has a padding or border.
+ To fix this, strip the bottom margin of <p> and <pre>. If another
+ element comes last, it may need a special clause. */
+div.highlight-para p, div.highlight-para pre, div.highlight-para ul,
+div.emph-box p, div.emph-box pre, div.emph-box ul,
+ .lyrics p { margin-bottom: 0; }
-#toplinks {
- position: fixed;
- top: -200px;
-}
+/* .highlight doesn't have a border. It can be applied to in-line
+ elements. .highlight-para and .emph-box have borders. They are used
+ for block elements. highlight-para can be used next to .note or
+ .summary without special precaution because it only has top and
+ bottom borders. */
-/*** GNU BANNER ***/
+div.highlight-para, div.emph-box { padding: .2em 1.2em 1.2em; }
-#header {
- text-align: center;
- padding: 0;
-}
-#gnu-banner {
- display: inline-block;
- font-size: 2em;
- text-align: center;
- line-height: 1em;
- margin: .1em 3%;
-}
-#gnu-banner strong {
- font-weight: normal;
-}
-#gnu-banner img {
- height: 1.7em;
- vertical-align: bottom;
- position: relative; top: .15em;
- margin-right: .15em;
-}
+.highlight-para, p.highlight,
+p.emph-box, pre.emph-box { padding: .6em 1.2em; }
-#fsf-support {
- font-size: .45em;
+.lyrics {
+ max-width: 25em;
font-style: italic;
+ padding: 1em 2em 2em;
+ margin-left: 3%; margin-right: 3%;
}
-#fsf-support a {
- font-weight: bold;
-}
-
-
-/*** LANGUAGES ***/
-
-#languages {
- padding: .5em 3%;
-}
-#set-language {
- float: right;
- margin-left: 1em;
-}
-#languages h3 {
- display: inline-block;
- font-size: 1em;
- margin: .3em 0 .4em;
-}
-
-/* Could apply to div#translations or p#translations. */
-#translations {
- padding: .4em 0;
- margin: 0;
-}
-#translations p {
- margin: 0;
-}
-#translations span {
- display: inline-block;
- vertical-align: middle;
- width: 13em;
- padding: 0;
- margin: .1em 0;
-}
-#translations span a {
- line-height: 1.1em;
- padding: .1em .3em;
-}
-#translations span.original {
- font-weight: bold;
-}
-
-
-/*** TOGGLE SWITCHES to display navbar and languages,
- & SEARCHER BUTTON. ***/
-#switches {
- display: inline-block;
- clear: right;
- float: right;
- margin: .2em .7em .4em 0;
-}
-.switch {
- display: inline-block;
- vertical-align: middle;
- height: 2em;
- margin: .2em 0 .2em .7em;
-}
-.switch img {
- display: inline-block;
- vertical-align: middle;
- height: 100%;
- width: auto;
-}
-
-#navbar-input, #outdated-input,
-#navbar-button, #outdated-button {
- display: none;
-}
-
-
-/*** NAVIGATION BARS ***/
-
-#navigation ul, #fsf-links ul { margin: 0; }
-ul#edu-navigation { margin: 0 -3.2%; }
-
-/* line-height is defined here for NetSurf 1.2.
- No effect in NetSurf 2.9 or Firefox. */
-#navigation ul, #fsf-links ul, ul#edu-navigation {
- font-size: 0.9em;
- line-height: 2em;
- text-align: left;
- font-weight: bold;
- padding: 0 2.5%;
-}
-#navigation li, ul#edu-navigation li, #fsf-links li {
- white-space: nowrap;
- display: inline;
- display: inline-block;
- line-height: 2em;
- padding: 1px;
- margin: 0;
-}
-li#more-links {
- float: right;
- margin-left: 1.7em;
-}
-
- /* For Firefox (can't set line-height when "a" is displayed inline) */
-#navigation a, ul#edu-navigation a, #fsf-links a {
- display: inline-block;
- line-height: 2em;
- padding: .1em .4em 0;
- margin: 0;
-}
-
-
-/*** BACK-TO-TOP ***/
-
-#back-to-top {
- float: right;
-/* For NetSurf 1.2, and maybe a few other browsers. */
- margin: .1em 1em 0;
-}
-/* For standard browsers. */
-@media (min-width: 0) {
- #back-to-top { margin-right: 3%; }
-}
-#back-to-top a { padding: .2em .6em .4em; }
-#back-to-top span { display: none; }
-
-
-/*******************************************/
-/* MEDIA QUERIES FOR HEADER & NAVIGATION */
-/*******************************************/
-
-@media (min-width: 0) {
-/* Reduce font size below 40em */
- html { font-size: .9em; }
-
- .hide { display: none; }
- #gnu-banner { margin: .1em 0 .4em; }
-
- #switches { max-width: 7em; }
-
- #navbar-button {
- display: inline-block;
- height: 1.8em;
- padding: .1em 0;
- }
- #navigation { height: 3px; }
- #navigation ul { display: none; }
- #navbar-input:checked ~ #navigation { height: auto; }
- #navbar-input:checked ~ #navigation ul { display: block; }
-
- ul#edu-navigation { display: none; }
-
- #outdated-button {
- display: inline-block;
- float: right;
- }
-
- #outdated { display: none; }
- #outdated-input:checked ~ #outdated { display: block; }
-}
-
-@media (min-width: 22em) {
- #switches { max-width: none; }
-}
-
-@media (min-width: 28em) {
- #navbar-button { display: none; }
- #navigation { height: auto; }
- #navigation ul, ul#edu-navigation {
- display: block;
- text-align: left;
- }
- #gnu-banner { margin: .2em 3% .5em; }
-}
-
-@media (min-width: 40em) {
- html { font-size: 1em; }
-
- .hide { display: inline; }
- #gnu-banner { margin: .1em 3%; }
- #gnu-banner img { top: .3em; }
- #fsf-support {
- font-size: .45em;
- margin: .3em 0 0;
- }
-
- #switches { margin-right: 3%; }
- #outdated-button { display: none; }
- #outdated { display: block; }
-}
-
-@media (min-width: 55em) {
- #toplinks {
- position: static;
- width: 94%;
- font-size: .9em;
- padding: .4em 3%;
- }
- .skip {
- position: fixed;
- top: -200px;
- }
- #fssbox { margin: 0 1.5em 0 0; }
- #fssbox a { font-weight: bold; }
- #fssbox fieldset { margin: 0; }
- #fssbox div {
- display: inline;
- white-space: nowrap;
- }
-
- #join-fsf a {
- float: right;
- margin: 0 0 0 2em;
- }
-}
-
-@media (min-width: 77em) {
- body { margin-left: .5em; }
- #navigation ul, ul#edu-navigation, #fsf-links ul { text-align: center; }
- li#more-links { float: none; }
-}
-
-@media (min-width: 90em) {
- .inner {
- position: relative;
- overflow: visible;
- }
- #gnu-banner { padding-left: 2.35em; }
-
- #language-button { display: none; }
- #languages {
- display: block;
- width: 13.6rem;
- position: absolute;
- top: 0; left: 76rem;
- overflow: auto;
- padding: .5em 1em 0;
- margin-top: .7em;
- }
- #translations span { padding: .2em 0; }
- #translations span a { padding: .2em .3em; }
- #set-language {
- float: none;
- text-align: left;
- margin: .5em 0 1em;
- }
-}
-
-
-/*************/
-/* CONTENT */
-/*************/
-
-#content {
- padding: 0 3%;
- margin-bottom: 3em;
-}
-
-#main-text, #main-text ~ .translators-notes {
- max-width: 50rem;
- margin: auto;
-}
-
-#breadcrumb, .edu-breadcrumb {
- line-height: 1.7em;
- padding: .6em 0 0;
- margin: 0;
-}
-
-/* Author line after the main heading */
-p.byline {
- font-size: 1.1em; /* assumes #content > p.byline */
- margin-bottom: 1.5em;
-}
-
-.article { font-size: 1.1em; }
-
-.reduced-width {
- width: 45em;
- max-width: 100%;
- margin: 1.5em auto;
-}
-
-.columns p.inline-block {
- display: inline-block;
- margin: 0;
-}
-
-@media (min-width: 55em) {
- .columns {
- -webkit-column-count: 2;
- -webkit-column-gap: 1.5em;
- -moz-column-count: 2;
- -moz-column-gap: 1.5em;
- column-count: 2;
- column-gap: 1.5em;
- }
- .columns > *:first-child { margin-top: 0 }
- .columns > *:last-child { margin-bottom: 0; }
-}
-
-/* For metadata or footnotes at the end of articles. */
-.infobox {
- font-size: .9em;
- line-height: 1.3em;
- margin: 2.5em 0 0;
-}
-.infobox h3 {
- font-size: 1.2em;
- margin-top: 0;
-}
-.infobox p {
- margin: .3em 0 0;
-}
-.infobox hr {
- display: block;
- width: 15em; max-width: 100%;
- height: 1px;
- border: none;
- margin: 0 0 1em 0;
-}
-
-/* For translators notes */
-.translators-notes {
- clear: left;
- line-height: 1.5em;
- margin-top: 2em;
-}
-.translators-notes hr {
- height: 1px;
- margin: 1.7em 0 1.2em;
- border: none;
-}
-.translators-notes ol li { margin: .5em 1.1em; }
-div.translators-notes h3 { font-size: 1.2em; }
+/** STYLE **/
-/*******************************/
-/* MISSION STATEMENT & FOOTER */
-/*******************************/
-
-#mission-statement {
- clear: both;
- padding: 1.8em 3% 2em;
- background: white;
-}
-#mission-statement blockquote {
- font-size: .9em;
- font-weight: bold;
- font-style: italic;
- margin: 0 3% .8em;
-}
-#mission-statement p {
- margin: 0;
-}
-#mission-statement img {
- float: left;
- height: 2em;
- margin: .5em;
-}
-#support-the-fsf {
- clear: both;
- text-align: center;
-}
-#support-the-fsf a {
- padding: .6em 1em .5em;
- margin: 1em 1.5em;
-}
-
-#footer {
- font-size: .9em;
- padding: 1.5em 3%;
-}
-#footer p, #bottom-notes {
- line-height: 1.3em;
- margin: 0;
+.highlight-para, .highlight { background: #fff5d4; }
+span.highlight { background: #fff1c0; }
+.highlight-para {
+ border-top: .1em solid #fc7;
+ border-bottom: .1em solid #fc7;
}
-.unprintable { margin-bottom: .7em; }
-
-.translators-credits { margin: .7em 0; }
-
-#footer p.unprintable, #generic p { margin-top: .7em; }
-
-
-
-/******************************************************************************/
-/* FONT FAMILY
*/
-/******************************************************************************/
-
-a[href] { font-family: sans-serif; }
-
-#toplinks, #toplinks a, #header, #header a,
-#edu-navigation a, #fsf-links a, #languages, #languages a,
-#support-the-fsf a {
- font-family: "FreeSans", "Liberation Sans", sans-serif;
+.emph-box, .lyrics {
+ background: #f5f5f5;
+ border: .1em solid #ddd;
}
-h2, h3 { font-family: serif; }
-
+/***************************/
+/* TEXT WITH LEFT BORDER */
+/***************************/
-/******************************************************************************/
-/* COLOR, BACKGROUND, BORDER
*/
-/******************************************************************************/
+/** LAYOUT **/
-
-/*** Luminosity contrast ratio and color difference ***
- source: http://juicystudio.com/services/luminositycontrastratio.php
-
- Color1 Color 2 contrast Color
- ratio difference
-Black-gray
- #000 white 21.3 765
- #000 #ff3 19.6 561
- #222 white 15.91 663
- #333 white 12.63 612
- #333 #eee 10.89 561
- #404040 #d4d4d4 6.99 444
- #555 white 7.46 510
-
-Red
- #a42e2b white 6.99 630
- #850803 #d4d4d4 6.97
-
-Blue links
- #004caa white 8.03 443
- #004caa #e4ffcc 7.45 365
- #004caa #fff1c0 7.11 366
- #004caa #f3f3f3 7.24 407
- #004caa #ccffcc 7.17 341
- #004caa #777 1.79 137
- #004caa #333 1.57 169
- #004caa black 2.61 322
-*/
-
-
-/*** MAIN DIVS ***/
-
-html, body {
- color: #222;
+.announcement, .important {
+ font-size: inherit;
+ padding: .1em 1em .7em;
+ margin: 1.5em 0;
+ background: none;
}
-html { background: #e4e4e4; }
-
-body {
- background: white;
- border: .1em solid #bbb;
- border-top: 3px solid #a42e2b;
- -moz-box-shadow: 0 0 5px 5px #bbb;
- -webkit-box-shadow: 0 0 5px 5px #bbb;
- -icab-box-shadow: 0 0 5px 5px #bbb;
- -o-box-shadow: 0 0 5px 5px #bbb;
- box-shadow: 0 0 5px 5px #bbb;
+.announcement blockquote { margin: 0; }
+.announcement p, .important p { margin: .5em 0 0; }
+.announcement ul, .important ul { margin: 0 1em; }
+.announcement ul li, .important ul li { margin-top: .5em; }
+.announcement h3, .important h3 {
+ font-size: 1.25em; /* 20px */
+ margin: .4em 0;
}
-#toplinks {
- background: #eee;
-}
-#languages {
- background: #f7f7f7;
- border-top: .1em solid #ddd;
-}
-#translations { color: #a42e2b; }
-#footer {
- color: #333;
- background: #f7f7f7;
- border-top: .1em solid #ddd;
-}
+/** STYLE **/
+/* For information that isn't part of the article. The border is
+ green. */
+.announcement { border-left: .3em solid #5c5; }
+/* For important information inside an article. The border is orange. */
+.important { border-left: .3em solid #fc7; }
-/*** <h2> & <h3> HEADERS ***/
-/* The default color is too dark for large text in bold font. */
-h3, h4 { color: #333; }
+/***********/
+/* NOTES */
+/***********/
-h3.subheader {
- padding-bottom: .2em;
- border-bottom: 1px solid #bbb;
+/** LAYOUT **/
+
+.note, .edu-note {
+ text-align: center;
+ margin: 2em auto;
}
-.big-section h3 {
- color: black;
- border-top: .12em solid #e74c3c;
- border-bottom: .12em solid #e74c3c;
+/* Single <p> */
+.edu-note p {
+ font-style: italic;
+ padding: .8em 1em;
+ margin: 0;
}
-.big-subsection h4 {
- color: black;
+/* Baby NetSurf (1.2) would hurt itself using these definitions.
+ Place them out of reach. Too bad for its older brother (2.9). */
+@media (min-width: 0) {
+ .edu-note {
+ width: 40em;
+ max-width: 100%;
+ }
}
+/* Several <p>'s */
+.note {
+ padding: .4em 3%;
+ background: white;
+}
+.note p {
+ padding: .4em 0;
+ margin: 0;
+}
+@media (min-width: 0) {
+ .note { max-width: 44.7em; }
+}
-/*** SEPARATORS ***/
+/** STYLE **/
-hr {
- color: #999;
- background: #999;
-}
+.note, .edu-note p { border: .15em solid #5c5; }
-.column-limit {
- background: #bbb;
- background-image: linear-gradient(to right, white, #bbb, white);
-}
+/************************/
+/* TABLES OF CONTENTS */
+/************************/
-/*** LISTINGS ***/
+/** LAYOUT **/
-.listing,
-.stx table {
- border: 1px solid #666;
-}
-.listing th,
-.stx table th {
- color: black;
- background: #fff1c0;
- border: 1px solid #666;
+.summary, .toc {
+ padding: 1em 3% 1.7em;
+ margin: 2.5em auto 1.5em;
}
-.listing .top {
- border-top: 1px solid #666;
+.summary ul, .toc ul {
+ margin: 0 1.5%;
}
-.listing .odd {
- /*every second line should be shaded */
- background: transparent;
+.summary h3, .toc h3 {
+ font-size: 1.25em; /* 20px */
+ margin-top: .5em;
+ text-align: center;
}
-.listing .even {
- background: #f5f5f5;
+.summary h4, .toc h4 {
+ font-size: 1.125em; /* 18px */
}
-.listing td,
-.stx table td {
- border: 1px solid #666;
+@media (min-width: 0) {
+ .summary { width: 30em; }
+ .toc { width: 45em; }
+ .summary, .toc { max-width: 94%; }
}
+/** STYLE **/
-/*** EMPHASIZED TEXT, NOTES, etc. ***/
+.summary, .toc { background: #f5f5f5; }
-.highlight-para, .highlight { background: #fff5d4; }
-span.highlight { background: #fff1c0; }
-.highlight-para {
- border-top: .1em solid #fc7;
- border-bottom: .1em solid #fc7;
-}
-.emph-box, .lyrics {
- background: #f5f5f5;
- border: .1em solid #ddd;
+/**************************************/
+/* MEDIA QUERIES FOR NOTE & SUMMARY */
+/**************************************/
+
+@media (min-width: 48em) {
+ .note, .summary {
+ clear: right;
+ float: right;
+ width: 20em;
+ max-width: 40%;
+ margin: .3em 0 1em 2em;
+/* This keeps an adjacent background (e.g. highlight-para)
+ from touching the note or summary. */
+ box-shadow: 0 0 0 1em white;
+ -moz-box-shadow: 0 0 0 1em white;
+ -webkit-box-shadow: 0 0 0 1em white;
+ -icab-box-shadow: 0 0 0 1em white;
+ -o-box-shadow: 0 0 0 1em white;
+ }
+ .summary { padding: 1em 1.2em 1.5em; }
+ .note { padding: .4em 1.2em; }
}
-/* For information that isn't part of the article. The border is
- green. */
-.announcement { border-left: .3em solid #5c5; }
-/* For important information inside an article. The border is orange. */
-.important { border-left: .3em solid #fc7; }
-#outdated {
- color: black;
- border: .2em solid #fc7;
-}
-.note, .edu-note p { border: .15em solid #5c5; }
+/*====================================================================*/
+/* INTERACTIVE ELEMENTS */
+/*====================================================================*/
-.summary, .toc { background: #f5f5f5; }
+
+/***********/
+/* LINKS */
+/***********/
+
+/** SPECIAL LINKS **/
+
+.back {
+ line-height: 1.7em;
+ text-align: right;
+ font-weight: bold;
+ margin: 2em 2%;
+}
+.back a { display: inline-block; }
+
+/* Anchor - 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-weight: normal; font-size: .8125em; } /* 13px */
-/*** LINKS ***/
+/** STYLE **/
a[href]:link {
color: #004caa;
@@ -1157,66 +1242,108 @@
text-decoration: underline #ccc solid;
}
a[href]:link:hover, a[href]:visited:hover {
- color: #006400;
- text-decoration: underline #006400 dotted;
+ color: #008400;
+ text-decoration: underline #008400 dotted;
}
a[href]:active { text-decoration: none; }
-/* Variants */
+/* Navigation links. */
+
+#translations a[href]:link, #translations a[href]:visited,
+.edu-breadcrumb a[href]:link, .edu-breadcrumb a[href]:visited,
+.trans-disclaimer a[href]:link, .trans-disclaimer a[href]:visited,
+.toc a[href]:link, .toc a[href]:visited,
+.summary a[href]:link, .summary a[href]:visited {
+ color: #004caa;
+ text-decoration: none;
+}
#gnu-banner a[href]:link, #gnu-banner a[href]:visited {
color: #333;
text-decoration: none;
}
-/*
-#gnu-banner a[href]:link strong, #gnu-banner a[href]:visited strong {
- color: #a42e2b;
-}
-*/
+#gnu-banner strong { color: #a42e2b; }
+
+
#fsf-support { color: #555; }
-#fsf-support a[href]:link, #fsf-support a[href]:visited,
-.trans-disclaimer a[href]:link, .trans-disclaimer a[href]:visited {
+#fsf-support a[href]:link, #fsf-support a[href]:visited {
color: #555;
text-decoration: underline #ccc solid;
}
#fssbox a[href]:link, #fssbox a[href]:visited,
.back a[href]:link, .back a[href]:visited,
-.anchor-reference-id a[href]:link, .anchor-reference-id a[href]:visited,
-#translations a[href]:link, #translations a[href]:visited {
+.anchor-reference-id a[href]:link, .anchor-reference-id a[href]:visited
+{
color: #333;
text-decoration: underline #ccc solid;
}
-#translations a[href]:link:hover, #translations
a[href]:visited:hover,
-#fsf-support a[href]:link:hover, #fsf-support
a[href]:visited:hover,
-.trans-disclaimer a[href]:link:hover, .trans-disclaimer
a[href]:visited:hover,
-#fssbox a[href]:link:hover, #fssbox
a[href]:visited:hover,
-.back a[href]:link:hover, .back
a[href]:visited:hover,
-.anchor-reference-id a[href]:link:hover, .anchor-reference-id
a[href]:visited:hover {
- color: #006400;
- text-decoration: underline #006400 dotted;
+#translations a[href]:link:hover,
+#translations a[href]:visited:hover,
+.back a[href]:link:hover,
+.back a[href]:visited:hover,
+.edu-breadcrumb a[href]:link:hover,
+.edu-breadcrumb a[href]:visited:hover,
+.trans-disclaimer a[href]:link:hover,
+.trans-disclaimer a[href]:visited:hover {
+ background: #e7f2e2;
+}
+#fssbox a[href]:link:hover,
+#fssbox a[href]:visited:hover,
+#fsf-support a[href]:link:hover,
+#fsf-support a[href]:visited:hover,
+.anchor-reference-id a[href]:link:hover,
+.anchor-reference-id a[href]:visited:hover,
+.toc a[href]:link:hover,
+.toc a[href]:visited:hover,
+.summary a[href]:link:hover,
+.summary a[href]:visited:hover {
+ color: #008400;
+ text-decoration: underline #008400 dotted;
}
-#breadcrumb a[href]:link, .breadcrumb a[href]:visited {
- text-decoration: none;
+
+/*********************/
+/* FORMS & BUTTONS */
+/*********************/
+
+/** LAYOUT **/
+
+fieldset { margin: 1em 0; }
+optgroup { font-weight: normal; }
+button, input[type="checkbox"], input[type="radio"],
+input[type="reset"], input[type="submit"] {
+ padding: 1px;
+}
+form.header input, .button a {
+ line-height: 1.1em;
+ padding: .4em .5em .3em;
+}
+form.header input[type="submit"], .button a {
+ font-weight: bold;
+ margin: 0;
+}
+.button a {
+ display: block;
+ display: inline-block;
}
-#breadcrumb a[href]:link:hover, .breadcrumb a[href]:visited:hover {
- text-decoration: underline #006400 dotted;
+#support-the-fsf a {
+ padding: .6em 1em .5em;
+ margin: 1em 1.5em 0;
}
-/*** BUTTONS & FORM INPUTS ***/
+/** STYLE **/
.button a[href]:link, .button a[href]:visited {
- color: #444;
text-decoration: none;
background: white;
border: .1em solid #bbb;
}
-.button a[href]:hover {
+.button a[href]:link:hover, .button a[href]:visited:hover {
text-decoration: none;
- background: #f3f3f3;
- border-color: #006400;
+ background: #e7f2e2;
+ border: .1em solid #006400;
}
#join-fsf a, #support-the-fsf a.join {
@@ -1232,6 +1359,9 @@
color: #005ccd;
border-color: #005ccd;
}
+#back-to-top a {
+ color: #333;
+}
#support-the-fsf a.donate:hover {
color: #004caa;
background: #d9e8f7;
@@ -1241,21 +1371,19 @@
color: #008400;
border-color: #008400;
}
-#support-the-fsf a.shop:hover {
+#support-the-fsf a.shop:hover, #back-to-top a:hover {
color: #006400;
background: #e7f2e2;
border-color: #006400;
}
.switch img:hover {
- opacity: 0.5;
- filter: alpha(opacity=50); /* For IE8 and earlier */
+ background: #e7f2e2;
cursor: pointer;
}
form.header input {
- font-family: inherit;
- border: .1em solid #ccc;
+ border: .1em solid #bbb;
}
form.header input[type="text"], form.header input[type="submit"] {
color: #555;
@@ -1269,8 +1397,8 @@
border-color: #006400;
}
form.header input[type="text"]:focus + input[type="submit"] {
- color: #006400;
- border-color: #006400;
+ color: #008400;
+ border-color: #008400;
}
form.header input[type="submit"]:hover {
color: #006400;
@@ -1279,10 +1407,11 @@
#fssbox input[type="submit"] {
color: #008400;
border-color: #008400;
- background: white;
}
#fssbox input[type="submit"]:hover {
+ color: #006400;
background: #e7f2e2;
+ border-color: #006400;
}
.rounded-corners, form.header input, .button a {
@@ -1294,7 +1423,65 @@
}
-/*** NAVIGATION BARS & BACK-TO-TOP ***/
+/***************************/
+/* NAVBARS & BACK-TO-TOP */
+/***************************/
+
+/** LAYOUT **/
+
+#navigation ul, #fsf-links ul { margin: 0; }
+ul#edu-navigation { margin: 0 -3.2%; }
+
+/* line-height is defined here for NetSurf 1.2.
+ No effect in NetSurf 2.9 or Firefox. */
+#navigation ul, #fsf-links ul, ul#edu-navigation {
+ font-size: .9375em;
+ line-height: 2em;
+ text-align: left;
+ font-weight: bold;
+ padding: 0 1.5%;
+}
+#navigation li, ul#edu-navigation li, #fsf-links li {
+ white-space: nowrap;
+ display: inline;
+ display: inline-block;
+ line-height: 2em;
+ padding: 1px;
+ margin: 0;
+}
+li#more-links {
+ float: right;
+}
+
+ /* For Firefox (can't set line-height when "a" is displayed inline) */
+#navigation a, ul#edu-navigation a, #fsf-links a {
+ display: inline-block;
+ line-height: 2em;
+ padding: .1em .4em 0;
+ margin: 0;
+}
+
+#back-to-top {
+ float: right;
+/* For NetSurf 1.2, and maybe a few other browsers. */
+ margin: .1em 1em 0;
+}
+/* For standard browsers. */
+@media (min-width: 0) {
+ #back-to-top { margin-right: 3%; }
+}
+#back-to-top a { padding: .35em .6em .25em; }
+#back-to-top span { display: none; }
+
+@media (min-width: 57em) {
+ #navigation ul, ul#edu-navigation, #fsf-links ul {
+ text-align: center;
+ }
+ li#more-links { float: none; margin-left: 2em; }
+}
+
+
+/** STYLE **/
#navigation a, ul#edu-navigation a, #fsf-links a {
text-decoration: none;
@@ -1308,13 +1495,17 @@
#fsf-links a { color: #333; }
#fsf-links .gnu a { color: #850803; }
-#navigation li:hover { background: #850803; }
-ul#edu-navigation li:hover { background: #ddd; }
-#fsf-links li:hover { background: #c4c4c4; }
+#navigation li a:hover { background: #8c0300; }
+ul#edu-navigation li:hover { background: #f5f5f5; }
+#fsf-links li:hover { background: #eee; }
+#back-to-top a:hover {
+ color: #333; background: #f3f3f3; border-color: #bbb;
+}
+
#navigation li.active, #navigation li.active a:hover {
font-style: italic;
- background: #bb5653;
+ background: #800300;
cursor: default;
}
ul#edu-navigation li.active, ul#edu-navigation li.active a:hover,
@@ -1323,3 +1514,19 @@
font-style: italic;
cursor: default;
}
+
+
+/*====================================================================*/
+/* FONT FAMILY */
+/*====================================================================*/
+
+
+a[href], form.header input[type="text"] { font-family: sans-serif; }
+
+#fsf-frame a[href], #fssbox label, form.header input[type="submit"],
+.button a[href], #header a[href], #fsf-support,
+#navigation a[href], ul#edu-navigation a[href], #fsf-links a[href],
+.trans-disclaimer, .trans-disclaimer a[href] {
+ font-family: "FreeSans", sans-serif;
+}
+h2, h3, h4 { font-family: serif; }
Index: nav-bar/test9/edu-software-tuxpaint.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- nav-bar/test9/edu-software-tuxpaint.html 15 Jan 2020 19:25:46 -0000
1.32
+++ nav-bar/test9/edu-software-tuxpaint.html 16 Feb 2020 17:22:58 -0000
1.33
@@ -46,13 +46,22 @@
</style>
<!--#include virtual="/server/gnun/initial-translations-list.html" -->
<!--#include virtual="/server/staging/banner.html" -->
-<div id="main-text" class="article">
+<div id="main">
+
+<div id="section-menu">
+ <a id="sect-menu-button" class="switch" href="#navlinks">
+ <img id="sect-menu-icon" height="32"
+ src="/server/staging/layout/sect-menu.png"
+ alt="Section menu" /></a>
+</div>
+<p class="breadcrumb">
+ <a href="/education/education.html">Education</a> >
+ <a href="/education/edu-contents.html">Contents</a> >
+ <a href="/education/edu-resources.html">Resources</a> >
+ <a href="/education/edu-software.html">Educational software</a> >
+ Tux Paint
+</p>
-<p id="breadcrumb"><a href="/education/education.html">Education</a> →
-<a href="/education/edu-resources.html">Educational Resources</a> →
-<a href="/education/edu-software.html">Educational Free Software</a> →
-Tux Paint</p>
-<!--#include virtual="/server/staging/education-menu.html" -->
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -62,6 +71,7 @@
<!--#endif -->
<h2 id="main-heading">Tux Paint</h2>
+<div class="article">
<h3>Description</h3>
<p>Tux Paint is a cross-platform drawing program created specifically
@@ -203,6 +213,7 @@
flora. Most importantly, they learned that anyone, even non programmers
or children, can actually influence and improve information
technology when software freedom is granted.</p>
+</div>
<div class="infobox">
<hr />
@@ -214,8 +225,9 @@
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/";>
Creative Commons Attribution-ShareAlike 3.0 Unported</a>.</p>
</div>
+
</div>
-</div><!-- for id="content", starts in the include above -->
+<!--#include virtual="/server/staging/education-menu.html" -->
<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -255,7 +267,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/01/15 19:25:46 $
+$Date: 2020/02/16 17:22:58 $
<!-- timestamp end -->
</p>
</div>
Index: nav-bar/test9/footer-text.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/footer-text.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- nav-bar/test9/footer-text.html 1 Feb 2020 13:02:05 -0000 1.28
+++ nav-bar/test9/footer-text.html 16 Feb 2020 17:22:58 -0000 1.29
@@ -9,19 +9,21 @@
<!--#set var="closing_anchor" value='</a>' -->
<div style="clear:both"></div>
<hr class="no-display" />
+
<!--#if expr="$TRANSLATION_LIST = /<span dir=\"ltr\">/" -->
<div id="languages">
- <div id="set-language" class="button">
+<div id="set-language" class="button">
<!--#echo encoding="none" var="language_selector" --><span
- class="gnun-split"></span>Language on gnu.org<span
+ class="gnun-split"></span>Set language on gnu.org<span
class="gnun-split"></span><!--#echo encoding="none" var="closing_anchor" -->
- </div>
- <h3>Available for this page:</h3>
- <!--#echo encoding="none" var="TRANSLATION_LIST" -->
+</div>
+<p>Available for this page:</p>
+<!--#echo encoding="none" var="TRANSLATION_LIST" -->
</div><!--#endif -->
+<hr class="no-display" />
<div id="back-to-top" class="button">
-<a href="#navigation"><span>BACK TO TOP </span>▲</a>
+ <a href="#navigation"><span>TOP </span>▲</a>
</div>
<div id="fsf-links">
Index: nav-bar/test9/philosophy-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/philosophy-menu.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- nav-bar/test9/philosophy-menu.html 1 Feb 2020 13:02:05 -0000 1.12
+++ nav-bar/test9/philosophy-menu.html 16 Feb 2020 17:22:58 -0000 1.13
@@ -1,147 +1,105 @@
+<hr class="no-display" />
<div id="navlinks">
-<a class="skip" href="#main-heading"><b>Skip directory contents</b></a>
-<h3>Philosophy</h3>
-<ul class="top-level">
- <!--#if expr="$REQUEST_URI = /\/essays-and-articles/" --><li class="current">
+ <a class="backtotop" href="#main"><span>TOP </span>▲</a>
+ <h3>Philosophy menu</h3>
+ <dl>
+ <!--#if expr="$REQUEST_URI = /\/essays-and-articles/" --><dt class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#content">Essays &
articles</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#content">Essays &
articles</a>
- <!--#endif -->
+ <!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
+ <a href="/philosophy/essays-and-articles.html#content">Essays &
articles</a></dt><!--#endif -->
+ <dd>
<ul>
<!--#if expr="$TAGS = /aboutfs/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#aboutfs">About free
software</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#aboutfs">About free
software</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/philosophy/essays-and-articles.html#aboutfs">About free
software</a></li><!--#endif -->
<!--#if expr="$TAGS = /aboutgnu/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#aboutgnu">About GNU
operating system</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#aboutgnu">About GNU
operating system</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/philosophy/essays-and-articles.html#aboutgnu">About GNU
operating system</a></li><!--#endif -->
<!--#if expr="$TAGS = /LicensingFreeSoftware/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a
href="/philosophy/essays-and-articles.html#LicensingFreeSoftware">Licensing
free software</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a
href="/philosophy/essays-and-articles.html#LicensingFreeSoftware">Licensing
free software</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a
href="/philosophy/essays-and-articles.html#LicensingFreeSoftware">Licensing
free software</a></li><!--#endif -->
<!--#if expr="$TAGS = /Laws/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#Laws">Laws &
issues</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#Laws">Laws &
issues</a>
- <!--#endif -->
- <ul>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a href="/philosophy/essays-and-articles.html#Laws">Laws &
issues</a><span class="gnun-split"></span><!--#endif -->
+ <ul class="inline-list">
<!--#if expr="$TAGS = /patents/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#patents">Patents</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#patents">Patents</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a
href="/philosophy/essays-and-articles.html#patents">Patents</a></li><!--#endif
-->
<!--#if expr="$TAGS = /copyright/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a
href="/philosophy/essays-and-articles.html#copyright">Copyright</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a
href="/philosophy/essays-and-articles.html#copyright">Copyright</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a
href="/philosophy/essays-and-articles.html#copyright">Copyright</a></li><!--#endif
-->
<!--#if expr="$TAGS = /drm/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#drm">Digital
restrictions management</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#drm">Digital
restrictions management</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/philosophy/essays-and-articles.html#drm">Digital
restrictions management</a></li><!--#endif -->
<!--#if expr="$TAGS = /noip/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a
href="/philosophy/essays-and-articles.html#noip">“Intellectual
property”</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a
href="/philosophy/essays-and-articles.html#noip">“Intellectual
property”</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a
href="/philosophy/essays-and-articles.html#noip">“Intellectual
property”</a></li><!--#endif -->
<!--#if expr="$TAGS = /ns/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#ns">Network
services</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#ns">Network
services</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/philosophy/essays-and-articles.html#ns">Network
services</a></li><!--#endif -->
<!--#if expr="$TAGS = /cultural/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#cultural">Cultural
& social issues</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#cultural">Cultural
& social issues</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/philosophy/essays-and-articles.html#cultural">Cultural
& social issues</a></li><!--#endif -->
<!--#if expr="$TAGS = /misc/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#misc">Misc</a>
- <span class="gnun-split"></span><!--#echo encoding="none"
var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#misc">Misc</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a
href="/philosophy/essays-and-articles.html#misc">Misc</a></li><!--#endif -->
</ul>
</li>
<!--#if expr="$TAGS = /terminology/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#terminology">Terminology
& definitions</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#terminology">Terminology
& definitions</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/philosophy/essays-and-articles.html#terminology">Terminology
& definitions</a></li><!--#endif -->
<!--#if expr="$TAGS = /upholding/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#upholding">Upholding
software freedom</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#upholding">Upholding
software freedom</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/philosophy/essays-and-articles.html#upholding">Upholding
software freedom</a></li><!--#endif -->
<!--#if expr="$TAGS = /humor/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/essays-and-articles.html#humor">Philosophical
humor</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/essays-and-articles.html#humor">Philosophical
humor</a>
- <!--#endif --></li>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/philosophy/essays-and-articles.html#humor">Philosophical
humor</a></li><!--#endif -->
</ul>
- </li>
- <!--#if expr="$REQUEST_URI = /\/speeches-and-interview/" --><li
class="current">
+ </dd>
+ <!--#if expr="$REQUEST_URI = /\/speeches-and-interview/" --><dt
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/philosophy/speeches-and-interview.html#content">Speeches &
interviews</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/speeches-and-interview.html#content">Speeches &
interviews</a><!--#endif -->
- <!--#endif --></li>
- <!--#if expr="$REQUEST_URI = /\/third-party-ideas/" --><li class="current">
- <!--#echo encoding="none" var="MARK_START" -->
- <a class="current"
href="/philosophy/third-party-ideas.html#content">Third party ideas</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/philosophy/third-party-ideas.html.html#content">Third party
ideas</a><!--#endif -->
- <!--#endif --></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>
+ <!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
+ <a href="/philosophy/speeches-and-interview.html#content">Speeches &
interviews</a></dt><!--#endif -->
+ <!--#if expr="$REQUEST_URI = /\/third-party-ideas/" --><dt class="current">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/philosophy/third-party-ideas.html#content">Third party ideas</a>
+ <!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
+ <a href="/philosophy/third-party-ideas.html#content">Third party
ideas</a></dt><!--#endif -->
+ <dt>
+ <a href="/server/sitemap.html#directory-philosophy">All articles</a></dt>
+ <dt>
+ <a href="http://audio-video.gnu.org/";>Audio & video</a></dt>
+ </dl>
</div>
+
+</div><!-- for id="content", starts in the include above -->
Index: proprietary/malware-microsoft.html
===================================================================
RCS file: /webcvs/www/www/server/staging/proprietary/malware-microsoft.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- proprietary/malware-microsoft.html 1 Jan 2020 16:01:48 -0000 1.16
+++ proprietary/malware-microsoft.html 16 Feb 2020 17:22:59 -0000 1.17
@@ -28,11 +28,20 @@
</style>
<!--#include virtual="/proprietary/po/proprietary-back-doors.translist" -->
<!--#include virtual="/server/staging/banner.html" -->
-<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
-<div id="main-text" class="article">
-<p id="breadcrumb">
-<a href="/proprietary/proprietary.html">Proprietary malware</a> →
-Microsoft</p>
+<div id="main">
+
+<div id="section-menu">
+ <a id="sect-menu-button" class="switch" href="#navlinks">
+ <img id="sect-menu-icon" height="32"
+ src="/server/staging/layout/sect-menu.png"
+ alt="Section menu" /></a>
+</div>
+<p class="breadcrumb">
+ <a href="/proprietary/proprietary.html#content">Proprietary malware</a> >
+ <a href="/proprietary/proprietary.html#TOC">By company</a> >
+ Microsoft
+</p>
+
<!--GNUN: OUT-OF-DATE NOTICE-->
<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
<!--#if expr="$LANGUAGE_SUFFIX" -->
@@ -55,6 +64,7 @@
<hr class="thin" />
</div>
+<div class="article">
<div class="announcement">
<p>If you know of an example that ought to be in this page but isn't
here, please write
@@ -656,9 +666,9 @@
the first software to delete is Windows.</p>
</div>
-
-</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/layout/footer-text.html" -->
+</div>
+<!--#include virtual="/server/staging/proprietary/proprietary-menu.html" -->
+<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
<div id="footer">
<div class="unprintable">
@@ -714,7 +724,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/01/01 16:01:48 $
+$Date: 2020/02/16 17:22:59 $
<!-- timestamp end -->
</p>
</div>
Index: proprietary/proprietary-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/proprietary/proprietary-menu.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- proprietary/proprietary-menu.html 1 Jan 2020 16:01:48 -0000 1.3
+++ proprietary/proprietary-menu.html 16 Feb 2020 17:22:59 -0000 1.4
@@ -1,240 +1,169 @@
+<hr class="no-display" />
<div id="navlinks">
-<p style="display: none"><a href="#start">Skip directory contents</a></p>
-<h3>Proprietary malware</h3>
-
-<ul>
- <li><a href="/proprietary/proprietary.html#types">By type:</a>
- <ul>
+ <a class="backtotop" href="#main"><span>TOP </span>▲</a>
+ <h3>Proprietary malware</h3>
+ <dl>
+ <dt><a href="/proprietary/proprietary.html#TOC">By type</a></dt>
+ <dd>
+ <ul class="inline-list">
<!--#if expr="$REQUEST_URI = /\/proprietary-addictions/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-addictions.html#start">Addictions</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-addictions.html#start">Addictions</a>
- <!--#endif --></li>
+ <a
href="/proprietary/proprietary-addictions.html#start">Addictions</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-addictions.html#start">Addictions</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-back-doors/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-back-doors.html#start">Back doors</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-back-doors.html#start">Back doors</a>
- <!--#endif --></li>
+ <a href="/proprietary/proprietary-back-doors.html#start">Back
doors</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a href="/proprietary/proprietary-back-doors.html#start">Back
doors</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/proprietary-censorship/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-censorship.html#start">Censorship</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-censorship.html#start">Censorship</a>
- <!--#endif --></li>
+ <a
href="/proprietary/proprietary-censorship.html#start">Censorship</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-censorship.html#start">Censorship</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-coverups/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-coverups.html#start">Coverups</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-coverups.html#start">Coverups</a>
- <!--#endif --></li>
+ <a
href="/proprietary/proprietary-coverups.html#start">Coverups</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-coverups.html#start">Coverups</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-deception/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-deception.html#start">Deception</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-deception.html#start">Deception</a>
- <!--#endif --></li>
+ <a
href="/proprietary/proprietary-deception.html#start">Deception</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-deception.html#start">Deception</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-drm/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-drm.html#start">DRM</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-drm.html#start">DRM</a>
- <!--#endif --></li>
+ <a href="/proprietary/proprietary-drm.html#start">DRM</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-drm.html#start">DRM</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/proprietary-fraud/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-fraud.html#start">Fraud</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-fraud.html#start">Fraud</a>
- <!--#endif --></li>
+ <a href="/proprietary/proprietary-fraud.html#start">Fraud</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-fraud.html#start">Fraud</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/proprietary-incompatibility/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a
href="/proprietary/proprietary-incompatibility.html#start">Incompatibility</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a
href="/proprietary/proprietary-incompatibility.html#start">Incompatibility</a>
- <!--#endif --></li>
+ <a
href="/proprietary/proprietary-incompatibility.html#start">Incompatibility</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-incompatibility.html#start">Incompatibility</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-insecurity/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-insecurity.html#start">Insecurity</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-insecurity.html#start">Insecurity</a>
- <!--#endif --></li>
+ <a
href="/proprietary/proprietary-insecurity.html#start">Insecurity</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-insecurity.html#start">Insecurity</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-interference/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a
href="/proprietary/proprietary-interference.html#start">Interference</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a
href="/proprietary/proprietary-interference.html#start">Interference</a>
- <!--#endif --></li>
+ <a
href="/proprietary/proprietary-interference.html#start">Interference</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-interference.html#start">Interference</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-jails/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-jails.html#start">Jails</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-jails.html#start">Jails</a>
- <!--#endif --></li>
+ <a href="/proprietary/proprietary-jails.html#start">Jails</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-jails.html#start">Jails</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/proprietary-manipulation/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a
href="/proprietary/proprietary-manipulation.html#start">Manipulation</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a
href="/proprietary/proprietary-manipulation.html#start">Manipulation</a>
- <!--#endif --></li>
- <!--#if expr="$REQUEST_URI = /\/proprietary-obsolescence/" -->
- <!--#echo encoding="none" var="MARK_START" -->
- <a
href="/proprietary/proprietary-obsolescence.html#start">Obsolescence</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a
href="/proprietary/proprietary-obsolescence.html#start">Obsolescence</a>
- <!--#endif --></li>
+ <a
href="/proprietary/proprietary-manipulation.html#start">Manipulation</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-manipulation.html#start">Manipulation</a></li><!--#endif
-->
+ <!--#if expr="$REQUEST_URI = /\/proprietary-obsolescence/" --><li
class="current">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a
href="/proprietary/proprietary-obsolescence.html#start">Obsolescence</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-obsolescence.html#start">Obsolescence</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-sabotage/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-sabotage.html#start">Sabotage</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-sabotage.html#start">Sabotage</a>
- <!--#endif --></li>
+ <a
href="/proprietary/proprietary-sabotage.html#start">Sabotage</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-sabotage.html#start">Sabotage</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-subscriptions/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a
href="/proprietary/proprietary-subscriptions.html#start">Subscriptions</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a
href="/proprietary/proprietary-subscriptions.html#start">Subscriptions</a>
- <!--#endif --></li>
+ <a
href="/proprietary/proprietary-subscriptions.html#start">Subscriptions</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-subscriptions.html#start">Subscriptions</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-surveillance/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a
href="/proprietary/proprietary-surveillance.html#start">Surveillance</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a
href="/proprietary/proprietary-surveillance.html#start">Surveillance</a>
- <!--#endif --></li>
+ <a
href="/proprietary/proprietary-surveillance.html#start">Surveillance</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-surveillance.html#start">Surveillance</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-tethers/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-tethers.html#start">Tethers</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-tethers.html#start">Tethers</a>
- <!--#endif --></li>
+ <a href="/proprietary/proprietary-tethers.html#start">Tethers</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-tethers.html#start">Tethers</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/proprietary-tyrants/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/proprietary-tyrants.html#start">Tyrants</a>
- <span class="gnun-split"></span>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/proprietary-tyrants.html#start">Tyrants</a>
- <!--#endif --></li>
+ <a href="/proprietary/proprietary-tyrants.html#start">Tyrants</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/proprietary-tyrants.html#start">Tyrants</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/potential-malware/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/potential-malware.html#start">In the pipe</a>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/potential-malware.html#start">In the pipe</a>
- <!--#endif --></li>
+ <a href="/proprietary/potential-malware.html#start">In the
pipe</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a href="/proprietary/potential-malware.html#start">In the
pipe</a></li><!--#endif -->
</ul>
- </li>
- <li><a href="/proprietary/proprietary.html#products">By product:</a>
- <ul>
+ </dd>
+ <dt><a href="/proprietary/proprietary.html#TOC">By product</a></dt>
+ <dd>
+ <ul class="inline-list">
<!--#if expr="$REQUEST_URI = /\/malware-appliances/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/malware-appliances.html#start">Appliances</a>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/malware-appliances.html#start">Appliances</a>
- <!--#endif --></li>
+ <a
href="/proprietary/malware-appliances.html#start">Appliances</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/malware-appliances.html#start">Appliances</a></li><!--#endif
-->
<!--#if expr="$REQUEST_URI = /\/malware-games/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/malware-games.html#start">Cars</a>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/malware-games.html#start">Cars</a>
- <!--#endif --></li>
+ <a href="/proprietary/malware-games.html#start">Cars</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/malware-games.html#start">Cars</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/malware-cars/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/malware-cars.html#start">Games</a>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/malware-cars.html#start">Games</a>
- <!--#endif --></li>
+ <a href="/proprietary/malware-cars.html#start">Games</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/malware-cars.html#start">Games</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/malware-mobiles/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/malware-mobiles.html#start">Mobiles</a>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/malware-mobiles.html#start">Mobiles</a>
- <!--#endif --></li>
+ <a href="/proprietary/malware-mobiles.html#start">Mobiles</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/malware-mobiles.html#start">Mobiles</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/malware-webpages/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/malware-webpages.html#start">Webpages</a>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/malware-webpages.html#start">Webpages</a>
- <!--#endif --></li>
+ <a href="/proprietary/malware-webpages.html#start">Webpages</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/malware-webpages.html#start">Webpages</a></li><!--#endif -->
</ul>
- </li>
- <li><a href="/proprietary/proprietary.html#companies">By company:</a>
- <ul>
+ </dd>
+ <dt><a href="/proprietary/proprietary.html#TOC">By company</a></dt>
+ <dd>
+ <ul class="inline-list">
<!--#if expr="$REQUEST_URI = /\/malware-adobe/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/malware-adobe.html#start">Adobe</a>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/malware-adobe.html#start">Adobe</a>
- <!--#endif --></li>
+ <a href="/proprietary/malware-adobe.html#start">Adobe</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/malware-adobe.html#start">Adobe</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/malware-amazon/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/malware-amazon.html#start">Amazon</a>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/malware-amazon.html#start">Amazon</a>
- <!--#endif --></li>
+ <a href="/proprietary/malware-amazon.html#start">Amazon</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/malware-amazon.html#start">Amazon</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/malware-apple/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/malware-apple.html#start">Apple</a>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/malware-apple.html#start">Apple</a>
- <!--#endif --></li>
+ <a href="/proprietary/malware-apple.html#start">Apple</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/malware-apple.html#start">Apple</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/malware-google/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/malware-google.html#start">Google</a>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/malware-google.html#start">Google</a>
- <!--#endif --></li>
+ <a href="/proprietary/malware-google.html#start">Google</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/malware-google.html#start">Google</a></li><!--#endif -->
<!--#if expr="$REQUEST_URI = /\/malware-microsoft/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/proprietary/malware-microsoft.html#start">Microsoft</a>
- <!--#echo encoding="none" var="MARK_END" -->
- <!--#else --><li>
- <a href="/proprietary/malware-microsoft.html#start">Microsoft</a>
- <!--#endif --></li>
+ <a href="/proprietary/malware-microsoft.html#start">Microsoft</a></li>
+ <!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
+ <a
href="/proprietary/malware-microsoft.html#start">Microsoft</a></li><!--#endif
-->
</ul>
- </li>
-</ul>
+ </dd>
+ </dl>
</div>
+
+</div><!-- for id="content", starts in the include above -->