[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: |
Fri, 20 Dec 2019 12:01:56 -0500 (EST) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 19/12/20 12:01:56
Modified files:
server/staging : body-include-1.html body-include-2.html
education-menu.html edu-software.html
education.css
server/staging/nav-bar/test9: edu-software-tuxpaint.html
server/staging/readability: free-sw.html
Log message:
* Switches for translist, navbar & searcher, using GET method + SSIs.
* Reorganize the header.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-1.html?cvsroot=www&r1=1.13&r2=1.14
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-2.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education-menu.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-software.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education.css?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/readability/free-sw.html?cvsroot=www&r1=1.21&r2=1.22
Patches:
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-1.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- body-include-1.html 16 Dec 2019 21:52:29 -0000 1.13
+++ body-include-1.html 20 Dec 2019 17:01:56 -0000 1.14
@@ -1,63 +1,38 @@
<!-- start of server/body-include-1.html -->
<!--#set var="HTML_BODY" value="yes" -->
<!--#set var="cb" value="$REQUEST_URI" -->
-<!--#if expr="$cb = /^([^?]*)[?]/" -->
-<!--#set var="cb" value="$1" -->
-<!--#endif -->
+<!--#if expr="$cb = /^([^?]*)[?]/"
+ --><!--#set var="cb" value="$1"
+ --><!--#endif -->
<!--#set var="language_selector"
- value='<a title="Set your preferred language for this session"
href="/server/select-language.html?callback=$cb" rel="nofollow">' -->
+ value='<a title="Set your preferred language for this session"
+ href="/server/select-language.html?callback=$cb" rel="nofollow">' -->
<!--#set var="closing_anchor" value='</a>' -->
-
+<!--#if expr="$QUERY_STRING = /navbar=([^&#]+)/"
+ --><!--#set var="nd" value="$1"
+ --><!--#endif -->
+<!--#if expr="$QUERY_STRING = /searcher=([^&#]+)/"
+ --><!--#set var="sd" value="$1"
+ --><!--#endif -->
+<!--#if expr="$QUERY_STRING = /languages=([^&#]+)/"
+ --><!--#set var="ld" value="$1"
+ --><!--#endif -->
+<!--#set var="navbar_on" value='<a
+ href="?navbar=on&searcher=$sd&languages=$ld">' -->
+<!--#set var="navbar_off" value='<a
+ href="?navbar=off&searcher=$sd&languages=$ld">' -->
+<!--#set var="searcher_on" value='<a
+ href="?searcher=on&navbar=$nd&languages=$ld">' -->
+<!--#set var="searcher_off" value='<a
+ href="?searcher=off&navbar=$nd&languages=$ld">' -->
+<!--#set var="languages_on" value='<a
+ href="?languages=on&searcher=$sd&navbar=$nd">' -->
+<!--#set var="languages_off" value='<a
+ href="?languages=off&searcher=$sd&navbar=$nd">' -->
+<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
+<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
<div id="toplinks">
<span id="skip"><a title="Skip to main text"
- href="#content">Skip to main text</a></span>
-
-<div id="searcher">
- <a href="https://www.gnu.org/cgi-bin/estseek.cgi";>
- <img id="search-icon"
- src="/server/staging/layout/search.png"
- alt=" [Search icon] "
- title="Search www.gnu.org" />
- </a>
- <form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi" class="header">
- <div>
- <input name="phrase" id="phrase" type="text" accesskey="s"
- value="Why GNU/Linux?" onfocus="this.value=''" />
- <input type="submit" value="Search" />
- </div>
- </form>
-</div><!-- /searcher -->
-
-<div id="language-container">
- <input type="checkbox" id="language-button" />
- <label for="language-button">
- <span class="text">LANGUAGES</span> <span>▼</span>
- <img id="language-icon"
- src="/server/staging/layout/Ãtoms_-_Translation.png"
- alt=" [Translation icon by AEtoms] "
- title="Translations" />
- </label>
-
-<div id=languages>
-<div id="set-language">
- <span class="gnun-split"></span><!--#echo
- encoding="none" var="language_selector" -->Set
- <span>preferred</span> language<span class="gnun-split"></span><!--#echo
- encoding="none" var="closing_anchor" -->
- <p><span>Available for this page:</span></p>
+ href="#content">Skip to main text</a> </span>
</div>
-
-<!--#if expr="$TRANSLATION_LIST" -->
-<!--#echo encoding="none" var="TRANSLATION_LIST" -->
-<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
-<!-- if initial translation list isn't included before banner.html,
- then the file may use an old boilerplate that contains
- div#translations in its body, and we mustn't duplicate it here. -->
-<!--#include virtual="/server/gnun/initial-translations-list.html" -->
-<!--#endif -->
-</div><!-- /languages -->
-</div><!-- /language-container -->
-<div class="clear: opt"></div>
-</div><!-- /toplinks -->
-
<!-- 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- body-include-2.html 16 Dec 2019 21:52:29 -0000 1.8
+++ body-include-2.html 20 Dec 2019 17:01:56 -0000 1.9
@@ -1,42 +1,116 @@
<!-- start of server/body-include-2 -->
<div id="header">
+<div id="gnu-fsf">
-<input type="checkbox" id="menu-button" />
-<label for="menu-button">
- <img id="menu-icon" src="/server/staging/layout/menu.png"
- alt="[3-bar menu icon] "
- title="Main menu" />
-</label>
-
-<div id="gnu-banner">
- <a href="/">
+<p id="gnu-banner">
+<a href="/">
<img src="/graphics/heckert_gnu.transp.small.png"
- alt=" [A GNU head] " /><strong>GNU</strong> <span>Operating
System</span></a>
-<p id="fsf-support">Sponsored by the <a href="#mission-statement">Free
Software Foundation</a></p>
-</div><!-- /gnu-banner -->
+ 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 id="fsf-frame">
-<p id="join-fsf"><a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
<div id="fssbox">
-<p><a href="//www.fsf.org/fss">Free Software Supporter</a></p>
+<p id="fss-link">BoletÃn<br />«<cite><a href="//www.fsf.org/fss">Free
Software Supporter</a></cite>»<br />
+(también en español)</p>
+<p id="fss-signup" class="button">
+<a href="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";>SIGN
UP</a></p>
+<!--
<form action="https://my.fsf.org/civicrm/profile/create?reset=1&gid=31";
method="post" class="header">
- <div>
+ <p>
<input name="postURL" type="hidden" value="" />
<input type="hidden" name="group[25]" value="1" />
<input name="cancelURL" type="hidden"
value="https://crm.fsf.org/civicrm/profile?reset=1&gid=31"; />
<input name="_qf_default" type="hidden" value="Edit:cancel" />
- </div>
- <p>
<input type="text" id="frmEmail" name="email-Primary"
value="email address" onfocus="this.value=''"/>
<input type="submit" name="_qf_Edit_next" value="Sign up" />
</p>
</form>
-</div><!-- /fssbox -->
-</div><!-- /fsf-frame -->
+-->
+</div>
+<p id="join-fsf" class="button">
+<a
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN THE FSF</a></p>
+</div>
+</div>
+
+<p id="switches">
+ <span id="searcher-button" class="switch">
+ <!--#if expr="$sd = on"
+ --><!--#echo encoding="none" var='searcher_off'
+ --><!--#else
+ --><!--#echo encoding="none" var='searcher_on'
+ --><!--#endif
+ --><img id="search-icon"
+ src="/server/staging/layout/search.png"
+ alt=" [Search www.gnu.org] "
+ title="Search www.gnu.org" />
+ <span><!--#if expr="$sd = on"
+ -->▾<!--#else -->◂<!--#endif --> </span>
+ <!--#echo encoding="none" var="closing_anchor" -->
+ </span>
+
+ <span id="language-button" class="switch">
+ <!--#if expr="$ld = on"
+ --><!--#echo encoding="none" var='languages_off'
+ --><!--#else
+ --><!--#echo encoding="none" var='languages_on'
+ --><!--#endif
+ --><img src="/server/staging/layout/translation-opt.png"
+ alt=" [Available languages] "
+ title="Languages" />
+ <span><!--#if expr="$ld = on"
+ -->▾<!--#else -->◂<!--#endif --> </span>
+ <!--#echo encoding="none" var="closing_anchor" -->
+ </span>
+
+ <span id="navbar-button" class="switch">
+ <!--#if expr="$nd = on"
+ --><!--#echo encoding="none" var='navbar_off'
+ --><!--#else
+ --><!--#echo encoding="none" var='navbar_on'
+ --><!--#endif
+ --><img src="/server/staging/layout/menu.png"
+ alt=" [Main menu] "
+ title="Main menu" />
+ <span><!--#if expr="$nd = on"
+ -->▾<!--#else -->◂<!--#endif --> </span>
+ <!--#echo encoding="none" var="closing_anchor" -->
+ </span>
+</p>
-<div id="navigation">
+<!--#if expr="$sd = on" --><div id="searcher">
+ <form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi" class="header">
+ <p>
+ <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
+ value="Why GNU/Linux?" onfocus="this.value=''" />
+ <input type="submit" value="Search" />
+ </p>
+ </form>
+</div><!--#endif -->
+<div style="clear: both"></div>
+
+<!--#if expr="$ld = on" --><div id="languages">
+<div class="language-container">
+<p id="set-language">
+ <span class="gnun-split"></span><!--#echo
+ encoding="none" var="language_selector" -->Set
+ preferred language<span class="gnun-split"></span><!--#echo
+ encoding="none" var="closing_anchor" --></p>
+
+<p>Available for this page:</p>
+<!--#if expr="$TRANSLATION_LIST" -->
+<!--#echo encoding="none" var="TRANSLATION_LIST" -->
+<!--#elif expr="$INITIAL_TRANSLATIONS_LIST = included" -->
+<!-- if initial translation list isn't included before banner.html,
+ then the file may use an old boilerplate that contains
+ div#translations in its body, and we mustn't duplicate it here. -->
+<!--#include virtual="/server/gnun/initial-translations-list.html" -->
+<!--#endif --></div><!--#endif -->
+</div>
+
+<!--#if expr="$nd = on" --><div id="navigation">
<ul>
<!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
<!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
@@ -124,7 +198,7 @@
<li id="more-links"><a href="#fsf-links">More ▼</a></li>
</ul>
<div style="clear: both"></div>
-</div><!-- /navigation -->
+</div><!--#endif -->
</div><!-- /header -->
+<div style="clear: both"></div>
<!-- end of server/body-include-2 -->
-
Index: education-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/education-menu.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- education-menu.html 16 Dec 2019 21:43:20 -0000 1.4
+++ education-menu.html 20 Dec 2019 17:01:56 -0000 1.5
@@ -1,8 +1,8 @@
<div id="navlinks">
-<p style="display: none"><a href="#main-text">Skip directory contents</a></p>
+<p style="display: none"><a href="#main-heading">Skip directory
contents</a></p>
<h3>Education</h3>
<ul>
- <!--#if expr="$REQUEST_URI = /\/edu-contents[.]/" --><li class="current">
+ <!--#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>
@@ -10,7 +10,7 @@
<!--#else --><li>
<a href="/education/edu-contents.html#content">Contents</a>
<!--#endif --></li>
- <!--#if expr="$REQUEST_URI = /\/edu-cases[.]/" --><li class="current">
+ <!--#if expr="$REQUEST_URI = /\/edu-cases[^-]/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-cases.html#content">Case studies</a>
<span class="gnun-split"></span>
@@ -19,7 +19,7 @@
<a href="/education/edu-cases.html#content">Case studies</a>
<!--#endif -->
<ul>
- <!--#if expr="$REQUEST_URI = /\/edu-cases-argentina[.]/" --><li
class="current">
+ <!--#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>
@@ -28,7 +28,7 @@
<a href="/education/edu-cases-argentina.html#content">Argentina</a>
<!--#endif -->
<ul>
- <!--#if expr="$REQUEST_URI = /edu-cases-argentina-ecen[.]/" --><li
class="current">
+ <!--#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" -->
@@ -37,7 +37,7 @@
<!--#endif --></li>
</ul>
</li>
- <!--#if expr="$REQUEST_URI = /edu-cases-india[.]/" --><li
class="current">
+ <!--#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>
@@ -46,14 +46,14 @@
<a href="/education/edu-cases-india.html#content">India</a>
<!--#endif -->
<ul>
- <!--#if expr="$REQUEST_URI = /edu-cases-india-ambedkar[.]/" --><li
class="current">
+ <!--#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>
- <!--#if expr="$REQUEST_URI = /edu-cases-india-irimpanam[.]/" --><li
class="current">
+ <!--#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" -->
@@ -64,7 +64,7 @@
</li>
</ul>
</li>
- <!--#if expr="$REQUEST_URI = /\/edu-resources[.]/" --><li class="current">
+ <!--#if expr="$REQUEST_URI = /\/edu-resources/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-resources.html#content">Resources</a>
<span class="gnun-split"></span>
@@ -73,7 +73,7 @@
<a href="/education/edu-resources.html#content">Resources</a>
<!--#endif -->
<ul>
- <!--#if expr="$REQUEST_URI = /\/edu-software[.]/" --><li class="current">
+ <!--#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>
@@ -82,30 +82,30 @@
<a href="/education/edu-software.html#content"><b>Educational
Software</b></a>
<!--#endif -->
<ul>
- <!--#if expr="$REQUEST_URI = /edu-software-gcompris[.]/" --><li
class="current">
+ <!--#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>
- <!--#if expr="$REQUEST_URI = /edu-software-gimp[.]/" --><li
class="current">
+ <!--#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>
- <!--#if expr="$REQUEST_URI = /edu-software-tuxpaint[.]/" --><li
class="current">
+ <!--#if expr="$REQUEST_URI = /\/edu-software-tuxpaint/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a
href="/education/edu-software-tuxpaint.html#content">Tuxpaint</a>
+ <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">Tuxpaint</a>
+ <a href="/education/edu-software-tuxpaint.html#content">Tux
Paint</a>
<!--#endif --></li>
</ul>
</li>
- <!--#if expr="$REQUEST_URI = /\/edu-projects[.]/" --><li class="current
no-display">
+ <!--#if expr="$REQUEST_URI = /\/edu-projects/" --><li class="current
no-display">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-projects.html#content">Groups &
projects</a>
<span class="gnun-split"></span>
@@ -113,7 +113,7 @@
<!--#else --><li>
<a href="/education/edu-projects.html#content">Groups &
projects</a>
<!--#endif --></li>
- <!--#if expr="$REQUEST_URI = /edu-free-learning-resources[.]/" --><li
class="current no-display">
+ <!--#if expr="$REQUEST_URI = /\/edu-free-learning-resources/" --><li
class="current no-display">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-free-learning-resources.html#content">Free
learning</a>
<span class="gnun-split"></span>
@@ -123,7 +123,7 @@
<!--#endif --></li>
</ul>
</li>
- <!--#if expr="$REQUEST_URI = /\/edu-faq[.]/" --><li class="current">
+ <!--#if expr="$REQUEST_URI = /\/edu-faq/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-faq.html#content">FAQ</a>
<span class="gnun-split"></span>
@@ -131,7 +131,7 @@
<!--#else --><li>
<a href="/education/edu-faq.html#content">FAQ</a>
<!--#endif --></li>
- <!--#if expr="$REQUEST_URI = /\/edu-team[.]/" --><li class="current">
+ <!--#if expr="$REQUEST_URI = /\/edu-team/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-team.html#content">Our team</a>
<span class="gnun-split"></span>
Index: edu-software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-software.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- edu-software.html 16 Dec 2019 21:43:35 -0000 1.5
+++ edu-software.html 20 Dec 2019 17:01:56 -0000 1.6
@@ -10,15 +10,6 @@
<!--#include virtual="/education/po/edu-software.translist" -->
<!--#include virtual="/server/staging/banner.html" -->
<div id="main-text" class="article">
-
-<input type="checkbox" id="sect-menu-button" />
-<label for="sect-menu-button">
- <img id="sect-menu-icon"
- src="/server/staging/layout/sect-menu.png"
- alt="[3-bar section menu icon] "
- title="Education menu" />
-</label>
-
<p id="breadcrumb">
<a href="/education/education.html">Education</a> →
<a href="/education/edu-resources.html">Educational Resources</a> →
@@ -149,7 +140,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/12/16 21:43:35 $
+$Date: 2019/12/20 17:01:56 $
<!-- timestamp end -->
</p>
</div>
Index: education.css
===================================================================
RCS file: /webcvs/www/www/server/staging/education.css,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- education.css 16 Dec 2019 21:43:20 -0000 1.16
+++ education.css 20 Dec 2019 17:01:56 -0000 1.17
@@ -7,17 +7,36 @@
/* Changes to layout.css */
/***************************/
-/* Style */
+/* Style and asides */
+
+body {
+ border-top: 2px solid #a42e2b;
+}
+#header {
+ border-bottom: 1px solid #a42e2b;
+}
+#content {
+ border-top: 1px solid #a42e2b;
+}
#toplinks, form.header, #header {
font-family: sans-serif;
}
-body {
- border-top: 3px solid #a42e2b;
+
+#toplinks, #header, #searcher {
+ background: #f9f9f9;
}
-.inner #header, #toplinks, #searcher {
- background: #f7f7f7;
+#gnu-banner strong {
+ font-weight: normal;
}
+#languages, #translations, #translations p {
+ background: white;
+}
+#switches {
+ padding: .1em;
+ background: white;
+}
+
.italic {
font-style: italic;
}
@@ -25,12 +44,16 @@
font-size: .9em;
}
-.article h2 {
- font-size: 1.7em;
- margin-top: .6em;
+#searcher input[type="text"] {
+ width: 17em; max-width: 70%;
}
-.article h2, h3 {
- font-family: serif;
+form.header input[type="text"] {
+ max-width: 15em;
+ font-weight: normal;
+}
+form.header input[type="submit"] {
+ text-transform: uppercase;
+ font-weight: normal;
}
.announcement, .important {
font-size: inherit;
@@ -58,342 +81,278 @@
.pict p {
font-size: .9em;
}
-@media (max-width: 35em) {
+@media (max-width: 30em) {
.comment {
margin: 1.5em 3%;
}
}
-#gnu-banner {
- font-size: 1.8em;
+/* Article layout */
+
+#main-text, #main-text ~ .translators-notes {
+ max-width: 50rem;
+ margin: auto;
}
-#gnu-banner a strong {
- font-weight: normal;
- color: #333;
+.article h2 {
+ font-size: 1.7em;
+ margin-top: .6em;
+ padding-left: .3em;
+ border-left: .7em solid #eee;
+}
+.article h2, h3 {
+ font-family: serif;
}
-/* Layout */
+/**********************************************/
+/* Header layout for CSS3-unaware browsers. */
+/**********************************************/
+
+/* Reduce font size below 40em. */
+html {
+ font-size: .9em;
+}
#content {
+ position: relative;
margin-bottom: 3em;
}
-
#toplinks {
- float: none;
- font-size: .9em;
- font-weight: normal;
- line-height: 1.2em;
- text-transform: uppercase;
- padding: .5em 3%;
- margin: 0;
+ padding: 0;
}
-#toplinks a {
+#skip {
+ display: none;
+}
+#header {
+ position: relative;
+ padding: .2em 3% 0;
+}
+#gnu-banner {
+ float: left;
+ line-height: 1em;
font-weight: normal;
- font-size: inherit;
+ padding: 0;
+ margin: 0 .7em .5em 3%;
+}
+#gnu-banner img {
+ height: 1.7em;
+ vertical-align: bottom;
+ position: relative; top: .2em;
+ margin: 0 .15em 0 0;
+}
+#fsf-frame {
+ display: none;
+}
+
+p#join-fsf {
+ margin-top: 1em;
+}
+#fssbox {
margin: 0;
}
-#searcher {
+#fssbox p {
display: inline-block;
- white-space: nowrap;
+ vertical-align: middle;
text-align: left;
- font-size: inherit;
- padding: 0 2em .5em 0;
margin: 0;
}
-form.header input[type="text"] {
- max-width: 15em;
- font-weight: normal;
+#fss-signup a {
+ display: inline-block;
+ background: #fff;
+ padding: .4em .5em .3em;
+ border: .1em solid #0a8080;
+ margin-left: 1em;
}
-form.header input[type="submit"] {
- text-transform: uppercase;
- font-weight: normal;
+
+/* On-off switches to display navbar, searcher & languages. */
+
+p#switches {
+ float: right;
+ white-space: nowrap;
+ padding: .1em 0 .1em .3em;
+ margin: 0 0 .3em 1em;
+}
+.switch {
+ display: inline-block;
+ vertical-align: middle;
+ margin: 0 1em;
+}
+.switch img {
+ display: inline-block;
+ vertical-align: middle;
+ height: 100%;
+}
+.switch span {
+ display: inline-block;
+ vertical-align: middle;
+ position: relative;
+ right: .2em;
+}
+#navbar-button {
+ line-height: 1em;;
+ height: 1.2em;
+ padding: .3em 0;
+}
+#language-button {
+ height: 2em;
+ line-height: 1em;
+}
+#searcher-button {
+ height: 1.8em;
+ line-height: 1em;
}
-#skip, #set-language, #set-language p, #translations {
- display: inline;
+/* Searcher */
+
+#searcher, #searcher p {
+ float: right;
+ display: inline-block;
+ padding: 0;
margin: 0;
}
-#skip a, #set-language a {
+#searcher {
+ margin-top: .3em;
+}
+
+/* Languages */
+
+#languages {
+ display: block;
+ margin: auto;
+ text-align: left;
+ font-size: inherit;
+ text-align: center;
+ padding: 0 1em 1em 1em;
+ border-top: 1px solid #a42e2b;
+ margin: .3em -3.2% 0;
+}
+.language-container {
display: inline-block;
- margin: 0 2em .5em 0;
+ margin: auto;
}
-#language-container, #languages, #languages p {
- display: inline;
- line-height: 1.2em;
+#set-language a {
+ display: block;
+ border: none;
}
-#skip a, #set-language a {
- color: #555;
- padding: .25em .5em;
- border: .1em solid #ccc;
- border-radius: .3em;
- -moz-border-radius: .3em;
- -khtml-border-radius: .3em;
- -webkit-border-radius: .3em;
- -opera-border-radius: .3em;
+#languages > p {
+ display: block;
+ text-align: left;
+ margin: 0 0 .5em;
}
+
#translations {
- display: inline-block;
- font-size: .9em;
- background: white;
- padding: 0;
+ display: block;
+ column-count: 2;
+ padding: 0 0 0 1em;
border: none;
- margin: 0;
+}
+#translations p {
+ line-height: .9em;
+ padding: 0;
+ margin: 0 0 0 1.5em;
}
#translations span {
- display: inline;
+ display: block;
font-size: inherit;
+ padding: 0;
}
#translations span a {
+ display: inline-block;
font-size: inherit;
- padding: 0;
+ font-weight: normal;
+ padding: .3em;
margin: 0;
}
-#fsf-support {
- margin-top: .5em;
-}
-/* #navigation is now in #header. */
+/* Main navbar */
+
#navigation {
+ clear: both;
text-align: left;
+ padding-left: 1em;
margin: 0 -3.2%;
}
-/* Don't display the drop-down switches in CSS3-agnostic browsers. */
-input#language-button, input#menu-button,
- img#language-icon, img#menu-icon, #searcher a,
- #language-container label, #set-language span {
- display: none;
-}
-
-/************************************************/
-/* Mobile-friendly header and site navigation */
-/************************************************/
-
-@media (min-width: 0) {
+/******************************/
+/* Media queries for header */
+/******************************/
- /* Reduce font size. */
- html {
- font-size: .9em;
- }
- /* Change some already defined elements. */
- #skip {
+@media (max-width: 30em) {
+ #gnu-banner .hide {
display: none;
}
- #header {
- position: relative;
- text-align: center;
- }
#gnu-banner {
- padding: 0 0 .5em;
- }
- #content {
- position: relative;
- }
-
- /* Hide i18n stuff behind a button. */
- #language-container {
- position: relative;
- float: right;
- }
- #languages {
- display: none;
- }
- #language-container label {
- display: inline-block;
- height: 2em;
- }
- img#language-icon {
- height: 100%;
- display: inline-block;
- vertical-align: middle;
- }
- #language-container label span {
- display: none;
+ margin: 0 .7em .5em 0;
}
- #set-language a {
- display: block;
- border: none;
+ .switch {
margin: 0;
}
- #set-language span {
- display: inline;
- }
- #set-language p {
- display: block;
- margin: .7em 0 0 .5em;
- }
- #translations span.original {
- padding-top: .7em;
- }
#translations {
column-count: 1;
}
- #translations p {
- display: block;
- line-height: 1em;
- }
- #translations span {
- display: block;
- font-size: inherit;
- padding-left: 1.5em;
- }
- #translations span a {
- display: inline-block;
- font-size: inherit;
- font-weight: normal;
- padding: .3em;
- }
- input#language-button:checked ~ #languages {
- display: block;
- position: absolute;
- top: 110%; right: 0;
- z-index: 3;
- font-size: inherit;
- text-align: left;
- padding: .5em;
- background: white;
- border: .2em solid #999;
- }
+}
- /* Hide the navbar behind a 3-bar menu. */
- #navigation {
- height: 3px;
- }
- #navigation ul {
- display: none;
+@media (min-width: 40em) {
+ html {
+ font-size: 1em;
}
- img#menu-icon {
- display: inline;
- height: 1.3em;
- position: absolute;
- top: -2.9em; left: .7em;
+ #gnu-banner {
+ margin-bottom: 0;
}
- input#menu-button:checked ~ #navigation {
- height: auto;
+ #gnu-banner img {
+ top: .3em;
}
- input#menu-button:checked ~ #navigation ul {
+ #fsf-support {
display: block;
- }
-
- /* Hide the searcher behind an icon. */
- #toplinks {
- padding: 1.2em 3% 3.5em;
- }
- #searcher {
- float: right;
- padding: 0;
- margin: 0 0 0 2em;
- }
- #searcher form {
- display: none;
- }
- #searcher a {
- display: inline-block;
- height: 2em;
- }
- #searcher a img {
- height: 100%;
- }
-
- /* Simplify the GNU banner. */
- #gnu-banner span {
- display: none;
- }
- /* Squeeze it between the top icons. */
- #gnu-banner {
- position: absolute;
- top: -2.2em;
- left: 2.5em;
+ margin: .4em 0 .5em;
}
}
-@media (min-width: 35em) {
-
- /* Use normal font size. */
- html {
- font-size: 1em;
+@media (min-width: 50em) {
+ #translations {
+ column-count: 3;
}
+}
- /* Move the GNU banner down. */
- #toplinks {
- padding: .5em 3%;
+@media (min-width: 60em) {
+ #header {
+ text-align: center;
}
#searcher {
float: none;
- margin: 0 3.5em;
- }
- img#menu-icon {
- display: inline;
- height: 1.3em;
position: absolute;
- top: -2.3em; left: 3%;
+ left: 0;
}
- #gnu-banner {
- position: static;
+ #gnu-fsf {
+ display: table;
+ width: 100%;
+ padding: 0 3% 0 0
}
-
- /* Display hidden text. */
- #language-container label span {
- display: inline-block;
+ #gnu-banner, #fsf-frame {
+ float: none;
+ display: table-cell;
vertical-align: middle;
}
- #gnu-banner span {
- display: inline;
- }
-
- /* Display the translation list on 2 columns. */
- #translations {
- column-count: 2;
- }
- input#language-button:checked ~ #languages {
- padding-bottom: 0;
- }
-}
-
-@media (min-width: 50em) {
-
- /* Display the searcher. */
- #searcher a {
- display: none;
- }
- #searcher form{
- display: block;
- float: left;
- padding: .1em 0;
- }
#gnu-banner {
- padding: .2em 0 .5em;
- }
-}
-
-@media (min-width: 60em) {
-
- /* Display the translation list on 3 columns. */
- #translations {
- column-count: 3;
+ margin: 0;
}
-
- /* Move fsf-frame and gnu-banner toward the center. */
#fsf-frame {
- float: none;
- display: inline-block;
- vertical-align: middle;
- margin-left: 3%;
+ display: block;
+ padding: .7em 0 .7em 3%;
+ margin: 0;
}
- #gnu-banner {
+ p#switches {
float: none;
display: inline-block;
- vertical-align: middle;
- padding: 0;
- margin-right: 3%;
+ text-align: center;
+ margin: 0 0 .3em 0;
}
}
-/*********************/
-/* Page navigation */
-/*********************/
+/***********************************************/
+/* Page navigation for CSS3-unaware browsers */
+/***********************************************/
/* Linear table of contents */
@@ -414,25 +373,20 @@
#breadcrumb {
line-height: 1.7em;
- display: inline-block;
- vertical-align: middle;
- width: 83%;
font-size: 1.0rem;
- margin: .6em 0;
+ padding: .6em 0;
+ margin: 0;
}
/* Section menu */
-img#sect-menu-icon, input#sect-menu-button {
- display: none;
-}
#navlinks {
display: none;
}
#navlinks {
font-size: 1.0rem;
padding: 0 0 1em;
- background: #f7f7f7;
+ background: #fafafa;
border: .1em solid #ddd;
margin: 0;
}
@@ -440,7 +394,7 @@
font-size: 1.1em;
text-align: center;
padding: .3em 0;
- margin: .5em 0 0;
+ margin: .5em 0;
}
#navlinks ul, #navlinks ul li {
line-height: 1.2em;
@@ -473,25 +427,19 @@
background: #f7f7f7;
}
+
+/***************************************/
+/* Media queries for page navigation */
+/***************************************/
+
@media (min-width: 0) {
- img#sect-menu-icon {
- display: inline-block;
- vertical-align: middle;
- width: 1.5em;
- padding: 1em 1em 1em 0;
- }
- input#sect-menu-button:checked ~ #navlinks {
- display: inline-block;
+ #main-text, #main-text ~ .translators-notes {
+ max-width: 50rem;
+ margin: auto;
}
}
@media (min-width: 60em) {
- img#sect-menu-icon {
- display: none;
- }
- #breadcrumb {
- width: auto;
- }
#navlinks {
display: inline-block;
width: 14rem;
@@ -503,7 +451,7 @@
padding-bottom: 3em;
}
#main-text, #main-text ~ .translators-notes {
- margin-left: 14.1rem;
+ padding: 0 1em 0 15.1rem;
}
}
@@ -556,6 +504,8 @@
/* Links and buttons */
/***********************/
+/* Basic definitions */
+
a[href]:link {
font-family: sans-serif;
color: #004caa;
@@ -571,15 +521,42 @@
a[href]:active {
text-decoration: none;
}
+
+/* Variants */
+
+#set-language a[href]:link, #set-language a[href]:visited,
+ #translations span a[href]:link, #translations span a[href]:visited {
+ color: #004caa;
+}
+#gnu-banner a[href]:link, #gnu-banner a[href]:visited,
+ #gnu-banner a[href]:link strong, #gnu-banner a[href]:visited strong,
+ .switch a[href]:link, .switch a[href]:visited {
+ color: #333;
+}
+#fss-link a[href]:link, #fss-link a[href]:visited,
+ #fss-signup a[href]:link, #fss-signup a[href]:visited {
+ color: #0a8080;
+}
.menu a[href]:link, .menu a[href]:visited,
#navlinks a[href], #navlinks a[href]:visited,
#breadcrumb a[href]:link, #breadcrumb a[href]:visited {
text-decoration: none;
}
-
-#set-language a[href]:link, #set-language a[href]:visited,
- #translations span a[href]:link, #translations span a[href]:visited {
- color: #004caa;
+#fsf-support a[href]:hover, #fsf-support a[href]:visited:hover {
+ color: #333;
+ text-decoration: underline #006400 dotted;
+}
+#fss-link a[href]:hover, #fss-link a[href]:visited:hover {
+ text-decoration: underline #006400 dotted;
+}
+#fss-signup a[href]:hover, #fss-signup a[href]:visited:hover,
+ .switch a[href]:hover, .switch a[href]:visited:hover {
+ color: #777;
+ border-color: #777;
+}
+.switch img:hover {
+ opacity: 0.5;
+ filter: alpha(opacity=70); /* For IE8 and earlier */
}
.menu a[href]:hover, .menu a[href]:visited:hover,
#navlinks a[href]:hover, #navlinks a[href]:visited:hover,
@@ -590,14 +567,3 @@
text-decoration: underline #006400 dotted;
}
-img#language-icon:hover, img#search-icon:hover,
- img#menu-icon:hover, img#sect-menu-icon {
- opacity: 0.7;
- filter: alpha(opacity=70); /* For IE8 and earlier */
-}
-#language-container label span:hover {
- color: #777;
-}
-#fsf-support a:hover {
- text-decoration: underline #006400 dotted;
-}
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.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- nav-bar/test9/edu-software-tuxpaint.html 16 Dec 2019 21:43:35 -0000
1.26
+++ nav-bar/test9/edu-software-tuxpaint.html 20 Dec 2019 17:01:56 -0000
1.27
@@ -37,14 +37,6 @@
<!--#include virtual="/server/staging/banner.html" -->
<div id="main-text" class="article">
-<input type="checkbox" id="sect-menu-button" />
-<label for="sect-menu-button">
- <img id="sect-menu-icon"
- src="/server/staging/layout/sect-menu.png"
- alt="[3-bar section menu icon] "
- title="Education menu" />
-</label>
-
<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> →
@@ -57,7 +49,7 @@
<!--#include virtual="/server/top-addendum.html" -->
<!--#endif -->
<!--#endif -->
-<h2 id="main-heading" class="c">Tux Paint</h2>
+<h2 id="main-heading">Tux Paint</h2>
<h3>Description</h3>
@@ -254,7 +246,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/12/16 21:43:35 $
+$Date: 2019/12/20 17:01:56 $
<!-- timestamp end -->
</p>
</div>
Index: readability/free-sw.html
===================================================================
RCS file: /webcvs/www/www/server/staging/readability/free-sw.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- readability/free-sw.html 16 Dec 2019 21:43:44 -0000 1.21
+++ readability/free-sw.html 20 Dec 2019 17:01:56 -0000 1.22
@@ -18,14 +18,6 @@
<!--#include virtual="/server/staging/banner.html" -->
<div id="main-text" class="article">
-<input type="checkbox" id="sect-menu-button" />
-<label for="sect-menu-button">
- <img id="sect-menu-icon"
- src="/server/staging/layout/sect-menu.png"
- alt="[3-bar section menu icon] "
- title="Philosophy menu" />
-</label>
-
<p id="breadcrumb">
<a href="/philosophy/philosophy.html">Philosophy</a> →
<a href="/philosophy/essays-and-articles.html#content">Essays &
articles</a>
@@ -39,7 +31,7 @@
<!--#include virtual="/server/top-addendum.html" -->
<!--#endif -->
<!--#endif -->
-<h2>What is free software?</h2>
+<h2 id="main-heading">What is free software?</h2>
<div class="comment italic">
<p>
@@ -678,7 +670,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2019/12/16 21:43:44 $
+$Date: 2019/12/20 17:01:56 $
<!-- timestamp end -->
</p>
</div>