[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging layout.css education.css edu...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging layout.css education.css edu... |
|
Date: |
Tue, 26 May 2020 06:36:22 -0400 (EDT) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 20/05/26 06:36:22
Modified files:
server/staging : layout.css education.css education-menu.html
edu-software.html edu-team.html
Log message:
New version of breadcrumb, discussed on education@.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout.css?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education.css?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education-menu.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-software.html?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-team.html?cvsroot=www&r1=1.6&r2=1.7
Patches:
Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/layout.css,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- layout.css 6 Apr 2020 19:09:33 -0000 1.43
+++ layout.css 26 May 2020 10:36:21 -0000 1.44
@@ -1,4 +1,4 @@
-/*!
+/*
layout.css -- css stylesheet used on www.gnu.org
(This version should be used with reset.css. A few basic parameters that used
to be set in combo.css are now defined here.)
@@ -58,22 +58,23 @@
black 2.29
Gray (visited links)
- #595959 white 7.00 AAA
- #222 2.27
- black 3.00
- #049 1.31
+ #505050 white 8.06 AAA
+ #f3f3f3 7.27
+ #222 1.97
+ black 2.60
+ #049 1.14
*/
/* PAGE STRUCTURE
From top to bottom:
- skiplink, #fsf-frame (#, #fssbox) [body-include-1.html]
- #header (#switches, #gnu-banner, #navigation) [body-include-2.html]
+ skiplink, #fsf-frame (#join-fsf, #fssbox),
+ #header (#gnu-banner, #switches) [body-include-1.html]
+ #navigation [body-include-2.html]
(#edu-navigation / #navlinks in a few pages) [<page>.html]
#content [<page>.html]
#languages [footer-text.html]
- #fsf-links [footer-text.html]
#mission-statement [footer-text.html]
#footer [<page>.html]
*/
@@ -128,83 +129,6 @@
*/
-/************************************/
-/* Transition from previous version */
-/************************************/
-
-#header #fsf-frame { display: none; }
-#navlinks { display: none; }
-
-/*** TOPLINKS ***/
-
-#toplinks {
- float: left;
- font-size: .9em;
- padding: .5em 2em .3em;
-}
-@media (min-width: 0) {
- #toplinks { padding: .6em 3% .3em; }
-}
-#toplinks a {
- white-space: nowrap;
- display: inline-block;
- font-family: "Noto Sans Display", "Noto Sans", "Liberation Sans",
- sans-serif;
- font-weight: bold;
- margin-right: 1em;
-}
-#toplinks a[href]:link, #toplinks a[href]:link:visited {
- color: #444;
- text-decoration: none;
-}
-#toplinks a[href]:link:hover, #toplinks a[href]:link:visited:hover {
- color: #006400;
-}
-
-/*** SEARCHER ***/
-
-div#searcher {
- display: block;
- font-size: .9em;
- text-align: right;
- padding: .2em 3%;
- background-color: #eee;
-}
-
-/*** TRANSLATION LIST ***/
-
-.inner > #translations {
- clear: both;
- font-size: .9em;
- text-align: left;
- columns: 1;
- border-bottom: .2em solid #ddd;
-}
-.inner > #translations p {
- padding: 0 3%;
- line-height: 1.2em;
- margin: 0;
-}
-.inner > #translations span {
- display: inline;
- white-space: nowrap;
- width: auto;
- font-size: .9em;
-}
-.inner > #translations span a, #translations span a:visited {
- padding: 0;
- width: auto;
- color: #222; text-decoration: none;
-}
-.inner > #translations span.original {
- font-size: 1em; font-weight: bold;
-}
-
-/*** BANNER ***/
-
-div#gnu-banner { line-height: 1.2em; padding: .4em 0 .5em; }
-div#gnu-banner strong, div#gnu-banner img { vertical-align: bottom; }
-
/*====================================================================*/
@@ -242,7 +166,6 @@
/* HEADER FOR CSS3-UNAWARE BROWSERS */
/**************************************/
-
/*** TOP LINKS ***/
.skip, #fsf-frame {
@@ -277,12 +200,12 @@
#switches {
display: inline-block;
- line-height: 2em;
+ line-height: 1.7em;
padding: .3em 0;
}
.switch {
display: inline-block;
- height: 1.5em;
+ height: 1.7em;
margin-left: .4em;
}
.switch img {
@@ -292,14 +215,6 @@
width: auto;
padding: .1em;
}
-#language-link {
- display: inline-block;
- vertical-align: middle;
- margin: .2em 0;
-}
-#language-input, #language-button, #language-close,
-/* #outdated-input, #outdated-button,*/
-#navbar-input, #navbar-button { display: none; }
/***************************/
@@ -308,70 +223,54 @@
/** LAYOUT **/
-#navigation ul, #fsf-links ul { margin: 0; }
+#navigation, #edu-navigation {
+ font-size: .94em;
+ font-weight: bold;
+}
+#navigation 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 ul, ul#edu-navigation {
+ line-height: 1.8em;
+ padding: 0 2%;
}
-#navigation li, ul#edu-navigation li, #fsf-links li {
+#navigation li, ul#edu-navigation li {
white-space: nowrap;
display: inline;
display: inline-block;
line-height: 1.8em;
- padding: 1px;
- margin: 0;
- font-weight: bold;
+ padding: .1em 0;
+ margin: 0 .2em;
}
/* For Firefox (can't set line-height when "a" is displayed inline) */
-#navigation a, ul#edu-navigation a, #fsf-links a {
+#navigation a, ul#edu-navigation a {
display: inline-block;
line-height: 2em;
- padding: 0 .4em;
- margin: 0;
-}
-#more-links {
- float: right;
- padding: 0;
+ padding: 0 .6em;
}
-#more-links sup {
- font-size: 1.5em;
- line-height: .6em;
-}
-.backtotop { font-size: 1.1em; }
-#fsf-links .backtotop { margin: .15em 1.5em 0; }
/** STYLE **/
-#navigation a, ul#edu-navigation a, #fsf-links a {
+#navigation a, ul#edu-navigation 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; }
+ul#edu-navigation a { color: #333; }
#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 a,
ul#edu-navigation li.current,
#navlinks li.current > a {
font-style: italic;
- cursor: default;
- pointer-events: none;
}
#navigation li.active,
#navigation li.active a:hover {
@@ -385,7 +284,6 @@
#navlinks li.current > a[href],
#navlinks li.current > a[href]:hover {
color: #333;
- background: none;
}
@@ -393,7 +291,6 @@
/* LANGUAGES FOR CSS3-UNAWARE BROWSERS */
/*****************************************/
-
#languages {
font-size: .94em; /* 15px */
line-height: 1.2em;
@@ -403,24 +300,19 @@
background: #f5f5f5;
border-top: 3px solid #ddd;
}
-#set-language {
- margin-bottom: .2em;
-}
+#set-language { margin-bottom: .2em; }
#set-language + p {
display: inline-block;
font-size: 1em; /* 15px */
margin: .45em 0 0;
}
-#translations {
- padding: .4em 0;
-}
+#translations { padding: .4em 0; }
#translations p { margin: 0; }
#translations span {
display: inline-block;
width: 10.5em;
line-height: 2em;
- margin: 0;
}
#translations span a {
line-height: 1.9em;
@@ -432,16 +324,23 @@
/* MEDIA QUERIES FOR HEADER, NAVBARS & LANGUAGES */
/***************************************************/
-
@media (min-width: 0) {
body { font-size: .94em; }
- .inner { position: relative; }
- #header { display: block; }
+
+/* Header */
+
+ #header {
+ display: table;
+ width: 94%;
+ }
+ p#gnu-banner, #switches {
+ display: table-cell;
+ vertical-align: middle;
+ }
#gnu-banner .hide { display: none; }
#gnu-banner {
font-size: 2em; /* 30px */
- padding-left: 0;
margin: 0;
}
#gnu-banner img { height: 1.3em; }
@@ -449,91 +348,88 @@
display: inline-block;
vertical-align: middle;
}
- #switches {
- display: block;
- padding: 0
- }
+
+ #switches { padding-left: 1em; }
.switch { margin: 0 3%; }
- #navbar-button { display: inline-block; }
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-/* This will need to be commented out until all the translated includes are
- regenerated. */
- #navigation, #fsf-links { height: 3px; }
- #navigation ul, #fsf-links ul { display: none; }
- #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 ~ #fsf-links .backtotop { margin-top: .15em; }
-
- #language-button { display: inline-block; }
- #language-link, #languages { display: none; }
- input#language-input:checked ~ #languages {
- display: block;
+/* Display/hide language list */
+
+ #language-container { display: none; }
+ #languages .backtotop { display: none; }
+ #language-container:target { display: block; }
+
+ body { position: relative; }
+ #language-container {
position: absolute;
- top: 0; right: 0;
- z-index: 10;
+ top: -3px; left: 0;
+ width: 100%;
+ height: 100%;
+ }
+ #language-container > .close {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ background: transparent;
+ }
+ #languages .close:after {
+ content: "\00274E";
+ font-size: 1.2em;
+ float: right;
+ margin-right: .5em;
+ cursor: pointer;
+ }
+ #language-container a.close:hover { background: 0; }
+
+ #languages {
+ position: relative;
+ margin-top: 4em;
+ float: right;
overflow: auto;
- width: auto;
+ max-width: 21em;
text-align: left;
padding: .5em 1em;
+ background: white;
border: .2em solid #bbb;
+ box-shadow: 0 0 1em 1em #9999;
}
#translations {
column-width: 10em;
- column-count: 4;
+ column-count: 3;
column-gap: 0;
}
- #translations span {
- display: block;
- }
- #translations span a {
- display: inline-block;
- }
- input#language-input:checked ~ #language-close {
- display: inline-block;
- font-size: 1.3em;
- position: absolute;
- top: .7em; right: 1em;
- z-index: 20;
- cursor: pointer;
+ #translations span { display: block; }
+ #translations span a { display: inline-block; }
+
+/* Expand/shrink navbar */
+
+ #navigation, #edu-navigation { font-size: 1em; }
+ #navigation {
+ height: 2.15em;
+ overflow: hidden;
}
- input#language-input:checked ~ #content:after {
- display: block;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
- position: fixed;
- background-color: rgba(0,0,0,.6);
- content: "";
+ #more-links, #less-links {
+ float: right;
+ background: #800300;
+ margin: 0 2%;
}
-/*
- #outdated-button {
+ #more-links:after, #less-links:after {
display: inline-block;
- float: right;
- margin-right: 0;
+ padding: .05em .4em;
}
- #outdated { display: none; }
- #outdated-input:checked ~ #outdated { display: block; }
-*/
- ul#edu-navigation { display: none; }
+
+ a#less-links { display: none; }
+ a#more-links { display: block; }
+ #navigation:target { height: auto; }
+ #navigation:target a#more-links { display: none; }
+ #navigation:target a#less-links { display: block; }
}
-@media (min-width: 19.5em) { /* 312px */
- #header {
- display: table;
- width: 94%;
- }
- p#gnu-banner, #switches {
- display: table-cell;
- vertical-align: middle;
- }
- p#gnu-banner { font-size: 2.2em; }
- #switches { padding-top: .3em; padding-left: 1.5em; }
+@media (min-width: 20em) { /* 312px */
+ #gnu-banner { font-size: 2.2em; }
+}
+
+@media (min-width: 34em) {
+ #languages { max-width: 36em; }
}
@media (min-width: 45em) { /* 720px */
@@ -551,17 +447,9 @@
}
#fsf-support a { font-weight: bold; }
- #languages { max-width: 48em; }
+ #languages { margin-top: 5.5em; }
- #outdated-button { display: none; }
- #outdated { display: block; }
-
- #navbar-button { display: none; }
- #navigation, #fsf-links { height: auto; }
- #navigation ul, #fsf-links ul, ul#edu-navigation {
- display: block;
- }
- #fsf-links .backtotop { margin-top: .15em; }
+ ul#edu-navigation { display: block; }
}
@media (min-width: 57em) { /* 912px */
@@ -583,13 +471,8 @@
float: right;
margin: 0 0 0 2em;
}
- #navigation ul, ul#edu-navigation, #fsf-links ul {
- text-align: center;
- }
- li#more-links {
- float: none;
- margin-left: 2em;
- }
+
+ #languages { margin-top: 8em; }
}
@@ -598,27 +481,37 @@
/*************/
#content {
- padding: 0 3%;
+ padding: 1px 3% 0;
margin-bottom: 3em;
}
-/** Navigation; see also education.css **/
+/** Navigation **/
.breadcrumb, .edu-breadcrumb {
-/* font-size: .94em; */
+ display: inline;
line-height: 1.7em;
- padding: .3em 0 0;
- margin: 0 0 .3em 0;
}
-.breadcrumb, .edu-breadcrumb a { line-height: 1.6em; }
+.breadcrumb img { }
+#content .breadcrumb a[href] img {
+ vertical-align: top;
+ height: 1.5em;
+ padding: .05em;
+ background: none;
+}
+
+.nav {
+ float: left;
+ margin: .4em 1.5em 0 0;
+}
/** Author line after the main heading **/
p.byline {
- font-size: 1.06em; /* 17px - assumes #content > p.byline */
- margin-bottom: 1.5em;
+ font-size: 1.06em;
+ font-size: 1.06rem; /* 17px */
+ margin-bottom: 2em;
}
@@ -626,16 +519,12 @@
.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
- to 50em; */
.reduced-width {
- width: 45em;
+ width: 47em;
max-width: 100%;
margin: 1.5em auto;
}
-/* Columns */
.columns p.inline-block {
display: inline-block;
margin: 0;
@@ -658,12 +547,13 @@
/** Metadata or footnotes at the end of articles **/
.infobox {
- font-size: .94em; /* 15px - assumes #content > .infobox */
+ font-size: .94em;
+ font-size: .94rem; /* 15px */
line-height: 1.3em;
margin: 2.5em 0 0;
}
.infobox h3 {
- font-size: 1.27em; /* 19px - assumes #content > .infobox */
+ font-size: 1.2em; /* 18px */
margin-top: 1.2em;
}
.infobox p {
@@ -682,31 +572,43 @@
/* For the note saying the page is a translation */
.trans-disclaimer {
-/* font-size: .94em; */ /* 15px */
text-align: center;
font-style: italic;
- line-height: 1.7em;
- padding: .3em 3%;
- margin: 0 -3.2%;
+ margin: .5em 0 0;
}
-.trans-disclaimer a {
- display: inline-block;
- line-height: 1.6em;
+.nav ~ .trans-disclaimer {
+ float: right;
+ text-align: right;
+ margin-left: 1.5em;
}
/* For outdated translations */
#outdated {
- font-size: .94em; /* 15px */
+ clear: both;
+ width: 46.6em;
+ max-width: 96%;
text-align: center;
- padding: .5em;
- margin: .8em 0;
+ margin: auto;
+ position: relative;
+ top: .6em;
color: black;
border: .2em solid #fc7;
}
-#outdated p { margin: 0; }
+#outdated p {
+ font-size: .94em; /* 15px */
+ padding: .5em;
+ margin: 0;
+}
+
+#outdated span.hide { display: none; }
+@media (min-width: 45em) {
+ #outdated span.hide { display: inline; }
+}
+
/* For translators notes */
.translators-notes {
+ font-size: 1rem;
clear: left;
line-height: 1.5em;
margin-top: 2em;
@@ -716,8 +618,9 @@
margin: 1.7em 0 1.2em;
border: none;
}
-.translators-notes h3 { font-size: 1.125em; } /* 18px */
-
+.translators-notes h3, .translators-notes > b {
+ font-size: 1.125em; /* 18px */
+}
.translators-notes p, .translators-notes ul, .translators-notes ol {
margin-bottom: 0;
}
@@ -728,14 +631,11 @@
.edu-cases {
font-size: 1.06em; /* 17 px */
- width: 50em; max-width: 100%;
- padding: 0 0 .8em;
+ width: 44.3em; max-width: 100%;
margin: 2em auto;
- border-top: 3px ridge #3465a4;
- border-bottom: 3px ridge #3465a4;
}
.edu-cases ul, .edu-cases ol { margin: 1em 4%; }
-.edu-cases h3 { font-size: 1.3em; }
+.edu-cases h3 { font-size: 1.3em; } /* 22 px */
/** Introduction of malware pages **/
@@ -750,14 +650,15 @@
/***********************/
#mission-statement {
- padding: 2em 3%;
+ padding: .5em 3% 2em;
background: white;
+ border-top: 3px solid #ddd;
}
#mission-statement blockquote {
font-size: .94em; /* 15px */
font-weight: bold;
font-style: italic;
- margin: 0 3% .8em;
+ margin: 1.5em 3% .8em;
}
#mission-statement p { margin: 0; }
#mission-statement img {
@@ -770,17 +671,6 @@
text-align: center;
}
-@media (min-width: 0) {
- #mission-statement {
- padding-top: 1em;
- }
-}
-@media (min-width: 45em) {
- #mission-statement {
- padding-top: 2em;
- }
-}
-
/************/
/* FOOTER */
@@ -791,7 +681,7 @@
padding: 1.5em 3%;
color: #333;
background: #f5f5f5;
- border-top: .1em solid #ddd;
+ border-top: 3px solid #ddd;
}
#footer p, #bottom-notes {
line-height: 1.3em;
@@ -840,6 +730,7 @@
.italic em, .italic cite, .italic i { font-style: normal; }
.center, .c { text-align: center; }
.nocenter { text-align: left; }
+.right-align { text-align: right; margin: 2em 0 2em 10%; }
.underline { text-decoration: underline; }
.nounderline { text-decoration: none; }
.small { font-size: .875em; } /* 16px -> 14px */
@@ -869,8 +760,8 @@
/* H* HEADERS */
/****************/
-h1 { font-size: 2.375em; margin: .5em 0 .9em; padding: .2em 0; } /* 38px */
-h2 { font-size: 2.0em; margin: .5em 0 .9em; padding: .2em 0; } /* 32px */
+h1 { font-size: 2.375em; margin: 1.0em 0 1.0em; } /* 38px */
+h2 { font-size: 2.0em; margin: 1.0em 0 1.0em; } /* 32px */
h3 { font-size: 1.5em; margin: 1.2em 0 .8em; } /* 24px */
.article h3 { font-size: 1.41em; } /* 24px */
h4 { font-size: 1.25em; margin: 1.2em 0 .85em; } /* 20px */
@@ -878,22 +769,20 @@
h5 { font-size: 1.125em; margin: 1em 0 .9em; } /* 18px */
h6 { margin: 1em 0; }
+h2 { clear: both; }
+
h1, h2, h3, h4, h5, h6 { font-weight: bold; }
-/* The default color is too dark for large text in bold font. */
-h3, h4, h5, h6, dt { color: #333; }
+h3, h4, h5, h6 { color: #333; }
-h2#main-heading {
-/*
- padding: .2em 0 .2em .3em;
- border-left: .7em solid #eee;
-*/
- padding: .2em 0;
-}
h3.subheader {
padding-bottom: .2em;
border-bottom: 1px solid #bbb;
}
+h3.footnote {
+ font-size: 1.125em;
+ font-size: 1.125rem; /* 18px */
+}
/** BIG SECTION HEADERS **/
@@ -911,7 +800,7 @@
border-top: .12em solid #e74c3c;
border-bottom: .12em solid #e74c3c;
}
-.article .big-section h3 { font-size: 1.647em; } /* 28px */
+.article .big-section h3 { font-size: 1.65em; } /* 28px */
.big-subsection { margin: 1.5em 0; }
.big-subsection h4 {
@@ -933,7 +822,6 @@
/** HEADERS ON NARROW SCREENS **/
@media (max-width: 30em) { /* 480 px - 1em = 15px */
-/* h2#main-heading { border-left: .4em solid #eee; } */
h1 { font-size: 2em; } /* 30px */
h2 { font-size: 1.73em; } /* 26px */
h3 { font-size: 1.4em; } /* 21px */
@@ -977,7 +865,11 @@
/* Separate description lists from preceding text */
dl { margin: 1.5em 0 0; }
/* separate the "term" from subsequent "description" */
-dt { font-weight: bold; margin: 1em 0; }
+dt {
+ font-weight: bold;
+ color: #333;
+ margin: 1em 0;
+}
/* separate the "description" from subsequent list item
when the final <dd> child is an anonymous box */
dl dd { margin: 1em 3% 1.5em; }
@@ -1018,7 +910,7 @@
/* Can be applied to div or hr. */
.column-limit {
height: .4em;
- width: 10%;
+ width: 10%; min-width: 5em;
margin: 2em auto;
border: none;
background: #bbb; /* default */
@@ -1084,7 +976,7 @@
/*every second line should be shaded */
background: transparent;
}
-.listing .even {
+.listing .even, #content .listing .even a[href] img {
background: #f5f5f5;
}
@@ -1138,22 +1030,6 @@
}
-/***************************************/
-/* TEXT WITH NO BACKGROUND OR BORDER */
-/***************************************/
-
-/* For comments within or at the beginning of an article. Can be used
- with .important or .big. */
-.comment { margin: 1.5em 6%; }
-
-@media (max-width: 30em) {
- .comment { margin: 1.5em 3%; }
-}
-
-/* Note about Free Software Free Society */
-blockquote#fsfs p { padding: .3em 0; }
-
-
/**************************/
/* TEXT WITH BACKGROUND */
/**************************/
@@ -1209,17 +1085,23 @@
/** LAYOUT **/
.announcement, .important {
- padding: .1em 1em .7em;
+ padding: .4em 1.5em;
margin: 1.5em 0;
- background: none;
}
.announcement blockquote { margin: 0; }
-.announcement p, .important p { margin: .5em 0 0; }
+.announcement p, .important p {
+ padding: .4em 0 .5em;
+ margin: 0;
+}
.announcement ul, .important ul { margin: 0 1em; }
-.announcement ul li, .important ul li { margin-top: .5em; }
+.announcement ul li, .important ul li {
+ padding: .3em;
+ margin: 0 3%;
+}
.announcement h3, .important h3 {
- font-size: 1.25em; /* 20px */
- margin: .4em 0;
+ font-size: 1.25em;
+ font-size: 1.25rem; /* 20px */
+ margin: .1em 0 .6em;
}
@@ -1232,6 +1114,22 @@
.important { border-left: .4em solid #fc7; }
+/***************************************/
+/* TEXT WITH NO BACKGROUND OR BORDER */
+/***************************************/
+
+/* For comments within or at the beginning of an article. Can be used
+ with .important or .big. */
+.comment { margin: 1.5em 6%; }
+
+@media (max-width: 30em) {
+ .comment { margin: 1.5em 3%; }
+}
+
+/* Note about Free Software Free Society */
+blockquote#fsfs p { padding: .3em 0; }
+
+
/***********/
/* NOTES */
/***********/
@@ -1381,11 +1279,13 @@
text-decoration-color: #5e93d5;
}
a[href]:visited {
- color: #595959;
- text-decoration-color: #aaa;
+ color: #505050;
+ text-decoration-color: #777;
}
a[href]:active { text-decoration: none; }
+#content a[href] img { background: white; }
+
/* Navigation links */
#gnu-banner > a {
@@ -1400,6 +1300,10 @@
#fsf-support a[href]:visited,
#fssbox a[href]:link,
#fssbox a[href]:visited,
+.breadcrumb a[href]:link,
+.breadcrumb a[href]:visited,
+.edu-breadcrumb a[href]:link,
+.edu-breadcrumb a[href]:visited,
.back a[href]:link,
.back a[href]:visited,
.anchor-reference-id a[href]:link,
@@ -1411,14 +1315,10 @@
#languages a[href]:visited,
#navlinks a[href]:link,
#navlinks a[href]:visited,
-.breadcrumb a[href]:link,
-.breadcrumb a[href]:visited,
-.edu-breadcrumb a[href]:link,
-.edu-breadcrumb a[href]:visited,
-.trans-disclaimer a[href]:link,
-.trans-disclaimer a[href]:visited,
#TOC a[href]:link,
#TOC a[href]:visited,
+.trans-disclaimer a[href]:link,
+.trans-disclaimer a[href]:visited,
.toc a[href]:link,
.toc a[href]:visited,
.toc-inline a[href]:link,
@@ -1471,32 +1371,32 @@
.backtotop {
float: right;
- font-size: 1.2em;
- font-size: 1.2rem;
+ margin: 0 1em;
}
-.backtotop a, #fsf-links .backtotop a {
+.backtotop a {
display: inline-block;
vertical-align: top;
+ font-size: 1.2em;
+ font-size: 1.2rem;
line-height: 1.2em;
- padding: 0 .3em .2em;
+ padding: .2em .5em;
}
.backtotop a span { display: none; }
/** STYLE **/
-.button a, .backtotop a {
+.button a[href], .backtotop a[href] {
text-decoration: none;
background: white;
}
-.button a, .backtotop a, #fsf-links .backtotop a {
+.button a[href], .backtotop a[href] {
color: #049;
border: .1em solid #999;
}
-.button a:hover, .backtotop a:hover, #fsf-links .backtotop a:hover {
+.button a[href]:hover, .backtotop a[href]:hover {
background: #e7f2e2;
border-color: #006400;
}
-#language-link a { color: #333; }
#join-fsf a, #support-the-fsf a.join {
color: #b02500;
@@ -1588,7 +1488,7 @@
font-family: "Noto Sans Display", "Noto Sans", "Liberation Sans",
sans-serif;
}
-#navigation a[href], ul#edu-navigation a[href], #fsf-links a[href] {
+#navigation a[href], ul#edu-navigation a[href] {
font-family: "Dosis", "Noto Sans Display", "Noto Sans", "Liberation Sans",
sans-serif;
}
Index: education.css
===================================================================
RCS file: /webcvs/www/www/server/staging/education.css,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- education.css 9 May 2020 06:40:15 -0000 1.35
+++ education.css 26 May 2020 10:36:22 -0000 1.36
@@ -1,5 +1,5 @@
/* Stylesheet for the section menus of https://www.gnu.org,
-created November 27, 2019.
+created November 27, 2019; last modified May 9, 2020.
This file is in the public domain. */
@@ -7,42 +7,38 @@
/* For CSS3-unaware browsers */
/*******************************/
-#content {
+#content, .reduced-width {
padding-bottom: 0;
- padding-top: 1px;
+ margin-top: 0;
margin-bottom: 0;
}
-.reduced-width {
- padding-bottom: 2em;
- margin: 0 auto;
-}
-.article .reduced-width {
- width: 45em;
- padding-bottom: 0;
-}
+#last-div { padding-bottom: 2em; }
+#side-menu-button {
+ vertical-align: top;
+ margin: 0 1em 0 0;
+}
#navlinks {
display: block;
- padding: .6em 3.2% 1em;
+ padding: .6em 3.2% 1.5em;
margin: 0 -3.2%;
background: #fffdf5;
border-top: 3px solid #ddd;
}
+#navlinks .reduced-width { width: 30em; }
+
#navlinks h3 {
- width: 32em;
- max-width: 100%;
- font-size: 1em;
- padding: 0 .45em 0;
- margin: .5em auto;
+ font-size: 1.06em;
+ padding: 0 .6em;
+ padding: 0 .6rem;
+ margin: .7em 0;
}
#navlinks dl, #navlinks > ul {
font-size: .94em;
line-height: 1.2em;
}
#navlinks dl {
- width: 35em;
- max-width: 100%;
- margin: .7em auto 0;
+ margin: .7em 0 0;
}
#navlinks ul {
margin: 0 0 0 1.5em;
@@ -57,55 +53,72 @@
display: inline-block;
line-height: 1.2em;
padding: .25em .5em;
+ padding: .25em .5rem;
}
#navlinks dl dt.nolink {
- padding: .25em .5em;
- margin: 0 .5em;
-}
-a#sect-menu-button {
- float: right;
- line-height: 1.7em;
- height: 1.5em;
- margin: .3em 0 0 1em;
+ padding: .25em .6em;
+ padding: .25em .6rem;
}
-#sect-menu-button img { height: 100%; }
/*******************/
/* Media queries */
/*******************/
-@media (min-width: 55em) {
+@media (min-width: 57em) {
#content {
position: relative;
- margin-left: 12.1rem;
- }
- .translators-notes {
- padding-bottom: 0;
+ margin-left: 14.1rem;
}
#navlinks {
+ position: absolute;
+ top: 0; right: 100%;
display: inline-block;
- width: 12rem;
+ width: 14rem;
height: 100%;
overflow: auto;
- position: absolute;
- top: 0; right: 100%;
padding: 0;
margin: 0;
border-top: none;
- border-right: 1px solid #bbb;
+ border-right: .1em solid #bbb;
+ }
+ #navlinks h3 {
+ text-align: center;
+ margin: 1em 0 .45em;
}
- #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; }
- #navlinks dt a { padding-left: 1.1em; }
-
- a#sect-menu-button { display: none; }
+ #navlinks dt a { padding-left: 1.1rem; }
+ #navlinks dl dt.nolink { padding-left: 1.2rem; }
+ a#side-menu-button { display: none; }
}
@media (min-width: 60em) {
- #content { margin-left: 14.1rem; }
- #navlinks { width: 14rem; }
+ #content {
+ position: relative;
+ margin-left: 17.1rem;
+ }
+ #navlinks { width: 17rem; }
}
-/* Style: see layout.css. */
+/***********/
+/* Style */
+/***********/
+
+#navlinks a[href]:link,
+#navlinks a[href]:visited {
+ color: #049;
+ text-decoration: none;
+}
+#navlinks li.current > a[href],
+#navlinks li.current > a[href]:hover,
+#navlinks dt.current a[href],
+#navlinks dt.current a[href]:hover {
+ font-style: italic;
+ color: #333;
+ background: #e7f2e2;
+}
+#navlinks, #navlinks a[href] {
+ font-family: "Noto Sans Display", "Noto Sans", "Liberation Sans",
+ sans-serif;
+}
+a#side-menu-button[href] img { background: none; }
Index: education-menu.html
===================================================================
RCS file: /webcvs/www/www/server/staging/education-menu.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- education-menu.html 30 Mar 2020 12:57:37 -0000 1.17
+++ education-menu.html 26 May 2020 10:36:22 -0000 1.18
@@ -1,113 +1,135 @@
<div id="navlinks">
<div class="backtotop">
<hr class="no-display" />
- <a href="#main-heading"><span>MAIN HEADING </span>▲</a>
+ <a href="#content"><span>BACK TO TOP </span>⮝</a>
</div>
- <h3>Education menu</h3>
+<div class="reduced-width">
+ <h3>Education</h3>
<dl>
- <!--#if expr="$REQUEST_URI = /\/education.html/" --><dt class="current">
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-contents/" --><dt
class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/education/education.html#content">Main page</a><span
class="gnun-split"></span>
+ <a href="/education/edu-contents.html#content">Table of contents</a><span
class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
- <a href="/education/education.html#content">Main page</a></dt><!--#endif
-->
- <!--#if expr="$REQUEST_URI = /\/edu-contents/" --><dt class="current">
+ <a href="/education/edu-contents.html#content">Table of
contents</a></dt><!--#endif -->
+ <!--#if expr="$REQUEST_URI = /^\/education\/educ/" --><dt class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a href="/education/edu-contents.html#content">Detailed contents</a><span
class="gnun-split"></span>
+ <a href="/education/education.html#content">Main page</a><span
class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
- <a href="/education/edu-contents.html#content">Detailed
contents</a></dt><!--#endif -->
- <!--#if expr="$REQUEST_URI = /\/edu-cases[^-]*$/" --><dt class="current">
+ <a href="/education/education.html#content">Main page</a></dt><!--#endif
-->
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-cases[^-]/" --><dt
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-cases.html#content">Case studies</a><span
class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
<a href="/education/edu-cases.html#content">Case
studies</a></dt><!--#endif -->
<dd>
<ul>
- <!--#if expr="$REQUEST_URI = /\/edu-cases-argentina[^-]*$/" --><li
class="current">
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-cases-argentina[^-]/"
--><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a
href="/education/edu-cases-argentina.html#content">Argentina</a><span
class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
<a
href="/education/edu-cases-argentina.html#content">Argentina</a><span
class="gnun-split"></span><!--#endif -->
<ul class="inline-list">
- <!--#if expr="$REQUEST_URI = /\/edu-cases-argentina-ecen/" --><li
class="current">
+ <!--#if expr="$REQUEST_URI =
/^\/education\/edu-cases-argentina-ecen/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a
href="/education/edu-cases-argentina-ecen.html#content">ECEN</a><span
class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
<a
href="/education/edu-cases-argentina-ecen.html#content">ECEN</a></li><!--#endif
-->
</ul>
</li>
- <!--#if expr="$REQUEST_URI = /\/edu-cases-india[^-]*$/" --><li
class="current">
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-cases-india[^-]/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-cases-india.html#content">India</a><span
class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
<a href="/education/edu-cases-india.html#content">India</a><span
class="gnun-split"></span><!--#endif -->
<ul class="inline-list">
- <!--#if expr="$REQUEST_URI = /\/edu-cases-india-ambedkar/" --><li
class="current">
+ <!--#if expr="$REQUEST_URI =
/^\/education\/edu-cases-india-ambedkar/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a
href="/education/edu-cases-india-ambedkar.html#content">Ambedkar</a><span
class="gnun-split"></span>
+ <a
href="/education/edu-cases-india-ambedkar.html#content">Ambedkar
Center</a><span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
- <a
href="/education/edu-cases-india-ambedkar.html#content">Ambedkar</a></li><!--#endif
-->
- <!--#if expr="$REQUEST_URI = /\/edu-cases-india-irimpanam/" --><li
class="current">
+ <a
href="/education/edu-cases-india-ambedkar.html#content">Ambedkar
Center</a></li><!--#endif -->
+ <!--#if expr="$REQUEST_URI =
/^\/education\/edu-cases-india-irimpanam/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
- <a
href="/education/edu-cases-india-irimpanam.html#content">Irimpanam</a><span
class="gnun-split"></span>
+ <a href="/education/edu-cases-india-irimpanam.html#content">VHSS
Irimpanam</a><span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
- <a
href="/education/edu-cases-india-irimpanam.html#content">Irimpanam</a></li><!--#endif
-->
+ <a href="/education/edu-cases-india-irimpanam.html#content">VHSS
Irimpanam</a></li><!--#endif -->
</ul>
</li>
</ul>
</dd>
- <!--#if expr="$REQUEST_URI = /\/edu-resources/" --><dt class="current">
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-resources/" --><dt
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-resources.html#content">Resources</a><span
class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --><!--#else --><dt>
<a href="/education/edu-resources.html#content">Resources</a><span
class="gnun-split"></span><!--#endif --></dt>
<dd>
<ul>
- <!--#if expr="$REQUEST_URI = /\/edu-software[^-]*$/" --><li
class="current">
+ <!--#if expr="$REQUEST_URI = /edu-software[^-]/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-software.html#content">Educational
Software</a><span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --><!--#else --><li>
<a href="/education/edu-software.html#content">Educational
Software</a><span class="gnun-split"></span><!--#endif -->
<ul class="inline-list">
- <!--#if expr="$REQUEST_URI = /\/edu-software-gcompris/" --><li
class="current">
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-software-gcompris/"
--><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a
href="/education/edu-software-gcompris.html#content">Gcompris</a><span
class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
<a
href="/education/edu-software-gcompris.html#content">Gcompris</a></li><!--#endif
-->
- <!--#if expr="$REQUEST_URI = /\/edu-software-gimp/" --><li
class="current">
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-software-gimp/"
--><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-software-gimp.html#content">Gimp</a><span
class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
<a
href="/education/edu-software-gimp.html#content">Gimp</a></li><!--#endif -->
- <!--#if expr="$REQUEST_URI = /\/edu-software-tuxpaint/" --><li
class="current">
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-software-tuxpaint/"
--><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-software-tuxpaint.html#content">Tux
Paint</a><span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
<a href="/education/edu-software-tuxpaint.html#content">Tux
Paint</a></li><!--#endif -->
</ul>
</li>
- <!--#if expr="$REQUEST_URI = /\/edu-projects/" --><li class="current">
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-projects/" --><li
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-projects.html#content">Groups &
projects</a><span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
<a href="/education/edu-projects.html#content">Groups &
projects</a></li><!--#endif -->
- <!--#if expr="$REQUEST_URI = /\/edu-free-learning-resources/" --><li
class="current">
+ <!--#if expr="$REQUEST_URI =
/^\/education\/edu-free-learning-resources/" --><li class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-free-learning-resources.html#content">Free
learning resources</a><span class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
<a href="/education/edu-free-learning-resources.html#content">Free
learning resources</a></li><!--#endif -->
</ul>
</dd>
- <!--#if expr="$REQUEST_URI = /\/edu-faq/" --><dt class="current">
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-faq/" --><dt class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-faq.html#content">FAQ</a><span
class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
<a href="/education/edu-faq.html#content">FAQ</a></dt><!--#endif -->
- <!--#if expr="$REQUEST_URI = /\/edu-team/" --><dt class="current">
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-team/" --><dt
class="current">
<!--#echo encoding="none" var="MARK_START" -->
<a href="/education/edu-team.html#content">Our team</a><span
class="gnun-split"></span>
<!--#echo encoding="none" var="MARK_END" --></dt><!--#else --><dt>
<a href="/education/edu-team.html#content">Our team</a></dt><!--#endif -->
+ <dt class="nolink">In depth</dt>
+ <dd>
+ <ul>
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-why/" --><li
class="current">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/education/edu-why.html#content">Why educational institutions
should use and teach free software</a><span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/education/edu-why.html#content">Why educational institutions
should use and teach free software</a></li><!--#endif -->
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-schools/" --><li
class="current">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/education/edu-schools.html#content">Why schools should
exclusively use free software</a><span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/education/edu-schools.html#content">Why schools should
exclusively use free software</a></li><!--#endif -->
+ <!--#if expr="$REQUEST_URI = /^\/education\/edu-system-india/" --><li
class="current">
+ <!--#echo encoding="none" var="MARK_START" -->
+ <a href="/education/edu-system-india.html#content">The education
system in India</a><span class="gnun-split"></span>
+ <!--#echo encoding="none" var="MARK_END" --></li><!--#else --><li>
+ <a href="/education/edu-system-india.html#content">The education
system in India</a></li><!--#endif -->
+ </ul>
+ </dd>
</dl>
</div>
+</div>
</div><!-- for id="content", starts in the include above -->
Index: edu-software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-software.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- edu-software.html 9 May 2020 06:40:15 -0000 1.29
+++ edu-software.html 26 May 2020 10:36:22 -0000 1.30
@@ -1,28 +1,51 @@
-<!--#include virtual="/server/header.html" -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+
+<head>
+<!-- start of server/head-include-1.html -->
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rev="made" href="mailto:address@hidden"; />
+<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
+<meta name="ICBM" content="42.355469,-71.058627" />
+<meta name="DC.title" content="gnu.org" />
+<link rel="stylesheet" type="text/css" href="/reset.css" media="screen" />
+<link rel="stylesheet" type="text/css" href="/mini.css" media="handheld" />
+<link rel="stylesheet" type="text/css" href="layout.css" media="screen" />
+<link rel="stylesheet" type="text/css" href="/print.min.css" media="print" />
+<!-- end of server/head-include-1.html -->
+
+<!-- end of server/header.html -->
<!-- Parent-Version: 1.92 -->
<!-- This page is derived from /server/standards/boilerplate.html -->
+<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
<title>Educational Free Software
- GNU Project - Free Software Foundation</title>
-<link rel="stylesheet" type="text/css" href="/server/staging/education.css"
media="screen" />
+<link rel="stylesheet" type="text/css" href="education.css" media="screen" />
<!--#include virtual="/education/po/edu-software.translist" -->
<!--#include virtual="/server/banner.html" -->
-<a id="sect-menu-button" class="switch" href="#navlinks"><img
- id="sect-menu-icon" height="32"
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
src="/server/staging/layout/sect-menu.png"
- alt="Section menu" /></a>
+ title="Section menu"
+ alt=" [Section menu] " />
+</a>
-<div class="reduced-width">
<p class="breadcrumb">
- <a href="/education/education.html">Education</a> >
- <a href="/education/edu-resources.html">Resources</a> â«
-</p>
-
-<h2 id="main-heading">Educational Free Software</h2>
-<hr class="thin" />
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+ alt="GNU Home" title="GNU Home" /></a> /
+ <a href="/education/education.html">Education</a> /
+ <a href="/education/edu-resources.html">Resources</a> /</p>
+</div>
+<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
+<!--#include virtual="/server/top-addendum.html" -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
+<h2>Educational Free Software</h2>
-<div class="article">
-<p><em>The GNU project maintains a <a
-href="/software/free-software-for-education.html">list of high
+<p><em>The GNU project maintains a
+<a href="/software/free-software-for-education.html">list of high
quality free programs for education at all levels</a> that we
recommend.</em></p>
@@ -50,7 +73,6 @@
<p>The following are the examples that we present:</p>
<!-- begin adding programs in alphabetical order -->
-
<div class="toc-inline">
<p>
<a href="/education/edu-software-gcompris.html">GCompris</a>
@@ -58,7 +80,6 @@
<a href="/education/edu-software-tuxpaint.html">Tux Paint</a>
</p>
</div>
-
<!-- end adding programs -->
<p>Some of the programs presented here, like GCompris, are part of the
@@ -95,7 +116,6 @@
</p></div>
</div>
-</div>
<!--#include virtual="/server/staging/education-menu.html" -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
@@ -116,17 +136,18 @@
to <a href="mailto:address@hidden";>
<address@hidden></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and contributing translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
of this article.</p>
</div>
-<p>Copyright © 2011, 2012, 2016, 2017, 2019, 2020 Free Software
Foundation, Inc.</p>
+<p>Copyright © 2011, 2012, 2016, 2017, 2019, 2020 Free Software
+Foundation, Inc.</p>
<p>This page is licensed under a <a rel="license"
href="http://creativecommons.org/licenses/by-nd/4.0/";>Creative
@@ -136,7 +157,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/05/09 06:40:15 $
+$Date: 2020/05/26 10:36:22 $
<!-- timestamp end -->
</p>
</div>
Index: edu-team.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-team.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- edu-team.html 1 Jan 2020 16:25:43 -0000 1.6
+++ edu-team.html 26 May 2020 10:36:22 -0000 1.7
@@ -1,24 +1,48 @@
-<!--#include virtual="/server/header.html" -->
-<!-- Parent-Version: 1.79 -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+
+<head>
+<!-- start of server/head-include-1.html -->
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rev="made" href="mailto:address@hidden"; />
+<link rel="icon" type="image/png" href="/graphics/gnu-head-mini.png" />
+<meta name="ICBM" content="42.355469,-71.058627" />
+<meta name="DC.title" content="gnu.org" />
+<link rel="stylesheet" type="text/css" href="/reset.css" media="screen" />
+<link rel="stylesheet" type="text/css" href="/mini.css" media="handheld" />
+<link rel="stylesheet" type="text/css" href="layout.css" media="screen" />
+<link rel="stylesheet" type="text/css" href="/print.min.css" media="print" />
+<!-- end of server/head-include-1.html -->
+
+<!-- end of server/header.html -->
+<!-- Parent-Version: 1.92 -->
+<!-- This page is derived from /server/standards/boilerplate.html -->
<!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
-
<title>The Education Team
- GNU Project - Free Software Foundation</title>
-
+<link rel="stylesheet" type="text/css" href="education.css" media="screen" />
<!--#include virtual="/education/po/edu-team.translist" -->
<!--#include virtual="/server/banner.html" -->
-<!--#include virtual="/education/education-menu.html" -->
-<p class="edu-breadcrumb">
-<a href="/education/education.html">Education</a> → The Education Team</p>
-<!--GNUN: OUT-OF-DATE NOTICE-->
-<!--#if expr="$OUTDATED_SINCE" --><!--#else -->
-<!--#if expr="$LANGUAGE_SUFFIX" -->
-<!--#set var="DISABLE_TOP_ADDENDUM" value="no" -->
-<!--#include virtual="/server/top-addendum.html" -->
-<!--#endif -->
-<!--#endif -->
+<div class="nav">
+<a id="side-menu-button" class="switch" href="#navlinks">
+ <img id="side-menu-icon" height="32"
+ src="/server/staging/layout/sect-menu.png"
+ title="Section menu"
+ alt=" [Section menu] " />
+</a>
+
+<p class="breadcrumb">
+ <a href="/"><img src="/graphics/icons/home.png" height="24"
+ alt="GNU Home" title="GNU Home" /></a> /
+ <a href="/education/education.html">Education</a> /</p>
+</div>
+<!--#include virtual="/server/outdated.html" -->
+<div style="clear: both"></div>
+<div id="last-div" class="reduced-width">
<h2>The Education Team</h2>
+<div class="article">
<p>The Education Team was initially created to carry out the task of
building a section within the gnu.org website to specifically address
the importance of using Free Software in the education field. We believe
@@ -78,9 +102,10 @@
around the world who follow the GNU philosophy and have successfully
implemented Free Software, please drop us a note at
<a href="mailto:address@hidden";><address@hidden></a>.</p>
+</div>
-</div><!-- for id="content", starts in the include above -->
-
+</div>
+<!--#include virtual="/server/staging/education-menu.html" -->
<!--#include virtual="/server/footer.html" -->
<div id="footer">
<div class="unprintable">
@@ -100,13 +125,13 @@
to <a href="mailto:address@hidden";>
<address@hidden></a>.</p>
- <p>For information on coordinating and submitting translations of
+ <p>For information on coordinating and contributing translations of
our web pages, see <a
href="/server/standards/README.translations.html">Translations
README</a>. -->
Please see the <a
href="/server/standards/README.translations.html">Translations
-README</a> for information on coordinating and submitting translations
+README</a> for information on coordinating and contributing translations
of this article.</p>
</div>
@@ -120,7 +145,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/01/01 16:25:43 $
+$Date: 2020/05/26 10:36:22 $
<!-- timestamp end -->
</p>
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging layout.css education.css edu...,
Therese Godefroy <=