www/server/staging/nav-bar/test9 edu-schools4.h...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 14/02/25 18:52:54

Modified files:
        server/staging/nav-bar/test9: edu-schools4.html layout4.css 
Added files:
        server/staging/nav-bar/test9: gnu-logo-square-letters.png 

Log message:
        Another compact logo and FSF goodies in banner.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-schools4.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout4.css?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/gnu-logo-square-letters.png?cvsroot=www&rev=1.1

Patches:
Index: edu-schools4.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-schools4.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edu-schools4.html   23 Feb 2014 19:04:57 -0000      1.3
+++ edu-schools4.html   25 Feb 2014 18:52:53 -0000      1.4
@@ -85,16 +85,18 @@
 
 <div id="gnu-banner">
  <a href="/">
- <img src="gnu-head-in-Gnu.png" alt=" [GNU] " /><p>Operating<br 
/>System</a></p>
+ <img src="gnu-logo-square-letters.png" alt=" [GNU] " /><p>Operating<br 
/>System</a></p>
 </div><!-- /gnu-banner -->
 
-<p id="fsf-support">GNU is supported by the <a 
href="#mission-statement"><strong>Free Software Foundation</strong></a></p>
+<p id="fsf-support">GNU is supported by the <a 
href="#mission-statement"><strong><abbr title="Free Software 
Foundation">FSF</abbr></strong></a></p>
 
 <div id="fssbox">
-<p><strong>Sign up for our monthly email newsletter</strong>
+<p><strong>Sign up for our monthly newsletter</strong>
 <br />(also in Spanish and French),
 <br />the <a href="https://www.fsf.org/free-software-supporter/";>
 <strong>Free Software Supporter</strong></a></p>
+<p><strong>***Â <a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
+JOINÂ THEÂ FSF!</a>Â ***</strong></p>
 </div><!-- /fssbox -->
 
 </div><!-- /header -->
@@ -246,7 +248,7 @@
 <div id="support-fsf">
 <div id="join-fsf">
  <p><a class="button small" 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
- Â Â JOIN THE FSFÂ Â </a></p>
+   JOIN THE FSF!  </a></p>
 </div> <!-- /join-fsf -->
 
 <p>The <strong><a href="http://www.fsf.org";>Free Software
@@ -308,7 +310,7 @@
 
 <p>Updated:
 <!-- timestamp start -->
-$Date: 2014/02/23 19:04:57 $
+$Date: 2014/02/25 18:52:53 $
 <!-- timestamp end -->
 </p>
 

Index: layout4.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout4.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- layout4.css 23 Feb 2014 19:04:57 -0000      1.3
+++ layout4.css 25 Feb 2014 18:52:54 -0000      1.4
@@ -218,7 +218,6 @@
    height: 0px; visibility: hidden; width: 0px;
 }
 #fssbox {
-   clear: right;
    float: right;
    width: auto;
    font-size: .9em;
@@ -226,22 +225,22 @@
    line-height: 1.2em;
    padding: .5em .5em .2em .5em;
    border: 1px dashed #971611;
-   margin: 0 1% .7em 0;
+   margin: .7em 1% .7em 0;
 }
 #fssbox p { margin-top: 0; margin-bottom: .5em; }
 
 #gnu-banner img {
    float: left;
-   height: 6em;
-   margin: .7em .5em .7em 2%;
+   height: 5.5em;
+   margin: .8em .1em .8em 2%;
 }
 #gnu-banner p {
    float: left;
-   font-size: 1.6em;
+   font-size: 1.5em;
    font-family: sans-serif;
    font-weight: bold;
-   line-height: 1.1em;
-   margin: 1.2em 0 .7em 0;
+   line-height: 1em;
+   margin: 2.3em 0 .2em 1%;
 }
 #gnu-banner a {
    color: #334683;
@@ -250,10 +249,10 @@
 }
 
 #fsf-support {
-   float: right;
-   font-size: 1em;
+   float: left;
+   font-size: 1.1em;
    font-style: italic;
-   margin: .5em 1% .7em; 0;
+   margin: .3em 1% 0 1%;
 }
 #fsf-support a, a:visited { color: #971611; }
 #fsf-support a:hover { color: red; }
@@ -305,7 +304,7 @@
 }
 #navigation li a, #navigation li a:visited {
    font-weight: bold;
-   padding: .25em .5em;
+   padding: .2em .5em;
    color: white; text-decoration: none;
 }
 #navigation li.active a {
@@ -378,7 +377,7 @@
 }
 #fsf-links li a, a:visited {
    font-weight: bold;
-   padding: .25em .5em;
+   padding: .2em .5em;
    color: #222; text-decoration: none;
 }
 #fsf-links li a:hover {
@@ -645,7 +644,7 @@
    padding: 0;
 }
 #edu-navigation li a, #edu-navigation li a:visited {
-   padding: .25em .45em;
+   padding: .2em .45em;
    color: #222; text-decoration: none;
 }
 #edu-navigation li.active a {

Index: gnu-logo-square-letters.png
===================================================================
RCS file: gnu-logo-square-letters.png
diff -N gnu-logo-square-letters.png
Binary files /dev/null and /tmp/cvsAlcqjw differ