[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging banner.html body-include-1.h...
|
From: |
Therese Godefroy |
|
Subject: |
www/server/staging banner.html body-include-1.h... |
|
Date: |
Sun, 23 Feb 2020 14:23:27 -0500 (EST) |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 20/02/23 14:23:27
Modified files:
server/staging : banner.html body-include-1.html
body-include-2.html edu-software.html
edu-software.translist layout.css
server/staging/nav-bar/test9: edu-software-tuxpaint.html
footer-text.html
Log message:
translist: toggle with checkbox;
fsf-links & main navbar: control both with #navbar-input;
gnu-banner: minor adjustments.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/banner.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-1.html?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-2.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-software.html?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/edu-software.translist?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/layout.css?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/footer-text.html?cvsroot=www&r1=1.30&r2=1.31
Patches:
Index: banner.html
===================================================================
RCS file: /webcvs/www/www/server/staging/banner.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- banner.html 25 Dec 2019 18:09:10 -0000 1.4
+++ banner.html 23 Feb 2020 19:23:26 -0000 1.5
@@ -2,8 +2,8 @@
<!--#include virtual="/server/staging/head-include-2.html" -->
</head>
<body>
-<div class="inner">
<!--#include virtual="/server/staging/body-include-1.html" -->
+<div class="inner">
<!--#include virtual="/server/staging/body-include-2.html" -->
<div id="content">
<!-- end of server/banner.html -->
Index: body-include-1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-1.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- body-include-1.html 16 Feb 2020 17:22:57 -0000 1.25
+++ body-include-1.html 23 Feb 2020 19:23:26 -0000 1.26
@@ -13,11 +13,12 @@
<input type="hidden" name="group[25]" value="1" />
<input name="cancelURL" type="hidden"
value="https://crm.fsf.org/civicrm/profile?reset=1&gid=31"; />
<input name="_qf_default" type="hidden" value="Edit:cancel" />
- <label for="frmEmail"><a href="//www.fsf.org/fss">Laisvos programinÄs
įrangos palaikytojas</a>:</label>
+ <label for="frmEmail">BoletÃn «<cite><a href="//www.fsf.org/fss">Free
Software
+Supporter</a></cite>»</a> (también en español):</label>
<div>
<input type="text" id="frmEmail" name="email-Primary" size="18"
- value="email address" onfocus="this.value=''"/>
- <input type="submit" name="_qf_Edit_next" value="Prisiregistruokite" />
+ value="dirección de correo" onfocus="this.value=''"/>
+ <input type="submit" name="_qf_Edit_next" value="Suscribirse" />
</div>
</fieldset>
</form>
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-2.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- body-include-2.html 21 Feb 2020 20:04:40 -0000 1.24
+++ body-include-2.html 23 Feb 2020 19:23:26 -0000 1.25
@@ -7,26 +7,33 @@
<a href="/">
<img src="/graphics/heckert_gnu.transp.small.png" height="48"
alt=" [A GNU head] " /><strong>GNU</strong><span
- class="hide">ãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã </span></a><br />
- <span id="fsf-support"><a
href="#mission-statement">ããªã¼ã½ããã¦ã§ã¢ãã¡ã¦ã³ãã¼ã·ã§ã³</a>主å¬</span>
+ id="os"><small>ãªãã¬ã¼ãã£ã³ã°ã»ã·ã¹ãã </small></span></a><br
/>
+ <span id="fsf-support">ÐÑи поддеÑжке
+ <a href="#mission-statement">Фонда Ñвободного
пÑогÑаммного
+обеÑпеÑениÑ</a></span>
</p><!-- /gnu-banner -->
<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=" [Show/hide main menu] " /></label>
+ alt=" [Main menu] "
+ 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=" [Search www.gnu.org] " /></a>
-<!--#if expr="$TRANSLATION_LIST = /<span dir=\"ltr\">/" -->
- <a id="language-button" class="switch" href="#languages">
- <img id="language-icon" height="32"
+<!--#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=" [Languages] " /></a><!--#endif -->
+ alt=" [Translations] "
+ title="Show/Hide language list" />
+ </label>
+<!--#endif -->
</div>
+<div id="language-link" class="button"><a href="#languages">Languages</a></div>
</div><!-- /#header -->
<div style="clear: both"></div>
Index: edu-software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-software.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- edu-software.html 19 Feb 2020 18:57:57 -0000 1.20
+++ edu-software.html 23 Feb 2020 19:23:26 -0000 1.21
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="ja" lang="ja">
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rev="made" href="mailto:address@hidden"; />
@@ -22,10 +22,11 @@
<!--#include virtual="/server/staging/banner.html" -->
<div id="main">
- <a id="sect-menu-button" class="switch" href="#navlinks">
- <img id="sect-menu-icon" height="32"
+<a id="sect-menu-button" class="switch" href="#navlinks">
+<img id="sect-menu-icon" height="32"
src="/server/staging/layout/sect-menu.png"
- alt="Section menu" /></a>
+ alt="Section menu" title="Link to Education menu" /></a>
+
<p class="breadcrumb">
<a href="/education/education.html">Education</a> >
<a href="/education/edu-contents.html">Contents</a> >
@@ -153,7 +154,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/02/19 18:57:57 $
+$Date: 2020/02/23 19:23:26 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software.translist
===================================================================
RCS file: /webcvs/www/www/server/staging/edu-software.translist,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edu-software.translist 15 Jan 2020 19:59:08 -0000 1.1
+++ edu-software.translist 23 Feb 2020 19:23:26 -0000 1.2
@@ -12,7 +12,7 @@
<span dir="ltr">[lt] <a lang="lt" hreflang="lt"
href="/education/edu-software.lt.html">lietuvių</a> </span>
<span dir="ltr">[nl] <a lang="nl" hreflang="nl"
href="/education/edu-software.nl.html">Nederlands</a> </span>
<span dir="ltr">[pl] <a lang="pl" hreflang="pl"
href="/education/edu-software.pl.html">polski</a> </span>
-<span dir="ltr">[pt-br] <a lang="pt-br" hreflang="pt-br"
href="/education/edu-software.pt-br.html">português do
Brasil</a> </span>
+<span dir="ltr">[pt-br] <a lang="pt-br" hreflang="pt-br"
href="/education/edu-software.pt-br.html">português
(Brasil)</a> </span>
<span dir="ltr">[ru] <a lang="ru" hreflang="ru"
href="/education/edu-software.ru.html">ÑÑÑÑкий</a> </span>
<span dir="ltr">[tr] <a lang="tr" hreflang="tr"
href="/education/edu-software.tr.html">Türkçe</a> </span>
<span dir="ltr">[uk] <a lang="uk" hreflang="uk"
href="/education/edu-software.uk.html">ÑкÑаÑнÑÑка</a> </span>
@@ -30,7 +30,7 @@
<link rel="alternate" type="text/html" lang="lt" hreflang="lt"
href="/education/edu-software.lt.html" title="lietuvių" />
<link rel="alternate" type="text/html" lang="nl" hreflang="nl"
href="/education/edu-software.nl.html" title="Nederlands" />
<link rel="alternate" type="text/html" lang="pl" hreflang="pl"
href="/education/edu-software.pl.html" title="polski" />
-<link rel="alternate" type="text/html" lang="pt-br" hreflang="pt-br"
href="/education/edu-software.pt-br.html" title="português do Brasil" />
+<link rel="alternate" type="text/html" lang="pt-br" hreflang="pt-br"
href="/education/edu-software.pt-br.html" title="português (Brasil)" />
<link rel="alternate" type="text/html" lang="ru" hreflang="ru"
href="/education/edu-software.ru.html" title="ÑÑÑÑкий" />
<link rel="alternate" type="text/html" lang="tr" hreflang="tr"
href="/education/edu-software.tr.html" title="Türkçe" />
<link rel="alternate" type="text/html" lang="uk" hreflang="uk"
href="/education/edu-software.uk.html" title="ÑкÑаÑнÑÑка" />
Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/layout.css,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- layout.css 21 Feb 2020 20:04:40 -0000 1.24
+++ layout.css 23 Feb 2020 19:23:26 -0000 1.25
@@ -75,7 +75,7 @@
/* PAGE STRUCTURE
From top to bottom:
- skiplink, #fsf-frame (#join-fsf, #fssbox) [body-include-1.html]
+ skiplink, #fsf-frame (#, #fssbox) [body-include-1.html]
#header (#switches, #gnu-banner, #navigation) [body-include-2.html]
(#edu-navigation / #navlinks in a few pages) [<page>.html]
#content [<page>.html]
@@ -206,7 +206,7 @@
/*** BANNER ***/
-div#gnu-banner { padding: .4em 0; }
+div#gnu-banner { padding: 0; }
@@ -229,10 +229,6 @@
body {
max-width: 74.92em; /* About 1200px */
margin: auto;
-}
-.inner {
- max-width: 74.92em;
- overflow: hidden;
background: white;
border: .1em solid #bbb;
border-top: 3px solid #a42e2b;
@@ -242,6 +238,7 @@
-o-box-shadow: 0 0 5px 5px #bbb;
box-shadow: 0 0 5px 5px #bbb;
}
+.inner { overflow: hidden; }
/**************************************/
@@ -264,34 +261,32 @@
padding: 0 3%;
text-align: center;
}
-#gnu-banner {
+p#gnu-banner {
display: table-cell;
vertical-align: middle;
font-size: 1.875em; /* 30px */
text-align: center;
line-height: 1em;
- padding: .3em 0 .3em 1em;
-}
-/*
-#gnu-banner strong {
- font-weight: normal;
+ padding: .25em 0 .3em 1em;
+ margin: 0;
}
-*/
#gnu-banner img {
+ display: inline-block;
+ vertical-align: middle;
height: 1.5em;
- vertical-align: bottom;
margin: 0 .15em 0 0;
}
-#fsf-support { display: none; }
+#gnu-banner strong { font-weight: normal; }
+#fsf-support { display: none; }
/*** SEARCHER, LANGUAGES & MENU ICONS ***/
#switches {
display: table-cell;
- vertical-align: top;
+ vertical-align: middle;
line-height: 2em;
- padding: .2em 0 0 1em;
+ padding: .3em 0 0;
}
.switch {
display: inline-block;
@@ -307,18 +302,23 @@
margin: 0;
}
-#navbar-input, #outdated-input,
-#navbar-button, #outdated-button {
+#navbar-input, #outdated-input, #language-input,
+#navbar-button, #outdated-button, #language-button {
display: none;
}
+#language-link {
+ display: table-cell;
+ vertical-align: middle;
+}
+
/***************/
/* LANGUAGES */
/***************/
#languages {
- font-size: .9375em; /* 15px */
+ font-size: .94em; /* 15px */
line-height: 1.2em;
padding: .6em 3%;
margin: 0;
@@ -326,8 +326,7 @@
border-top: 3px solid #ddd;
}
#set-language {
- float: right;
- margin: .2em 0 0 1em;
+ margin: .2em 0;
}
#set-language + p {
display: inline-block;
@@ -339,6 +338,7 @@
#translations {
padding: .4em 0;
margin: 0;
+ text-transform: uppercase;
}
#translations p { margin: 0; }
#translations span {
@@ -349,6 +349,7 @@
}
#translations span.original { font-weight: bold; }
#translations span a {
+ display: inline-block;
line-height: 1.2em;
padding: .25em;
}
@@ -359,25 +360,61 @@
/*****************************************/
@media (min-width: 0) {
- .inner { font-size: .94em; }
- #header, #gnu-banner, #switches { display: block; }
+ body { font-size: .94em; }
+ .inner { position: relative; }
+ #header { display: block; }
- #gnu-banner {
- padding: .2em 0;
+ #gnu-banner #os, p#fsf-support { display: none; }
+ p#gnu-banner {
+ display: block;
+ font-size: 2em;
+ padding-left: 0;
margin: 0;
}
- #gnu-banner .hide { display: none; }
-
- #switches { padding: .2em 0; }
+ #gnu-banner img { height: 1.3em; }
+ #gnu-banner strong {
+ display: inline-block;
+ vertical-align: middle;
+ }
+ #switches {
+ display: block;
+ padding: 0
+ }
.switch { margin: 0 3%; }
#navbar-button { display: inline-block; }
- #navigation { height: 3px; }
- #navigation ul { display: none; }
+ #navigation, #fsf-links { height: 3px; }
+ #navigation ul, #fsf-links ul { display: none; }
#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; }
- ul#edu-navigation { display: none; }
+ #language-button { display: inline-block; }
+ #language-link, #languages { display: none; }
+ input#language-input:checked ~ #languages {
+ display: inline-block;
+ position: absolute;
+ top: 6em; left: 0;
+ z-index: 10;
+ overflow: auto;
+ width: auto;
+ text-align: left;
+ padding: .5em 1em;
+ border: .2em solid #bbb;
+ }
+ #translations {
+ display: block;
+ width: auto;
+ columns: 1;
+ }
+ #translations span {
+ display: block;
+ width: auto;
+ }
+ .translations span a {
+ margin: 0;
+ }
#outdated-button {
display: inline-block;
@@ -386,46 +423,54 @@
}
#outdated { display: none; }
#outdated-input:checked ~ #outdated { display: block; }
+
+ ul#edu-navigation { display: none; }
}
@media (min-width: 19.5em) { /* 312px */
#header { display: table; }
+ p#gnu-banner {
+ display: table-cell;
+ font-size: 2.2em;
+ }
+ #switches { display: table-cell;
+ vertical-align: middle;
+ max-width: 4em;
+ padding-top: .3em;
+ }
+}
+@media (min-width: 25em) {
+ #switches { max-width: none; }
+}
- #gnu-banner, #switches { display: table-cell; }
- #gnu-banner { padding: .3em 0; }
- #switches { max-width: 4em; }
- .switch { margin: 0 0 0 .4em; }
+@media (min-width: 30em) {
+ #translations { columns: 2; }
}
@media (min-width: 45em) { /* 720px */
- .inner { font-size: 1em; }
- #gnu-banner { padding-top: .1em; }
- p#gnu-banner img { position: relative; top: .2em; }
- #gnu-banner .hide { display: inline; }
- #fsf-support {
+ body { font-size: 1em; }
+
+ p#gnu-banner { line-height: .7em; }
+ #gnu-banner #os {
display: inline-block;
- line-height: .6em;
- font-size: .5em; /* 13px */
- font-style: italic;
- margin: .3em 0 0;
+ vertical-align: middle;
+ }
+ #fsf-support {
+ display: block;
+ font-size: .4em; /* 13px */
+ margin: 0;
}
#fsf-support a { font-weight: bold; }
- #switches {
- max-width: none;
- text-align: right;
- padding: .2em 0 .2em 1em;
- }
- .switch { margin: 0 0 .4em .5em; }
+ #translations { columns: 3; }
#outdated-button { display: none; }
#outdated { display: block; }
#navbar-button { display: none; }
- #navigation { height: auto; }
- #navigation ul, ul#edu-navigation {
+ #navigation, #fsf-links { height: auto; }
+ #navigation ul, #fsf-links ul, ul#edu-navigation {
display: block;
- text-align: left;
}
}
@@ -435,7 +480,7 @@
font-size: .875em; /* 14px */
width: 94%;
padding: .3em 3%;;
- background: #f3f3f3;
+ background: #f1f1f1;
}
#fssbox { margin: 0; }
#fssbox a { font-weight: bold; }
@@ -444,41 +489,12 @@
display: inline;
white-space: nowrap;
}
- p#join-fsf { margin: 0; }
#join-fsf a {
float: right;
margin: 0 0 0 2em;
}
}
-@media (min-width: 75em) { /* 1200px */
- body {
- max-width: 90em;
- position: relative;
- }
-}
-
-@media (min-width: 90em) { /* 1440px */
- .inner { overflow: visible; }
-
- #language-button { display: none; }
- #languages {
- width: 14rem;
- position: absolute;
- left: 75.7rem;
- padding: .2em 0 .2em .8em;
- top: 7rem;
- border: .1em solid #bbb;
- border-radius: .5em;
- }
- #translations { width: auto; }
- #translations span { width: 13.5rem; }
- #set-language {
- float: none;
- margin: .4em 0;
- }
-}
-
/*************/
/* CONTENT */
@@ -499,10 +515,6 @@
}
.breadcrumb, .edu-breadcrumb a { line-height: 1.6em; }
-@media (min-width: 25em) {
- .breadcrumb a, .edu-breadcrumb a { display: inline-block; }
-}
-
/** Author line after the main heading **/
@@ -1369,6 +1381,8 @@
border-color: #006400;
}
+#language-link a { color: #333; }
+
#join-fsf a, #support-the-fsf a.join {
color: #b02500;
border-color: #b02500;
@@ -1390,7 +1404,7 @@
background: #d9e8f7;
border-color: #049;
}
-#support-the-fsf a.shop {
+#support-the-fsf a.shop, #back-to-top a {
color: #008400;
border-color: #008400;
}
@@ -1458,9 +1472,9 @@
/* 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;
+/* font-size: .9375em; */
line-height: 2em;
- font-weight: bold;
+/* font-weight: bold; */
padding: 0 1.5%;
}
#navigation li, ul#edu-navigation li, #fsf-links li {
@@ -1489,7 +1503,7 @@
float: right;
line-height: 1.9em;
/* For NetSurf 1.2, and maybe a few other browsers. */
- margin: 0 1em 0;
+ margin: .1em 1em 0;
}
/* For standard browsers. */
@media (min-width: 0) {
@@ -1557,10 +1571,13 @@
a[href] { font-family: sans-serif; }
#fsf-frame a[href], #fssbox label, form.header input,
-.button a[href], #header a[href], #fsf-support,
+.button a[href], #header a[href], #fsf-support, #languages, #languages a[href],
#navigation a[href], ul#edu-navigation a[href], #fsf-links a[href],
#navlinks, #navlinks a[href],
-.edu-breadcrumb, .edu-breadcrumb a[href],
-.breadcrumb, .breadcrumb a,
+.edu-breadcrumb, .edu-breadcrumb a[href], .breadcrumb, .breadcrumb a,
.trans-disclaimer, .trans-disclaimer a[href] {
- font-family: "Noto Sans Display", "Noto Sans", "Liberation Sans",
"FreeSans", sans-serif; }
+ font-family: "Noto Sans Display", "Noto Sans", "Liberation Sans",
sans-serif;
+}
+#gnu-banner strong {
+ font-family: "Noto Sans", "Liberation Sans", sans-serif;
+}
Index: nav-bar/test9/edu-software-tuxpaint.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- nav-bar/test9/edu-software-tuxpaint.html 16 Feb 2020 17:22:58 -0000
1.33
+++ nav-bar/test9/edu-software-tuxpaint.html 23 Feb 2020 19:23:27 -0000
1.34
@@ -48,12 +48,11 @@
<!--#include virtual="/server/staging/banner.html" -->
<div id="main">
-<div id="section-menu">
- <a id="sect-menu-button" class="switch" href="#navlinks">
- <img id="sect-menu-icon" height="32"
+<a id="sect-menu-button" class="switch" href="#navlinks">
+<img id="sect-menu-icon" height="32"
src="/server/staging/layout/sect-menu.png"
- alt="Section menu" /></a>
-</div>
+ alt="Section menu" title="Link to Education menu" /></a>
+
<p class="breadcrumb">
<a href="/education/education.html">Education</a> >
<a href="/education/edu-contents.html">Contents</a> >
@@ -267,7 +266,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2020/02/16 17:22:58 $
+$Date: 2020/02/23 19:23:27 $
<!-- timestamp end -->
</p>
</div>
Index: nav-bar/test9/footer-text.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/footer-text.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- nav-bar/test9/footer-text.html 20 Feb 2020 14:36:48 -0000 1.30
+++ nav-bar/test9/footer-text.html 23 Feb 2020 19:23:27 -0000 1.31
@@ -10,7 +10,8 @@
<div style="clear:both"></div>
<!--#if expr="$TRANSLATION_LIST = /<span dir=\"ltr\">/" -->
-<div id="languages">
+<input type="checkbox" id="language-input" tabindex="-1" />
+<div id="languages" class="rounded-corners">
<hr class="no-display" />
<div id="set-language" class="button">
<!--#echo encoding="none" var="language_selector" --><span
@@ -23,7 +24,7 @@
<div id="back-to-top" class="button">
<hr class="no-display" />
- <a href="#navigation"><span>TOP </span>⯅</a>
+ <a href="#header"><span>TOP </span>⯅</a>
</div>
<div id="fsf-links">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- www/server/staging banner.html body-include-1.h...,
Therese Godefroy <=