www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www/server/staging edu-software.html education-...


From: Therese Godefroy
Subject: www/server/staging edu-software.html education-...
Date: Wed, 4 Dec 2019 14:18:01 -0500 (EST)

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 19/12/04 14:18:01

Modified files:
        server/staging : edu-software.html education-menu.html 
                         education.css 
        server/staging/nav-bar/test9: edu-software-tuxpaint.html 

Log message:
        Select current menu item on li instead of a (less translatable strings).
        Links same color as normal text but force sans-serif.
        No colored backgrounds, only shades of gray.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-software.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education-menu.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education.css?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html?cvsroot=www&r1=1.24&r2=1.25

Patches:
Index: edu-software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-software.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edu-software.html   27 Nov 2019 11:16:08 -0000      1.3
+++ edu-software.html   4 Dec 2019 19:17:58 -0000       1.4
@@ -5,15 +5,12 @@
 <link rel="stylesheet" type="text/css" href="education.css" media="screen" />
 <style type="text/css" media="screen">
 <!--
-#navlinks {
-    background: #f3fbea;
-}
 -->
 </style>
 <!--#include virtual="/education/po/edu-software.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
 <!--#include virtual="/server/staging/education-menu.html" -->
-<div class="article">
+<div id="main-text" class="article">
 <p class="edu-breadcrumb">
 <a href="/education/education.html">Education</a> &rarr; 
 <a href="/education/edu-resources.html">Educational Resources</a> &rarr;
@@ -28,7 +25,7 @@
 <h2 id="main-heading">Educational Free Software</h2>
 
 <hr class="thin">
-<p id="start-article"><em>The GNU project maintains a 
+<p><em>The GNU project maintains a 
 <a href="/software/free-software-for-education.html">list of high 
 quality free programs for education at all levels</a> that we 
 recommend.</em></p>
@@ -59,11 +56,13 @@
 
 <!-- begin adding programs in alphabetical order -->
 
+<div class="menu">
 <p>
-<a href="/education/edu-software-gcompris.html">GCompris</a> | 
-<a href="/education/edu-software-gimp.html">GIMP</a> |
-<a href="/education/edu-software-tuxpaint.html">Tux Paint</a> 
+&nbsp;<a href="/education/edu-software-gcompris.html">GCompris</a>&nbsp;
+&nbsp;<a href="/education/edu-software-gimp.html">GIMP</a>&nbsp;
+&nbsp;<a href="/education/edu-software-tuxpaint.html">Tux Paint</a>&nbsp;
 </p>
+</div>
 
 <!-- end adding programs -->
 
@@ -142,7 +141,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/11/27 11:16:08 $
+$Date: 2019/12/04 19:17:58 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/education-menu.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- education-menu.html 27 Nov 2019 11:16:08 -0000      1.2
+++ education-menu.html 4 Dec 2019 19:17:58 -0000       1.3
@@ -1,128 +1,143 @@
 <div id="navlinks">            
-<p style="display: none"><a href="#start-article">Skip directory 
contents</a></p>
+<p style="display: none"><a href="#main-text">Skip directory contents</a></p>
 <h3>Education</h3>
 <ul>
-  <li><!--#if expr="$REQUEST_URI = /\/edu-contents/" -->
+  <!--#if expr="$REQUEST_URI = /\/edu-contents/" --><li class="current">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a class="active navbar" 
href="/education/edu-contents.html#main-heading">Contents</a>
+    <a href="/education/edu-contents.html#content"><b>Contents</b></a>
     <span class="gnun-split"></span>
-    <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-    <a class="navbar" 
href="/education/edu-contents.html#main-heading">Contents</a><!--#endif -->
-  </li>
-  <li><!--#if expr="$REQUEST_URI = /\/edu-cases/" -->
-    <!--#echo encoding="none" var="MARK_START" -->
-    <a class="active navbar" 
href="/education/edu-cases.html#main-heading">Case studies</a>
-    <span class="gnun-split"></span>
-    <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-    <a class="navbar" href="/education/edu-cases.html#main-heading">Case 
studies</a><!--#endif -->
-    <ul>
-      <li><!--#if expr="$REQUEST_URI = /\/edu-cases-argentina/" -->
-        <!--#echo encoding="none" var="MARK_START" -->
-        <a 
href="/education/edu-cases-argentina.html#main-heading">Argentina</a>
-        <span class="gnun-split"></span>
-        <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-        <a 
href="/education/edu-cases-argentina.html#main-heading">Argentina</a><!--#endif 
-->
-        <ul>
-          <li><!--#if expr="$REQUEST_URI = /\/edu-cases-argentina-ecen[.]/" -->
-            <!--#echo encoding="none" var="MARK_START" -->
-            <a class="active" 
href="/education/edu-cases-argentina-ecen.html#main-heading">ECEN</a>
-            <span class="gnun-split"></span>
-            <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-            <a 
href="/education/edu-cases-argentina-ecen.html#main-heading">ECEN</a><!--#endif 
-->
-          </li>
+    <!--#echo encoding="none" var="MARK_END" -->
+  <!--#else --><li>
+    <a href="/education/edu-contents.html#content"><b>Contents</b></a>
+  <!--#endif --></li>
+  <!--#if expr="$REQUEST_URI = /\/edu-cases/" --><li class="current">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/education/edu-cases.html#content"><b>Case studies</b></a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  <!--#else --><li>
+    <a href="/education/edu-cases.html#content"><b>Case studies</b></a>
+  <!--#endif -->
+    <ul class="no-display">
+      <!--#if expr="$REQUEST_URI = /-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 class="no-display">
+          <!--#if expr="$REQUEST_URI = /-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>
         </ul>
       </li>
-      <li><!--#if expr="$REQUEST_URI = /\/edu-cases-india/" -->
+      <!--#if expr="$REQUEST_URI = /-india/" --><li class="current">
         <!--#echo encoding="none" var="MARK_START" -->
-        <a class="active" 
href="/education/edu-cases-india.html#main-heading">India</a>
+        <a href="/education/edu-cases-india.html#content">India</a>
         <span class="gnun-split"></span>
-        <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-        <a 
href="/education/edu-cases-india.html#main-heading">India</a><!--#endif -->
-        <ul>
-          <li><!--#if expr="$REQUEST_URI = /\/edu-cases-india-ambedkar/" -->
-            <!--#echo encoding="none" var="MARK_START" -->
-            <a class="active" 
href="/education/edu-cases-india-ambedkar.html#main-heading">Ambedkar</a>
-            <span class="gnun-split"></span>
-            <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-            <a 
href="/education/edu-cases-india-ambedkar.html#main-heading">Ambedkar</a><!--#endif
 -->
-          </li>
-          <li><!--#if expr="$REQUEST_URI = /\/edu-cases-india-irimpanam/" -->
-            <!--#echo encoding="none" var="MARK_START" -->
-            <a class="active" 
href="/education/edu-cases-india-irimpanam.html#main-heading">Irimpanam</a>
-            <span class="gnun-split"></span>
-            <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-            <a 
href="/education/edu-cases-india-irimpanam.html#main-heading">Irimpanam</a><!--#endif
 -->
-          </li>
+        <!--#echo encoding="none" var="MARK_END" -->
+      <!--#else --><li>
+        <a href="/education/edu-cases-india.html#content">India</a>
+      <!--#endif -->
+        <ul class="no-display">
+          <!--#if expr="$REQUEST_URI = /-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 = /-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>
         </ul>
       </li>
     </ul>
   </li>
-  <li><!--#if expr="$REQUEST_URI = /\/edu-.*(-resources|projects)/" -->
+  <!--#if expr="$REQUEST_URI = /\/edu-.*(-resources|projects)/" --><li 
class="current">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a class="active navbar" 
href="/education/edu-resources.html#main-heading">Resources</a>
+    <a href="/education/edu-resources.html#content"><b>Resources</b></a>
     <span class="gnun-split"></span>
-    <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-    <a class="navbar" 
href="/education/edu-resources.html#main-heading">Resources</a><!--#endif -->
+    <!--#echo encoding="none" var="MARK_END" -->
+  <!--#else --><li>
+    <a href="/education/edu-resources.html#content"><b>Resources</b></a>
+  <!--#endif -->
     <ul>
-      <li><!--#if expr="$REQUEST_URI = /\/edu-software/" -->
+      <!--#if expr="$REQUEST_URI = /\/edu-software/" --><li class="current">
         <!--#echo encoding="none" var="MARK_START" -->
-        <a class="active navbar" 
href="/education/edu-software.html#main-heading">Software</a>
+        <a href="/education/edu-software.html#content"><b>Software</b></a>
         <span class="gnun-split"></span>
-        <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-        <a class="navbar" 
href="/education/edu-software.html#main-heading">Software</a><!--#endif -->
-        <ul>
-          <li><!--#if expr="$REQUEST_URI = /\/edu-software-gcompris[.]/" -->
-            <!--#echo encoding="none" var="MARK_START" -->
-            <a class="active" 
href="/education/edu-software-gcompris.html#main-heading">Gcompris</a>
-            <span class="gnun-split"></span>
-            <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-            <a 
href="/education/edu-software-gcompris.html#main-heading">Gcompris</a><!--#endif
 -->
-          </li>
-          <li><!--#if expr="$REQUEST_URI = /\/edu-software-gimp[.]/" -->
-            <!--#echo encoding="none" var="MARK_START" -->
-            <a class="active" 
href="/education/edu-edu-software-gimp.html#main-heading">Gimp</a>
-            <span class="gnun-split"></span>
-            <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-            <a 
href="/education/edu-software-gimp.html#main-heading">Gimp</a><!--#endif -->
-          </li>
-          <li><!--#if expr="$REQUEST_URI = /\/edu-software-tuxpaint[.]/" -->
-            <!--#echo encoding="none" var="MARK_START" -->
-            <a class="active" 
href="/education/edu-edu-software-tuxpaint.html#main-heading">Tuxpaint</a>
-            <span class="gnun-split"></span>
-            <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-            <a 
href="/education/edu-software-tuxpaint.html#main-heading">Tuxpaint</a><!--#endif
 -->
-          </li>
+        <!--#echo encoding="none" var="MARK_END" -->
+      <!--#else --><li>
+        <a href="/education/edu-software.html#content"><b>Software</b></a>
+      <!--#endif -->
+        <ul class="no-display">
+          <!--#if expr="$REQUEST_URI = /-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 = /-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 = /-tuxpaint/" --><li class="current">
+            <!--#echo encoding="none" var="MARK_START" -->
+            <a 
href="/education/edu-software-tuxpaint.html#content">Tuxpaint</a>
+            <span class="gnun-split"></span><!--#echo encoding="none" 
var="MARK_END" -->
+          <!--#else --><li>
+            <a 
href="/education/edu-software-tuxpaint.html#content">Tuxpaint</a>
+          <!--#endif --></li>
         </ul>
       </li>
-      <li><!--#if expr="$REQUEST_URI = /\/edu-projects/" -->
+      <!--#if expr="$REQUEST_URI = /\/edu-projects/" --><li class="current 
no-display">
         <!--#echo encoding="none" var="MARK_START" -->
-        <a class="active" 
href="/education/edu-projects.html#main-heading">Groups &amp; projects</a>
+        <a href="/education/edu-projects.html#content">Groups &amp; 
projects</a>
         <span class="gnun-split"></span>
-        <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-        <a href="/education/edu-projects.html#main-heading">Groups &amp; 
projects</a><!--#endif -->
-      </li>
-      <li><!--#if expr="$REQUEST_URI = /\/edu-free-learning-resources.html/" 
-->
-        <!--#echo encoding="none" var="MARK_START" -->
-        <a class="active" 
href="/education/edu-free-learning-resources.html#main-heading">Free 
learning</a>
-        <span class="gnun-split"></span>
-        <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-        <a 
href="/education/edu-free-learning-resources.html#main-heading">Free 
learning</a><!--#endif -->
-      </li>
+        <!--#echo encoding="none" var="MARK_END" -->
+      <!--#else --><li class="no-display">
+        <a href="/education/edu-projects.html#content">Groups &amp; 
projects</a>
+      <!--#endif --></li>
+      <!--#if expr="$REQUEST_URI = /-free-learning/" --><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>
+        <!--#echo encoding="none" var="MARK_END" -->
+      <!--#else --><li class="no-display">
+        <a href="/education/edu-free-learning-resources.html#content">Free 
learning</a>
+      <!--#endif --></li>
     </ul>
   </li>
-  <li><!--#if expr="$REQUEST_URI = /\/edu-faq/" -->
+  <!--#if expr="$REQUEST_URI = /\/edu-faq/" --><li class="current">
     <!--#echo encoding="none" var="MARK_START" -->
-    <a class="active navbar" 
href="/education/edu-faq.html#main-heading">FAQ</a>
+    <a href="/education/edu-faq.html#content"><b>FAQ</b></a>
     <span class="gnun-split"></span>
-    <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-    <a class="navbar" 
href="/education/edu-faq.html#main-heading">FAQ</a><!--#endif -->
-  </li>
-  <li><!--#if expr="$REQUEST_URI = /\/edu-team/" -->
-    <!--#echo encoding="none" var="MARK_START" -->
-    <a class="active navbar" href="/education/edu-team.html#main-heading">Our 
team</a>
-    <span class="gnun-split"></span>
-    <!--#echo encoding="none" var="MARK_END" --><!--#else -->
-    <a class="navbar" href="/education/edu-team.html#main-heading">Our 
team</a><!--#endif -->
-  </li>
+    <!--#echo encoding="none" var="MARK_END" -->
+  <!--#else --><li>
+    <a href="/education/edu-faq.html#content"><b>FAQ</b></a>
+  <!--#endif --></li>
+  <!--#if expr="$REQUEST_URI = /\/edu-team/" --><li class="current">
+    <!--#echo encoding="none" var="MARK_START" -->
+    <a href="/education/edu-team.html#content"><b>Our team</b></a>
+    <span class="gnun-split"></span>
+    <!--#echo encoding="none" var="MARK_END" -->
+  <!--#else --><li>
+    <a href="/education/edu-team.html#content"><b>Our team</b></a>
+  <!--#endif --></li>
 </ul>
 </div>

Index: education.css
===================================================================
RCS file: /webcvs/www/www/server/staging/education.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- education.css       27 Nov 2019 20:03:08 -0000      1.3
+++ education.css       4 Dec 2019 19:17:58 -0000       1.4
@@ -7,9 +7,10 @@
 body {
     border-top: .2em solid #a42e2b;
 }
-a[href]:visited {
-    color: #004caa;
+#content {
+    margin-bottom: 3em;
 }
+
 .italic {
    font-style: italic;
 }
@@ -44,10 +45,10 @@
 }
 
 #searcher, #header {
-    background: #f9ffff;
+    background: white;
 }
 #translations {
-    background: white;
+    background: #f7f7f7;
     border-top: .1em solid #ddd;
     border-bottom: .2em solid #ddd;
 }
@@ -57,13 +58,18 @@
     font-weight: normal;
     padding-top: .6em;
 }
-a[href], a[href]:visited {
-   color: #004caa;
+a[href]:link, a[href]:visited {
+    color: #222;
+    font-family: "sans-serif", sans-serif;
 }
-a[href]:active, a[href]:hover {
-   color: #777;
+a[href]:link:hover, a[href]:visited:hover {
+   color: #5f7000;
    text-decoration: none;
 }
+.edu-breadcrumb a {
+   text-decoration: underline;
+}
+
 
 /*** From graphics.css ***/
 
@@ -98,58 +104,57 @@
 }
 #navlinks {
     font-size: .9em;
-    border-bottom: .1em solid #ddd;
+    line-height: 2em;
     padding: 0 2.5%;
+    background: #f7f7f7;
+    border-bottom: .1em solid #ddd;
     margin: 0 -3.2%;
 }
-#navlinks h3, #navlinks h4, #navlinks a {
-    display: none;
-}
 #navlinks ul {
     display: inline;
+    line-height: 2em;
     padding: 0;
     margin: 0;
 }
-#navlinks a.navbar {
+#navlinks li {
     display: inline-block;
-    font-weight: bold;
+    line-height: 2em;
+    font-family: "sans-serif", sans-serif;
+    list-style: none;
+    padding: 0;
+    margin: 0;
 }
 #navlinks a {
-    white-space: nowrap;
-    padding: .1em .4em;
-    margin: .1em .2em .1em 0;
+    display: inline-block;
+    line-height: 2em;
+    padding: 0 .4em;
+    margin: .1em;
+}
+#navlinks h3, #navlinks ul.no-display, #navlinks li.no-display {
+    display: none;
 }
 
-#TOC {
-    font-size: .9em;
+.menu {
     text-align: center;
-    padding: .2em 3% 1.2em;
+    padding: 0 3%;
     margin: 1em auto;
 }
-#TOC h3 {
-    display: none;
-}
-#TOC h4 {
-    font-size: 1em;
-    margin: 1em 0 .2em;
-}
-#TOC ul, #TOC ul li, #navlinks ul li {
-    display: inline;
-    padding: 0;
-    margin: 0;
-}
-#TOC a {
+.menu a {
     display: inline-block;
-    white-space: nowrap;
-    padding: .1em .4em;
-    border: 1px solid #ddd;
+    padding: .3em .5em;
+    background: #f3f3f3;
+    border: .1em solid #ccc;
     margin: .3em;
 }
 
 @media (min-width: 57em) {
-    .article, .translators-notes {
+    #main-text, #main-text ~ .translators-notes {
         margin-left: 11.1rem;
     }
+   #navlinks h3, #navlinks ul, #navlinks li,
+   #navlinks a, #navlinks ul.no-display, #navlinks li.no-display {
+        display: block;
+   }
     #navlinks {
         position: absolute;
         top: 0; left: 0;
@@ -159,18 +164,15 @@
         padding: 0 0 1.5em;
         border: none;
         border-right: .1em solid #ddd;
-        padding-bottom: 2.5rem;
+        padding-bottom: 3rem;
         margin: 0;
     }
     #navlinks h3 {
         font-size: 1.1em;
         text-align: center;
-        padding: 1em .5em 0;
-        margin-top: 0;
-    }
-    #navlinks h4 {
-        font-size: 1em;
-        margin: .5em 1em .2em;
+        padding: .3em 0;
+        background: #eee;
+        margin: .8em;
     }
     #navlinks ul, #navlinks ul li {
         line-height: 1.2em;
@@ -178,20 +180,18 @@
         margin: 0;
         list-style: none;
     }
-    #navlinks h3, #navlinks h4, #navlinks ul, #navlinks ul li,
+    #navlinks h3, #navlinks ul, #navlinks li,
     #navlinks a, #navlinks a.navbar {
         display: block;
     }
     #navlinks a {
-        white-space: normal;
-        padding: .15em .5em 0 1.5em;
-        margin: .3em 0;
+        padding: 0 .5em 0 1em;
     }
     #navlinks li li a {
-        padding-left: 3em;
+        padding-left: 2.5em;
     }
     #navlinks li li li a {
-        padding-left: 4.5em;
+        padding-left: 4.0em;
     }
 }
 
@@ -199,8 +199,7 @@
     #navlinks {
         width: 12rem;
     }
-    .article, .translators-notes {
-        padding: 0 2%;
+    #main-text, #main-text ~ .translators-notes {
         margin-left: 12.1rem;
     }
 }
@@ -222,17 +221,14 @@
 }
 
 /* Links */
-
-#TOC a , #navlinks a {
+.menu a, #navlinks a {
     text-decoration: none;
 }
-.edu-breadcrumb a:hover, #navlinks a:hover, #navlinks a:hover {
-    text-decoration: underline;
-}
-#navlinks a.active, #navlinks a.active:visited {
-    color: black;
+li.current {
     font-style: italic;
+    background: #eee;
 }
-#navlinks a.active:hover {
-    text-decoration: none;
+li.current ul {
+    font-style: normal;
+    background: #f7f7f7;
 }

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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- nav-bar/test9/edu-software-tuxpaint.html    27 Nov 2019 11:26:06 -0000      
1.24
+++ nav-bar/test9/edu-software-tuxpaint.html    4 Dec 2019 19:17:59 -0000       
1.25
@@ -5,19 +5,15 @@
 - GNU Project - Free Software Foundation</title>
 <link rel="stylesheet" type="text/css" href="/server/staging/education.css" 
media="screen" />
 <style type="text/css" media="screen,print">
-<!--
-#navlinks {
-   background: #f3fbea;
-}
 .pict {
-   width: 24em;
+   width: 27em;
    border: .2em solid #bbb;
    margin: 2em auto;
 }
 .stamp {
    display: inline-block;
    vertical-align: top;
-   width: 10.8em;
+   width: 12.3em;
    padding: 0 .5em 1em;
 }
 .stamp img, #content .stamp p {
@@ -31,7 +27,7 @@
 }
 @media (max-width: 35em) {
    #flowers {
-      width: 11.8em;
+      width: 13.3em;
    }
 }
 -->
@@ -39,7 +35,7 @@
 <!--#include virtual="/education/po/edu-software-tuxpaint.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
 <!--#include virtual="/server/staging/education-menu.html" -->
-<div class="article">
+<div id="main-text" class="article">
 <p class="edu-breadcrumb"><a href="/education/education.html">Education</a> 
&rarr; 
 <a href="/education/edu-resources.html">Educational Resources</a> &rarr; 
 <a href="/education/edu-software.html">Educational Free Software</a> &rarr;
@@ -55,7 +51,7 @@
 
 <h3>Description</h3>
 
-<div class="announcement italic">
+<div class="comment">
 <p>Tux Paint is a cross-platform drawing program created specifically 
 for children. Little kids as young as 3 years old have no difficulty in 
 finding their way around its clear and intuitive interface which 
@@ -249,7 +245,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2019/11/27 11:26:06 $
+$Date: 2019/12/04 19:17:59 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]