www-commits
[Top][All Lists]
Advanced

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

www/server/staging layout.css body-include-1.ht...


From: Therese Godefroy
Subject: www/server/staging layout.css body-include-1.ht...
Date: Fri, 28 Feb 2020 11:05:05 -0500 (EST)

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 20/02/28 11:05:05

Modified files:
        server/staging : layout.css body-include-1.html 
                         body-include-2.html banner.html education.css 
                         education-menu.html edu-software.html 

Log message:
        Optimize display for current translist; define .backtotop class for
        div#back-to-top & similar buttons; minor adjustments. 

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout.css?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-1.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-2.html?cvsroot=www&r1=1.26&r2=1.27
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/banner.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education.css?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education-menu.html?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-software.html?cvsroot=www&r1=1.22&r2=1.23

Patches:
Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/layout.css,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- layout.css  25 Feb 2020 14:40:04 -0000      1.30
+++ layout.css  28 Feb 2020 16:05:04 -0000      1.31
@@ -87,12 +87,13 @@
      - html, body, .inner
      - header for CSS3-unaware browsers
          #gnu-banner
-         #languages
-         searcher, languages & menu icons
-     - media queries for header
-         #fsf-frame
+         searcher, language & menu icons
+     - navbars & back-to-top (layout, style)
+     - languages for CSS3-unaware browsers
+     - media queries for header, navbars & languages
+         #fsf-frame (57em)
      - #content
-         Navigation (breadcrumb & edu-breadcrumb)
+         navigation (breadcrumb & edu-breadcrumb)
          byline
          text of the article (reduced-width, columns, infobox)
          for translations (trans-disclaimer, #outdated, translators-notes)
@@ -122,7 +123,6 @@
    * INTERACTIVE ELEMENTS
      - links (special links, style)
      - forms & buttons (layout, style)
-     - navbars & back-to-top (layout, style)
 
    * FONT FAMILY
 */
@@ -193,6 +193,7 @@
 }
 .inner > #translations span a, #translations span a:visited {
    padding: 0;
+   width: auto;
    color: #222; text-decoration: none;
 }
 .inner > #translations span.original {
@@ -266,6 +267,7 @@
    display: inline-block;
    vertical-align: middle;
    height: 1.5em;
+   margin-right: .15em;
 }
 #gnu-banner strong { font-weight: normal; }
 
@@ -286,14 +288,14 @@
 .switch img {
    display: inline-block;
    vertical-align: top;
-   height: 100%;
+   height: 1.5em;
    width: auto;
    padding: .1em;
-   margin: 0;
 }
 #language-link {
    display: inline-block;
    vertical-align: middle;
+   margin: .2em 0;
 }
 #navbar-input,  #outdated-input, #language-input,
 #navbar-button, #outdated-button, #language-button {
@@ -301,9 +303,97 @@
 }
 
 
-/***************/
-/*  LANGUAGES  */
-/***************/
+/***************************/
+/*  NAVBARS & BACK-TO-TOP  */
+/***************************/
+
+/** LAYOUT **/
+
+#navigation ul, #fsf-links ul { margin: 0; }
+ul#edu-navigation { margin: 0 -3.2%; }
+
+/* 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: .94em; */
+   line-height: 2em;
+/*   font-weight: bold; */
+   padding: 0 1.5%;
+}
+#navigation li, ul#edu-navigation li, #fsf-links li {
+   white-space: nowrap;
+   display: inline;
+   display: inline-block;
+   line-height: 2em;
+   padding: 1px;
+   margin: 0;
+   font-weight: bold;
+}
+
+/* For Firefox (can't set line-height when "a" is displayed inline) */
+#navigation a, ul#edu-navigation a, #fsf-links a {
+   display: inline-block;
+   line-height: 2em;
+   padding: 0 .4em;
+   margin: 0;
+}
+
+#more-links { float: right; padding: 0; }
+#more-links span { font-size: 1.1em; line-height: .8em; }
+#more-links sup { font-size: 1.2em; }
+
+#back-to-top { position: static; margin: .15em 3% 0 1em; }
+
+@media (min-width: 57em) {
+   #navigation ul, ul#edu-navigation, #fsf-links ul { text-align: center; }
+   li#more-links { float: none; margin-left: 2em; }
+}
+
+
+/** STYLE **/
+
+#navigation a, ul#edu-navigation a, #fsf-links a {
+   text-decoration: none;
+}
+#navigation       { background: #a42e2b; }
+ul#edu-navigation { background: #eee; }
+#fsf-links        { background: #d4d4d4; }
+
+#navigation a          { color: white; }
+ul#edu-navigation a,
+#fsf-links a           { color: #333; }
+#fsf-links .gnu a      { color: #850803; }
+
+#navigation       li a:hover { background: #8c0300; }
+ul#edu-navigation li a:hover { background: #fafafa; }
+#fsf-links        li a:hover { background: #eee; }
+
+#navigation       li.active a,
+ul#edu-navigation li.active,
+ul#edu-navigation li.current,
+#navlinks         li.current > a {
+   font-style: italic;
+   cursor: default;
+}
+#navigation li.active,
+#navigation li.active a:hover {
+   background: #800300;
+}
+ul#edu-navigation li.active,
+ul#edu-navigation li.active a:hover,
+ul#edu-navigation li.current {
+   background: white;
+}
+#navlinks li.current > a[href],
+#navlinks li.current > a[href]:hover {
+   color: #333;
+   background: none;
+}
+
+
+/*****************************************/
+/*  LANGUAGES FOR CSS3-UNAWARE BROWSERS  */
+/*****************************************/
 
 #languages {
    font-size: .94em;  /* 15px */
@@ -326,26 +416,26 @@
 #translations {
    padding: .4em 0;
    margin: 0;
-   text-transform: uppercase;
 }
 #translations p { margin: 0; }
 #translations span {
    display:  inline-block;
-   width: 17em;
+   width: 14em;
    line-height: 1.2em;
-   padding: .35em 0;
+   margin: .5em 0;
 }
 #translations span.original { font-weight: bold; }
 #translations span a {
-    display: inline-block;
+   white-space: normal;
     line-height: 1.2em;
     padding: .25em;
 }
 
 
-/*****************************************/
-/*  MEDIA QUERIES FOR HEADER & LANGUAGES */
-/*****************************************/
+/***************************************************/
+/*  MEDIA QUERIES FOR HEADER, NAVBARS & LANGUAGES  */
+/***************************************************/
+
 
 @media (min-width: 0) {
    body { font-size: .94em; }
@@ -354,7 +444,7 @@
 
    #gnu-banner .hide { display: none; }
    #gnu-banner {
-      font-size: 2em;
+      font-size: 2em;  /* 30px */
       padding-left: 0;
       margin: 0;
    }
@@ -374,8 +464,11 @@
 /* This will need to be commented out until all the translated includes are
    regenerated. */
    #navigation, #fsf-links { height: 3px; }
-   #back-to-top { position: relative; bottom: 1em; }
    #navigation ul, #fsf-links ul { display: none; }
+   #back-to-top {
+      position: relative;
+      top: -.5em;
+   }
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
    #navbar-input:checked ~ #navigation { height: auto; }
    #navbar-input:checked ~ #navigation ul { display: block; }
@@ -386,9 +479,9 @@
    #language-button { display: inline-block; }
    #language-link, #languages { display: none; }
    input#language-input:checked ~ #languages {
-      display: inline-block;
+      display: block;
       position: absolute;
-      top: 6em; left: 0;
+      top: 0; right: 0;
       z-index: 10;
       overflow: auto;
       width: auto;
@@ -398,15 +491,21 @@
    }
    #translations {
       display: block;
-      width: auto;
-      columns: 1;
+      column-width: 9.5em;
+      column-count: 3;
+   }
+   #translations p {
+      line-height: .1em;
    }
    #translations span {
       display: block;
-      width: auto;
+      font-size: 0;
    }
-   .translations span a {
-      margin: 0;
+   #translations span a {
+      display: inline-block;
+      font-size: .94rem;
+      width: 9em;
+      white-space: normal;
    }
 
    #outdated-button {
@@ -433,10 +532,6 @@
    #switches { padding-top: .3em; padding-left: 1.5em; }
 }
 
-@media (min-width: 30em) {
-   #translations { columns: 2; }
-}
-
 @media (min-width: 45em) {                           /* 720px */
    body { font-size: 1em; }
 
@@ -447,12 +542,27 @@
    }
    #fsf-support {
       display: block;
-      font-size: .4em;  /* 13px */
+      font-size: .4em;  /* 14px */
       margin: 0;
    }
    #fsf-support a { font-weight: bold; }
 
-   #translations { columns: 3; }
+   #translations {
+      column-width: 15em;
+      line-height: 1.2em;
+      margin: 1px 0;
+   }
+   #translations span {
+      display: inline-block;
+      font-size: .94rem;  /* 15px */
+      width: 14em;
+      line-height: 1.2em;
+      margin: .5em 0;
+   }
+   #translations span a {
+      display: inline;
+      width: auto;
+   }
 
    #outdated-button { display: none; }
    #outdated { display: block; }
@@ -493,13 +603,14 @@
 
 #content {
    padding: 0 3%;
-   margin-bottom: 2.5em;
+   margin-bottom: 3em;
 }
 
 
 /** Navigation; see also education.css **/
 
 .breadcrumb, .edu-breadcrumb {
+/*   font-size: .94em; */
     line-height: 1.7em;
     padding: .4em 0 0;
     margin: 0 0 .5em;
@@ -510,14 +621,14 @@
 /** Author line after the main heading **/
 
 p.byline {
-   font-size: 1.0625em;  /* 17px - assumes #content > p.byline */
+   font-size: 1.06em;  /* 17px - assumes #content > p.byline */
    margin-bottom: 1.5em;
 }
 
 
 /** Text of the article **/
 
-.article { font-size: 1.0625em; }  /* 17px */
+.article { font-size: 1.06em; }  /* 17px */
 
 /* Narrower paragraphs surrounded by full-width text or columns.
    Useless next to a side menu: line width is already limited
@@ -551,13 +662,13 @@
 /** Metadata or footnotes at the end of articles **/
 
 .infobox {
-    font-size: .9375em;  /* 15px - assumes #content > .infobox */
+    font-size: .94em;  /* 15px - assumes #content > .infobox */
     line-height: 1.3em;
     margin: 2.5em 0 0;  
 }
 .infobox h3 {
-    font-size: 1.267em;  /* 19px - assumes #content > .infobox */
-    margin-top: 0;
+    font-size: 1.27em;  /* 19px - assumes #content > .infobox */
+    margin-top: 1.2em;
 }
 .infobox p {
     margin: .3em 0 0;
@@ -575,8 +686,9 @@
 
 /* For the note saying the page is a translation */
 .trans-disclaimer {
-/*   font-size: .9375em;   15px */
+/*   font-size: .94em; */  /* 15px */
    text-align: center;
+   font-style: italic;
    line-height: 1.7em;
    margin: .5em 0 0;
 }
@@ -584,13 +696,10 @@
    display: inline-block;
    line-height: 1.6em;
 }
-@media (min-width: 45em) {
-   .trans-disclaimer { text-align: right; max-width: 90%; }
-}
 
 /* For outdated translations */
 #outdated {
-   font-size: .9375em;  /* 15px */
+   font-size: .94em;  /* 15px */
    text-align: center;
    padding: .5em;
    margin: .8em 0;
@@ -621,7 +730,7 @@
 /** Subsections of /education "Case Studies" **/
 
 .edu-cases {
-   font-size: 1.0625em;                        /* 17 px */
+   font-size: 1.06em;                        /* 17 px */
    width: 50em; max-width: 100%;
    padding: 0 0 .8em;
    margin: 2em auto;
@@ -644,11 +753,11 @@
 /***********************/
 
 #mission-statement {
-   padding: 1.8em 3% 2em;
+   padding: 2em 3%;
    background: white;
 }
 #mission-statement blockquote {
-   font-size: .9375em;  /* 15px */
+   font-size: .94em;  /* 15px */
    font-weight: bold;
    font-style: italic;
    margin: 0 3% .8em;
@@ -978,7 +1087,8 @@
 /*  IMAGES  */
 /************/
 
-.imgright, imgleft { max-width: 100%; }
+img { vertical-align: top; }
+.imgright, .imgleft { max-width: 100%; }
 .imgright { float: right; margin: .3em 0 1em 2em; }
 .imgleft  { float: left;  margin: .3em 2em 1em 0; }
 
@@ -1319,11 +1429,11 @@
 
 /* :hover */
 
-a[href]:link:hover, a[href]:visited:hover {
+a[href]:hover {
    background: #e7f2e2;
    text-decoration: none;
 }
-#gnu-banner > a:hover {
+#gnu-banner > a[href]:hover, .pict > a[href]:hover {
    background: none
 }
 
@@ -1357,20 +1467,44 @@
    margin: 1em 1.5em 0;
 }
 
+/* #back-to-top can be removed when all translations of footer-text.html
+   are regenerated. */
+.backtotop, #back-to-top {
+   float: right;
+   font-size: 1.1em;
+   line-height: 1.7em;
+   padding-right: .5em;
+   margin-left: 1em;
+}
+.backtotop a, #back-to-top a {
+   display: inline-block;
+   vertical-align: top;
+   line-height: 1.4em;
+   padding: 0 .5em .2em;
+}
+.backtotop span, #back-to-top span {
+   position: fixed;
+   top: -1000px;
+}
 
 /** STYLE **/
 
-.button a[href]:link, .button a[href]:visited {
-   color: #049;
+.button a, .backtotop a, #back-to-top a {
    text-decoration: none;
    background: white;
+}
+.button a {
+   color: #049;
    border: .1em solid #bbb;
 }
-.button a[href]:link:hover, .button a[href]:visited:hover {
+.backtotop a[href], #back-to-top a {
+   color: #008400;
+   border: 1px solid #008400;
+}
+.button a:hover, .backtotop a[href]:hover, #back-to-top a:hover {
    background: #e7f2e2;
    border-color: #006400;
 }
-
 #language-link a { color: #333; }
 
 #join-fsf a, #support-the-fsf a.join {
@@ -1386,19 +1520,16 @@
    color: #005ccd;
    border-color: #005ccd;
 }
-#back-to-top a {
-   color: #333;
-}
 #support-the-fsf a.donate:hover {
    color: #049;
    background: #d9e8f7;
    border-color: #049;
 }
-#support-the-fsf a.shop, #back-to-top a {
+#support-the-fsf a.shop {
    color: #008400;
    border-color: #008400;
 }
-#support-the-fsf a.shop:hover, #back-to-top a:hover {
+#support-the-fsf a.shop:hover {
    color: #006400;
    background: #e7f2e2;
    border-color: #006400;
@@ -1441,7 +1572,7 @@
    border-color: #006400;
 }
 
-.rounded-corners, form.header input, .button a {
+.rounded-corners, form.header input, .button a, .backtotop a {
    border-radius: .3em;
    -moz-border-radius: .3em;
    -khtml-border-radius: .3em;
@@ -1450,109 +1581,6 @@
 }
 
 
-/***************************/
-/*  NAVBARS & BACK-TO-TOP  */
-/***************************/
-
-/** LAYOUT **/
-
-#navigation ul, #fsf-links ul { margin: 0; }
-ul#edu-navigation { margin: 0 -3.2%; }
-
-/* 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: .9375em; */
-   line-height: 2em;
-/*   font-weight: bold; */
-   padding: 0 1.5%;
-}
-#navigation li, ul#edu-navigation li, #fsf-links li {
-   white-space: nowrap;
-   display: inline;
-   display: inline-block;
-   line-height: 2em;
-   padding: 1px;
-   margin: 0;
-   font-weight: bold;
-}
-
-
-/* For Firefox (can't set line-height when "a" is displayed inline) */
-#navigation a, ul#edu-navigation a, #fsf-links a {
-   display: inline-block;
-   line-height: 2em;
-   padding: 0 .4em;
-   margin: 0;
-}
-
-#more-links { float: right; padding: 0; }
-#more-links span { font-size: 1.1em; line-height: .8em; }
-#more-links sup { font-size: 1.2em; }
-
-#back-to-top {
-   float: right;
-   line-height: 1.9em;
-/* For NetSurf 1.2, and maybe a few other browsers. */ 
-   margin: .1em 1em 0;
-}
-/* For standard browsers. */
-@media (min-width: 0) {
-   #back-to-top { margin-right: 3%;}
-}
-#back-to-top a {
-   line-height: 1.6em;
-   padding: .1em .5em 0;
-   margin-top: 1px;
-}
-#back-to-top span { display: none; }
-
-@media (min-width: 57em) {
-   #navigation ul, ul#edu-navigation, #fsf-links ul { text-align: center; }
-   li#more-links { float: none; margin-left: 2em; }
-}
-
-
-/** STYLE **/
-
-#navigation a, ul#edu-navigation a, #fsf-links a {
-   text-decoration: none;
-}
-#navigation       { background: #a42e2b; }
-ul#edu-navigation { background: #eee; }
-#fsf-links        { background: #d4d4d4; }
-
-#navigation a          { color: white; }
-ul#edu-navigation a,
-#fsf-links a           { color: #333; }
-#fsf-links .gnu a      { color: #850803; }
-
-#navigation       li a:hover { background: #8c0300; }
-ul#edu-navigation li a:hover { background: #fafafa; }
-#fsf-links        li a:hover { background: #eee; }
-
-#navigation       li.active a,
-ul#edu-navigation li.active,
-ul#edu-navigation li.current,
-#navlinks         li.current > a {
-   font-style: italic;
-   cursor: default;
-}
-#navigation li.active,
-#navigation li.active a:hover {
-   background: #800300;
-}
-ul#edu-navigation li.active,
-ul#edu-navigation li.active a:hover,
-ul#edu-navigation li.current {
-   background: white;
-}
-#navlinks li.current > a[href],
-#navlinks li.current > a[href]:hover {
-   color: #333;
-   background: none;
-}
-
 
 /*====================================================================*/
 /*                            FONT FAMILY                             */
@@ -1561,10 +1589,10 @@
 
 a[href] { font-family: sans-serif; }
  
-#fsf-frame a[href], #fssbox label, form.header input,
-.button a[href], #header a[href], #fsf-support, #languages, #languages 
a[href], #navlinks, #navlinks a[href],
-.edu-breadcrumb, .edu-breadcrumb a[href], .breadcrumb, .breadcrumb a,
-.trans-disclaimer, .trans-disclaimer a[href] {
+#fsf-frame a[href], #fssbox label, form.header input, .button a[href],
+#header a[href], #fsf-support, #languages, #languages a[href],
+#navlinks, #navlinks a[href], .edu-breadcrumb, .edu-breadcrumb a[href],
+.breadcrumb, .breadcrumb a, .trans-disclaimer, .trans-disclaimer a[href] {
    font-family: "Noto Sans Display", "Noto Sans", "Liberation Sans", 
                 sans-serif;
 }

Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-1.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- body-include-1.html 25 Feb 2020 14:40:40 -0000      1.27
+++ body-include-1.html 28 Feb 2020 16:05:04 -0000      1.28
@@ -3,8 +3,8 @@
 
 <div id="fsf-frame">
 <div id="join-fsf" class="button"><a
-href="https://www.fsf.org/associate/support_freedom?referrer=4052";>
-Prisijunkite prie FSF</a></div>
+href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN&nbsp;THE&nbsp;FSF</a>
+</div>
 
 <form id="fssbox" 
action="https://my.fsf.org/civicrm/profile/create?reset=1&amp;gid=31";
       method="post" class="header">
@@ -13,12 +13,13 @@
   <input type="hidden" name="group[25]" value="1" />
   <input name="cancelURL" type="hidden" 
value="https://crm.fsf.org/civicrm/profile?reset=1&amp;gid=31"; />
   <input name="_qf_default" type="hidden" value="Edit:cancel" />
-  <label for="frmEmail">Boletín «<cite><a href="//www.fsf.org/fss">Free 
Software
-Supporter</a></cite>» (también en español):</label>
+  <label for="frmEmail"><span class="gnun-split"></span>
+  <a href="//www.fsf.org/fss">Free Software Supporter</a>:
+  <span class="gnun-split"></span></label>
   <div>
    <input type="text" id="frmEmail" name="email-Primary" size="18"
-          value="dirección de correo" onfocus="this.value=''"/>
-   <input type="submit" name="_qf_Edit_next" value="Suscribirse" />
+          value="email address" onfocus="this.value=''"/>
+   <input type="submit" name="_qf_Edit_next" value="Sign up" />
   </div>
  </fieldset>
 </form>

Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-2.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- body-include-2.html 24 Feb 2020 10:48:32 -0000      1.26
+++ body-include-2.html 28 Feb 2020 16:05:04 -0000      1.27
@@ -6,35 +6,37 @@
 <p id="gnu-banner">
  <a href="/">
  <img src="/graphics/heckert_gnu.transp.small.png"  height="48"
-      alt="&nbsp;[A GNU head]&nbsp;" /><strong>GNU</strong><span
- class="hide"><small>オペレーティング・システム
</small></span></a><br />
- <span id="fsf-support">При поддержке
- <a href="#mission-statement">Фонда свободного 
программного
-обеспечения</a></span>
-</p><!-- /gnu-banner -->
+      alt="&nbsp;[A GNU head]&nbsp;" /><strong>GNU</strong> <span
+ class="hide">Operating System</span></a><br />
+ <span id="fsf-support">Supported by the
+ <a href="#mission-statement">Free Software Foundation</a></span>
+</p>
 
 <div id="switches">
  <label for="navbar-input"  id="navbar-button" class="switch">
   <img id="navbar-icon" width="1" height="1"
        src="/server/staging/layout/menu.png"
        alt="&nbsp;[Main menu]&nbsp;"
-       title="Show/hide main menu" /></label>
+       title="Show/Hide main menu" /></label>
 
  <a id="search-button" class="switch" href="//www.gnu.org/cgi-bin/estseek.cgi">
   <img id="search-icon" height="32"
        src="/server/staging/layout/search.png"
        alt="&nbsp;[Search www.gnu.org]&nbsp;" /></a>
-<!--#if expr="$TRANSLATION_LIST = /<span dir=\"ltr\">/"
---><label for="language-input"  id="language-button" class="switch">
+<!--#if expr="$TRANSLATION_LIST = /<span dir=\"ltr\">/" -->
+ <label for="language-input"  id="language-button" class="switch">
   <img id="language-icon" width="1" height="1"
        src="/server/staging/layout/flags.1.png"
        alt="&nbsp;[Translations]&nbsp;"
        title="Show/Hide language list" />
  </label>
 <!--#endif -->
+
+ <div id="language-link" class="button">
+  <a href="#languages">Languages</a>
+ </div>
+</div>
 </div>
-<div id="language-link" class="button"><a href="#languages">Languages</a></div>
-</div><!-- /#header -->
 
 <div style="clear: both"></div>
 <input type="checkbox" id="navbar-input" tabindex="-1" />

Index: banner.html
===================================================================
RCS file: /webcvs/www/www/server/staging/banner.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- banner.html 23 Feb 2020 19:23:26 -0000      1.5
+++ banner.html 28 Feb 2020 16:05:04 -0000      1.6
@@ -3,7 +3,7 @@
 </head>
 <body>
 <!--#include virtual="/server/staging/body-include-1.html" -->
-<div class="inner">
 <!--#include virtual="/server/staging/body-include-2.html" -->
+<div class="inner">
 <div id="content">
 <!-- end of server/banner.html -->

Index: education.css
===================================================================
RCS file: /webcvs/www/www/server/staging/education.css,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- education.css       21 Feb 2020 20:04:40 -0000      1.28
+++ education.css       28 Feb 2020 16:05:04 -0000      1.29
@@ -20,33 +20,24 @@
 }
 #navlinks {
    display: block;
-   padding: 1em 3.2%;
+   padding: 0 3.2% 1em;
    margin: 0 -3.2%;
    background: #fffdf5;
    border-top: 3px solid #ddd;
 }
 #navlinks h3 {
+   width: 32em;
+   max-width: 100%;
    font-size: 1em;
-   padding: .3em;
-   margin: 0;
-}
-.backtotop {
-   float: left;
-   line-height: 1.8em;
-   padding: 0 .5em;
-   margin-left: -.5em;
-}
-.backtotop span { display: none; }
-.backtotop a {
-   display: inline-block;
-   padding: 0 .5em;
+   padding: 0 .45em 0;
+   margin: 1.2em auto 0;
 }
 #navlinks dl, #navlinks > ul {
-   font-size: .9375em;
+   font-size: .94em;
    line-height: 1.2em;
 }
 #navlinks dl {
-   width: 45em;
+   width: 35em;
    max-width: 100%;
    margin: .7em auto 0;
 }
@@ -64,7 +55,6 @@
    line-height: 1.2em;
    padding: .25em .5em;
 }
-
 a#sect-menu-button {
    float: right;
    line-height: 1.7em;
@@ -73,6 +63,11 @@
 }
 #sect-menu-button img { height: 100%; }
 
+#back-to-main {
+   position: relative;
+   bottom: .5em;
+}
+
 
 /*******************/
 /*  Media queries  */
@@ -96,10 +91,10 @@
       border-top: none;
       border-right: 1px solid #bbb;
    }
-   #navlinks h3 { margin: 1em 0 0 .7em; }
-   #navlinks dl { width: auto; }
+   #navlinks h3, #navlinks dl { width: auto; }
+   #navlinks h3 { margin: 1em 0 .45em .6em; }
    #navlinks ul.inline-list li, #navlinks dl a { display: block; }
-   #navlinks .backtotop { display: none; }
+   #back-to-main { display: none; }
    #navlinks dt a { padding-left: 1.1em; }
 
    a#sect-menu-button { display: none; }

Index: education-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/education-menu.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- education-menu.html 20 Feb 2020 14:36:48 -0000      1.12
+++ education-menu.html 28 Feb 2020 16:05:04 -0000      1.13
@@ -1,6 +1,8 @@
 <hr class="no-display" />
+<div id="back-to-main" class="backtotop">
+ <a href="#main"><span>MAIN HEADING </span>&#9650;</a>
+</div>
 <div id="navlinks">
- <div class="backtotop"><a href="#main"><span>TOP </span>&#11205;</a></div>
  <h3>Education menu</h3>
  <dl>
   <!--#if expr="$REQUEST_URI = /\/education.html/" --><dt class="current">

Index: edu-software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-software.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- edu-software.html   24 Feb 2020 10:48:32 -0000      1.22
+++ edu-software.html   28 Feb 2020 16:05:04 -0000      1.23
@@ -18,7 +18,7 @@
 <!--
 -->
 </style>
-<!--#include virtual="/server/staging/edu-software.translist" -->
+<!--#include virtual="/education/po/edu-software.translist" -->
 <!--#include virtual="/server/staging/banner.html" -->
 <div id="main">
 
@@ -154,7 +154,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2020/02/24 10:48:32 $
+$Date: 2020/02/28 16:05:04 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

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