www/server/staging education-menu.html educatio...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 20/03/30 08:57:38

Modified files:
        server/staging : education-menu.html education.css layout.css 
        server/staging/nav-bar/test9: footer-text.html 
                                      philosophy-menu.html 

Log message:
        Minor adjustments: margins/padding, .backtotop definitions.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education-menu.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education.css?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout.css?cvsroot=www&r1=1.40&r2=1.41
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/footer-text.html?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/philosophy-menu.html?cvsroot=www&r1=1.15&r2=1.16

Patches:
Index: education-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/education-menu.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- education-menu.html 5 Mar 2020 16:45:58 -0000       1.16
+++ education-menu.html 30 Mar 2020 12:57:37 -0000      1.17
@@ -1,8 +1,8 @@
-<hr class="no-display" />
-<div id="back-to-main" class="backtotop">
- <a href="#main-heading"><span>BACK TO MAIN HEADING </span>&#9650;</a>
-</div>
 <div id="navlinks">
+ <div class="backtotop">
+  <hr class="no-display" />
+  <a href="#main-heading"><span>MAIN HEADING </span>&#9650;</a>
+ </div>
  <h3>Education menu</h3>
  <dl>
   <!--#if expr="$REQUEST_URI = /\/education.html/" --><dt class="current">

Index: education.css
===================================================================
RCS file: /webcvs/www/www/server/staging/education.css,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- education.css       2 Mar 2020 16:45:29 -0000       1.33
+++ education.css       30 Mar 2020 12:57:37 -0000      1.34
@@ -20,7 +20,7 @@
 }
 #navlinks {
    display: block;
-   padding: 0 3.2% 1em;
+   padding: .6em 3.2% 1em;
    margin: 0 -3.2%;
    background: #fffdf5;
    border-top: 3px solid #ddd;
@@ -30,7 +30,7 @@
    max-width: 100%;
    font-size: 1em;
    padding: 0 .45em 0;
-   margin: 1.2em auto 0;
+   margin: .5em auto;
 }
 #navlinks dl, #navlinks > ul {
    font-size: .94em;
@@ -63,10 +63,6 @@
 }
 #sect-menu-button img { height: 100%; }
 
-#back-to-main {
-   margin-top: .5em;
-}
-
 
 /*******************/
 /*  Media queries  */
@@ -95,7 +91,7 @@
    #navlinks h3, #navlinks dl { width: auto; }
    #navlinks h3 { margin: 1em 0 .45em .6em; }
    #navlinks ul.inline-list li, #navlinks dl a { display: block; }
-   #back-to-main { display: none; }
+   #navlinks .backtotop { display: none; }
    #navlinks dt a { padding-left: 1.1em; }
 
    a#sect-menu-button { display: none; }

Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/layout.css,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- layout.css  15 Mar 2020 21:18:07 -0000      1.40
+++ layout.css  30 Mar 2020 12:57:37 -0000      1.41
@@ -297,13 +297,13 @@
    vertical-align: middle;
    margin: .2em 0;
 }
-#navbar-input,  #outdated-input, #language-input,
-#navbar-button, #outdated-button, #language-button,
-#language-close { display: none; }
+#language-input, #language-button, #language-close,
+/* #outdated-input, #outdated-button,*/
+#navbar-input, #navbar-button { display: none; }
 
 
 /***************************/
-/*  NAVBARS & BACK-TO-TOP  */
+/*  NAVBARS & BACK TO TOP  */
 /***************************/
 
 /** LAYOUT **/
@@ -344,7 +344,8 @@
    font-size: 1.5em;
    line-height: .6em;
 }
-#back-to-top { margin: .12em 3% 0 1em; }
+.backtotop { font-size: 1.1em; }
+#fsf-links .backtotop { margin: .15em 1.5em 0; }
 
 /** STYLE **/
 
@@ -396,13 +397,14 @@
 #languages {
    font-size: .94em;  /* 15px */
    line-height: 1.2em;
+   text-align: left;
    padding: .6em 3%;
    margin: 0;
    background: #f5f5f5;
    border-top: 3px solid #ddd;
 }
 #set-language {
-   margin: .2em 0;
+   margin-bottom: .2em;
 }
 #set-language + p { 
    display: inline-block;
@@ -410,10 +412,8 @@
    margin: .45em 0 0;
 }
 
-/* Could apply to div#translations or p#translations. */
 #translations {
    padding: .4em 0;
-   margin: 0;
 }
 #translations p { margin: 0; }
 #translations span {
@@ -461,13 +461,13 @@
    regenerated. */
    #navigation, #fsf-links { height: 3px; }
    #navigation ul, #fsf-links ul { display: none; }
-   #back-to-top { margin-top:.5em; }
+   #fsf-links .backtotop { margin: .5em 3% 0 1.5em; }
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
    #navbar-input:checked ~ #navigation { height: auto; }
    #navbar-input:checked ~ #navigation ul { display: block; }
    #navbar-input:checked ~ #fsf-links { height: auto; }
    #navbar-input:checked ~ #fsf-links ul { display: block; }
-   #navbar-input:checked ~ #back-to-top { margin-top:.12em; }
+   #navbar-input:checked ~ #fsf-links .backtotop { margin-top: .15em; }
 
    #language-button { display: inline-block; }
    #language-link, #languages { display: none; }
@@ -488,7 +488,7 @@
       column-gap: 0;
    }
    #translations span {
-      display: inline-block;
+      display: block;
    }
    #translations span a {
       display: inline-block;
@@ -551,7 +551,7 @@
    #navigation ul, #fsf-links ul, ul#edu-navigation {
       display: block;
    }
-   #back-to-top { margin-top:.12em; }
+   #fsf-links .backtotop { margin-top: .15em; }
 }
 
 @media (min-width: 57em) {                           /* 912px */
@@ -760,6 +760,17 @@
    text-align: center;
 }
 
+@media (min-width: 0) {
+   #mission-statement {
+      padding-top: 1em;
+   }
+}
+@media (min-width: 45em) {
+   #mission-statement {
+      padding-top: 2em;
+   }
+}
+
 
 /************/
 /*  FOOTER  */
@@ -1445,39 +1456,30 @@
    margin: 1em 1.5em 0;
 }
 
-/* #back-to-top can be removed when all translations of footer-text.html
-   are regenerated. */
-.backtotop, #back-to-top {
+.backtotop {
    float: right;
-   font-size: 1.1em;
-   line-height: 1.7em;
-   padding-right: .5em;
-   margin-left: 1em;
+   font-size: 1.2em;
+   font-size: 1.2rem;
 }
-.backtotop a, #back-to-top a {
+.backtotop a, #fsf-links .backtotop a {
    display: inline-block;
    vertical-align: top;
-   line-height: 1.4em;
-   padding: 0 .5em .2em;
+   line-height: 1.2em;
+   padding: 0 .3em .2em;
 }
-.backtotop a span, #back-to-top a span { display: none; }
+.backtotop a span { display: none; }
 
 /** STYLE **/
 
-.button a, .backtotop a, #back-to-top a {
+.button a, .backtotop a {
    text-decoration: none;
    background: white;
 }
-.button a {
+.button a, .backtotop a, #fsf-links .backtotop a {
    color: #049;
-   border: .1em solid #bbb;
-}
-.backtotop a[href], #back-to-top a {
-   color: #008400;
-   border: 1px solid #008400;
+   border: .1em solid #999;
 }
-.button a:hover, .backtotop a[href]:hover, #back-to-top a:hover {
-   color: #006400;
+.button a:hover, .backtotop a:hover, #fsf-links .backtotop a:hover {
    background: #e7f2e2;
    border-color: #006400;
 }

Index: nav-bar/test9/footer-text.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/footer-text.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- nav-bar/test9/footer-text.html      5 Mar 2020 16:45:58 -0000       1.36
+++ nav-bar/test9/footer-text.html      30 Mar 2020 12:57:37 -0000      1.37
@@ -10,7 +10,7 @@
 <div style="clear:both"></div>
 
 <!--#if expr="$TRANSLATION_LIST = /<span dir=\"ltr\">/" -->
-<input type="checkbox" id="language-input" tabindex="-1" />
+<input type="checkbox" id="language-input" />
 <label id="language-close" for="language-input">&#x274E;</label>
 <div id="languages" class="rounded-corners">
 <hr class="no-display" />
@@ -25,12 +25,12 @@
 <!--#echo encoding="none" var="TRANSLATION_LIST" -->
 </div><!--#endif -->
 
-<div id="back-to-top" class="backtotop">
+<div id="fsf-links">
+ <div class="backtotop">
  <hr class="no-display" />
  <a href="#header"><span>BACK TO TOP </span>&#9650;</a>
-</div>
+ </div>
 
-<div id="fsf-links">
  <ul>
   <li class="gnu"><a href="/proprietary/proprietary.html">MALWARE</a></li>
   <li class="gnu"><a href="/graphics/graphics.html">GNU&nbsp;ART</a></li>

Index: nav-bar/test9/philosophy-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/philosophy-menu.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- nav-bar/test9/philosophy-menu.html  1 Mar 2020 13:59:03 -0000       1.15
+++ nav-bar/test9/philosophy-menu.html  30 Mar 2020 12:57:37 -0000      1.16
@@ -1,8 +1,8 @@
-<hr class="no-display" />
-<div id="back-to-main" class="backtotop">
- <a href="#main-heading"><span>MAIN HEADING </span>&#9650;</a>
-</div>
 <div id="navlinks">
+ <div class="backtotop">
+  <hr class="no-display" />
+  <a href="#main-heading"><span>MAIN HEADING </span>&#9650;</a>
+ </div>
  <h3>Philosophy menu</h3>
  <dl>
   <!--#if expr="$REQUEST_URI = /\/essays-and-articles/" --><dt class="current">