www/server/staging/layout body-include-2.html e...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 19/01/04 10:28:23

Modified files:
        server/staging/layout: body-include-2.html encyclopedia.html 
                               footer-text.html layout.css 

Log message:
        Restyle navbars; suppress #backtotop and #more-links on wide screens, 
etc.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout/body-include-2.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout/encyclopedia.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout/footer-text.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout/layout.css?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/layout/body-include-2.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- body-include-2.html 30 Dec 2018 11:26:36 -0000      1.5
+++ body-include-2.html 4 Jan 2019 15:28:23 -0000       1.6
@@ -105,8 +105,9 @@
 <!--#else -->
   <li id="tabHelp"><a href="/help/help.html">HELP&nbsp;GNU</a></li>
 <!--#endif -->
-  <li><a href="#fsf-links"">More&hellip;</a></li>
+  <li id="more-links"><a href="#fsf-links">More &#9660;</a></li>
  </ul>
+ <div style="clear:both"></div>
 </div><!--  /navigation -->
 <!-- end of server/body-include-2 -->
 

Index: encyclopedia.html
===================================================================
RCS file: /webcvs/www/www/server/staging/layout/encyclopedia.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- encyclopedia.html   28 Dec 2018 12:56:18 -0000      1.4
+++ encyclopedia.html   4 Jan 2019 15:28:23 -0000       1.5
@@ -2,6 +2,11 @@
 <!-- Parent-Version: 1.77 -->
 <title>The Free Encyclopedia Project
 - GNU Project - Free Software Foundation</title>
+<style type="text/css" media="print,screen"><!--
address@hidden (min-width: 25em) {
+   #more-links, #backtotop { display: none; }
+}
+--></style>
 <!--#include virtual="/encyclopedia/po/encyclopedia.translist" -->
 <!--#include virtual="/server/staging/layout/banner.html" -->
 <h2>The Free Encyclopedia Project</h2>
@@ -76,7 +81,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2018/12/28 12:56:18 $
+$Date: 2019/01/04 15:28:23 $
 <!-- timestamp end -->
 </p>
 </div>

Index: footer-text.html
===================================================================
RCS file: /webcvs/www/www/server/staging/layout/footer-text.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- footer-text.html    30 Dec 2018 11:26:36 -0000      1.5
+++ footer-text.html    4 Jan 2019 15:28:23 -0000       1.6
@@ -1,6 +1,6 @@
 <!-- begin server/footer-text.html -->
 <div style="clear:both"></div>
-<p id="backtotop"><a href="#navigation">BACK TO TOP</a></p>
+<div id="backtotop"><a href="#navigation">TOP <span>&#9650;</span></a></div>
 
 <hr class="no-display" />
 <div id="fsf-links">
@@ -8,8 +8,8 @@
   <li><a href="/proprietary/proprietary.html">MALWARE</a></li>
   <li><a href="/graphics/graphics.html">GNU&nbsp;ART</a></li>
   <li><a href="/people/people.html">GNU'S&nbsp;WHO?</a></li>
-  <li><a href="/server/sitemap.html">SITEMAP</a> &nbsp; &nbsp;</li>
-  <li><a href="//directory.fsf.org">FS&nbsp;DIR.</a></li>
+  <li class="separator"><a href="/server/sitemap.html">SITEMAP</a></li>
+  <li><a href="//directory.fsf.org">FREE&nbsp;SOFTW.&nbsp;DIR.</a></li>
   <li><a href="https://h-node.org/";>HARDWARE</a></li>
  </ul>
 </div><!-- /fsf-links -->

Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/layout/layout.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- layout.css  28 Dec 2018 13:24:22 -0000      1.6
+++ layout.css  4 Jan 2019 15:28:23 -0000       1.7
@@ -180,7 +180,7 @@
  #mission-statement, #footer {
    padding-left: 3%; padding-right: 3%;
 }
-#content ul#edu-navigation {
+#education-content {
    margin-left: -3.2%; margin-right: -3.2%;
 }
 
@@ -191,7 +191,7 @@
 }
 #translations, #footer { background-color: #f5f5f5; }
 
-#edu-navigation { background-color: #eee; }
+#education-content { background-color: #eee; }
 
 #navigation { background-color: #a42e2b; }
 
@@ -402,34 +402,14 @@
 
 /*** RETURN LINKS ***/
 
-.back, #backtotop {
+.back {
    text-align: right;
    line-height: 1.5em;
    font-weight: bold;
+   margin: 1.5em 2%;
 }
-.back { margin: 1.5em 2%; }
-
-.back a, .back a:visited,
- #backtotop a, #backtotop a:visited {
-   display: inline-block;
-   line-height: 1.5em;
-   padding: .1em 1em;
-   color: #444;
-}
-.back a:hover,
- #backtotop a:hover { color: #777; }
-
-#backtotop {
-   clear: both;
-   float: right;
-   font-family: "sans-serif", sans-serif;
-   font-size: .9em;
-   background: white;
-   margin: .35em 1em 0;
-}
-#backtotop a[href] {
-   text-decoration: none;
-}
+.back a { color: #333; }
+.back a:hover { color: #777; }
 
 
 /*** BIG SECTION HEADERS ***/
@@ -952,63 +932,85 @@
 
 /*** NAVIGATION BARS ***/
 
-#navigation { clear: both; }
-
+#navigation ul, #education-content ul, #fsf-links ul, #backtotop {
+   font-size: .9em;
+   font-family: "sans-serif", sans-serif;
+   font-weight: bold;
+}
 /* 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;
+#navigation ul, #education-content ul, #fsf-links ul {
    line-height: 1.7em;
-   padding: .15em 0;
-   margin-top: 0; margin-bottom: 0;
+   margin: 0 1.5%;
+   border-top: .2em solid transparent;
 }
-ul#edu-navigation {
-   padding: .15em 1.5%;
+#navigation li, #education-content li, #fsf-links li {
+   list-style-type: none;
+   line-height: 1.5em;
+   margin: .1em .5em .2em;
+/* Mock border to avoid size change when a link becomes active. */
+   border-bottom: .15em solid transparent;
+}
+#navigation li, #education-content li {
+   float: left;
 }
-#navigation li, ul#edu-navigation li, #fsf-links li {
+#navigation li#more-links, #backtotop {
+   float:right;
+}
+#fsf-links li {
    white-space: nowrap;
    display: inline;
    display: inline-block;
-   line-height: 1.5em;
-   font-family: "sans-serif", sans-serif;
-   font-weight: bold;
    padding-top: .1em;
-   margin: .1em .4em;
 }
+#fsf-links li.separator { margin-right: 1.5em; }
 
-/* Mock border to avoid size change when a link becomes active */
-#navigation li { border-bottom: .15em solid #a42e2b; }
-ul#edu-navigation li { border-bottom: .15em solid #eee; }
-#fsf-links li { padding-bottom: .15em; }
+#backtotop {
+   line-height: 1.5em;
+   /* For NetSurf 1.2, and maybe a few other browsers. */
+   margin: .35em .5em 0;
+}
+/* For standard browsers. */
address@hidden (min-width: 0) {
+   #backtotop { margin-right: 1.5%; }
+}
+#backtotop span {
+   position: relative;
+   bottom: .1em;
+}
 
- /* For Firefox (can't set line-height when "a" is displayed inline) */
-#navigation a, ul#edu-navigation a, #fsf-links a {
+/* For Firefox (can't set line-height when "a" is displayed inline) */
+#navigation a, #education-content a, #fsf-links a, #backtotop a {
    display: inline-block;
-   padding-top: .1em;
 }
-
-#navigation, #navigation a, #navigation a:visited { color: white; }
-#edu-navigation, #edu-navigation a, ul#edu-navigation a:visited,
- #fsf-links a, #fsf-links li a:visited { color: #222; }
+#backtotop a {
+   padding: 0 .5em;
+   background: white;
+}  
+#navigation a { color: white; }
+#education-content a, #fsf-links a { color: #222; }
+#backtotop a { color: #444; }
+#backtotop a:hover { color: #777; }
 
 #navigation li.active {
    font-style: italic;
-   border-bottom: .15em solid white;
+   border-color: white;
 }
 ul#edu-navigation li.active,
  ul#edu-navigation li.current {
    font-style: italic;
-   border-bottom: .15em solid #a42e2b;
+   border-color: #a42e2b;
 }
-#navigation li a, ul#edu-navigation li a, #fsf-links li a,
- #navigation li.active a:hover,
- ul#edu-navigation li.active a:hover {
+#navigation li a, #education-content li a, #fsf-links li a,
+ #navigation li.active a:hover, #backtotop a,
+ #education-content li.active a:hover {
    text-decoration: none;
 }
-#navigation a:hover, ul#edu-navigation a:hover,
- #fsf-links a:hover { text-decoration: underline; }
+#navigation a:hover, #education-content a:hover,
+ #fsf-links a:hover {
+   text-decoration: underline;
+}
 
-#fsf-links span { margin-left: 1em; }
 
 /*** CONTENT ***/