www/server/staging/nav-bar/test9 layout7.css ed...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 14/04/22 09:57:16

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

Log message:
        Clean up layout7.css (Ineiev) and move .stamp definitions to 
edu-software-tuxpaint.html.

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

Patches:
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- layout7.css 21 Apr 2014 13:29:43 -0000      1.31
+++ layout7.css 22 Apr 2014 09:57:15 -0000      1.32
@@ -91,7 +91,6 @@
 Blue from GNU banner
    #334683      white           8.96          494
    #334683      #fff898         8.16          384
-   #334683      #fff570         7.91          379
    #334683      #e7e9eb         7.36          428
    #334683      #777            2.0           110
    #334683      #555            1.20           76
@@ -188,8 +187,6 @@
 .underline { text-decoration: underline; }
 .nounderline { text-decoration: none; }
 
-.noitalic { font-style: normal; }
-
 .imgright { float: right; margin: 1em; margin-right: 0; }
 .imgleft { float: left; margin: 1em; margin-left: 0; }
 
@@ -428,7 +425,7 @@
 }
 #navigation li a, #navigation li a:visited {
    font-weight: bold;
-   padding: .35em .5em;
+   padding: .25em .5em;
    color: white; text-decoration: none;
 }
 #navigation li.active a {
@@ -436,8 +433,8 @@
    background-color: white;
 }
 #navigation li a:hover {
-   color: white;
-   background-color: #400;
+   color: black;
+   background-color: #fff898;
 }
 
 
@@ -452,7 +449,7 @@
    padding: 0; margin: .7em 0 .9em 0;
    color: #334683; text-shadow: #999 1px 1px 0;
 }
-#content h1 { font-size: 2.2em; }
+#content h1 { font-size: 2.4em; }
 #content h2 { font-size: 2em; }
 
 #content h3, #content h4, #content h5, #content h6, #content p {
@@ -472,12 +469,6 @@
 #content li, #fsf-campaigns li, #content dd, #content p, #content pre,
    #content dt, #content code, #content address { line-height: 1.3em; }
 
-
-#content h2 a, #content h2 a:visited, #content h2 span {
-   font-size: .9em;
-   text-shadow: none;
-}
-
 #content h3 a[href]:visited, #content h4 a[href]:visited { color: #334683; }
 #content h3 a[href]:hover, #content h4 a[href]:hover { color: #777; }
 
@@ -520,12 +511,12 @@
 }
 #fsf-links li a, #fsf-links li a:visited {
    font-weight: bold;
-   padding: .25em .45em;
+   padding: .25em .5em;
    color: #222; text-decoration: none;
 }
 #fsf-links li a:hover {
-   color: white;
-   background-color: #171d33;
+   color: black;
+   background-color: #fff898;
 }
 
 
@@ -777,34 +768,32 @@
 
 /* definitions for /education-specific navigation bar
    and breadcrumbs for education */
-#content #edu-navigation {
+#edu-navigation {
    clear: both;
-   padding: .1em 0;
-   background-color: red;
+   background-color: #d1d4d7;
 }
-#content ul#edu-navigation {
+ul#edu-navigation {
    text-align: center;
    font-size: .9em; font-weight: bold;
+   line-height: 1.8em;
    margin: 0 -1.6%;
-   background-color: #d1d4d7;
 }
-#content #edu-navigation li {
+#edu-navigation li {
    display: inline; white-space: nowrap;
-   line-height: 1.7em;
    list-style-type: none;
    padding: 0;
 }
-#content #edu-navigation li a, #edu-navigation li a:visited {
-   padding: .1em .45em;
+#edu-navigation li a, #edu-navigation li a:visited {
+   padding: .2em .45em;
    color: #222; text-decoration: none;
 }
-#content #edu-navigation li.active a {
+#edu-navigation li.active a {
    background-color: white;
 }
-#content #edu-navigation li a:hover,
-#content #edu-navigation li.active a:hover {
-   color: white;
-   background-color: #171d33;
+#edu-navigation li a:hover,
+#edu-navigation li.active a:hover {
+   color: black;
+   background-color: #fff898;
 }
 
 #content .edu-breadcrumb {
@@ -835,7 +824,7 @@
 /* make h3 for edu-cases look like h4 for other pages */
 #content div.edu-cases h3 {
    font-size: 1.3em;
-   margin: 0;
+   margin: 0; margin-bottom: 1em;
 }
 div.edu-cases ul, div.edu-cases ol {
    padding-left: 3em;
@@ -848,17 +837,11 @@
    width: 27.5em; max-width: 100%;
    margin: .3em 0 1em 0;
 }
-#content .stamp {
-   float: right;
-   width: 17em; max-width: 100%;
-   margin: .3em 0 1em 0;
-}
 #content .lower {
    margin-top: 1.3em;
 }
 
-#content .photo img, #content .photo p,
- #content .stamp img, #content .stamp p {
+#content .photo img, #content .photo p, {
    width: 94%;
    padding: 0 6%;
 }
@@ -1046,16 +1029,3 @@
 .pad td { padding-left: 1em; padding-right: 1em; }
 div.spacer { height: .1em; width: 100%; background-color: transparent; }
 
-
-/*** OTHER CLASSES FOUND IN SOME PAGES ***/
-/* 
-licenses/quick-guide-gplv3:
-   .section .simple .align-center .reference .external
-music/music.html:
-   .image .scaled
-server/standards/README.translations.html
-   .section
-fry/happy-birthday-to-gnu.html
-   .visualClear
-*/
-

Index: edu-software-tuxpaint.html
===================================================================
RCS file: 
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edu-software-tuxpaint.html  21 Apr 2014 13:53:57 -0000      1.3
+++ edu-software-tuxpaint.html  22 Apr 2014 09:57:15 -0000      1.4
@@ -6,27 +6,21 @@
 - GNU Project - Free Software Foundation</title>
 
 <!--#include virtual="/education/po/edu-software-tuxpaint.translist" -->
-<!-- start of server/banner.html -->
-<!-- start of head-include-2.html -->
+<style type="text/css" media="screen,print">
+<!--
+#content .stamp {
+   float: right;
+   width: 17em; max-width: 100%;
+   margin: .3em 0 1em 0;
+}
+#content .stamp img, #content .stamp p {
+   width: 94%;
+   padding: 0 6%;
+}
+-->
+</style>
+<!--#include virtual="/server/banner.html" -->
 
-<link rel="stylesheet" href="combo.css" media="screen" />
-<link rel="stylesheet" href="layout7.css" media="screen" />
-
-<link rel="stylesheet" href="/mini.css" media="handheld" />
-
-<link rel="stylesheet" href="/print.css" media="print" />
-
-<!-- end of head-include-2.html --></head>
-<body>
-<div  class="inner">
-
-<!--#include virtual="/server/body-include-1.html" -->
-
-<!--#include virtual="/server/body-include-2.html" -->
-
-<div id="content">
-
-<!-- end of server/banner.html -->
 <div id="education-content">
 
 <!-- begin edu navigation bar -->
@@ -135,7 +129,7 @@
 <blockquote class="stamp">
 
 <a href="/education/misc/appooppanthaady.jpg">
-<img src="appooppanthaady-med.jpg"
+<img src="/education/misc/appooppanthaady-med.jpg"
 alt="Image of the Appooppan Thaady flower." /></a>
 
 <p class="c"><a href="/education/misc/appooppanthady.ogg">Listen</a> to a 
student 
@@ -145,7 +139,7 @@
 <blockquote class="stamp">
 
 <a href="/education/misc/anthoorium.jpg">
-<img src="anthoorium-med.jpg"
+<img src="/education/misc/anthoorium-med.jpg"
 alt="Image of the Anthoorium flower." /></a>
 
 <p class="c"><a href="/education/misc/anthoorium.ogg">Listen</a> to a student 
@@ -254,7 +248,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/21 13:53:57 $
+$Date: 2014/04/22 09:57:15 $
 <!-- timestamp end -->
 </p>
 </div>