[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
www/server/staging/nav-bar/test9 edu-software-g...
From: |
Therese Godefroy |
Subject: |
www/server/staging/nav-bar/test9 edu-software-g... |
Date: |
Thu, 08 Oct 2015 16:04:54 +0000 |
CVSROOT: /webcvs/www
Module name: www
Changes by: Therese Godefroy <th_g> 15/10/08 16:04:54
Modified files:
server/staging/nav-bar/test9: edu-software-gcompris.html
edu-software-gimp.html
edu-software-tuxpaint.html
home2.fr.html home5.html
layout7.css software.html
style.rtl.css
Log message:
Give a larger margin to #content to make reading easier, except in
home.html; change transition widths accordingly.
CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gcompris.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-gimp.html?cvsroot=www&r1=1.11&r2=1.12
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home2.fr.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/home5.html?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.102&r2=1.103
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/software.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/style.rtl.css?cvsroot=www&r1=1.5&r2=1.6
Patches:
Index: edu-software-gcompris.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-gcompris.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- edu-software-gcompris.html 7 Oct 2015 10:55:29 -0000 1.16
+++ edu-software-gcompris.html 8 Oct 2015 16:04:53 -0000 1.17
@@ -8,12 +8,12 @@
<!--#include virtual="/education/po/edu-software-gcompris.translist" -->
<style type="text/css" media="screen,print">
<!--
address@hidden (max-width: 55em) {
address@hidden (max-width: 62em) {
#content div.photo { margin-top: 1.6em; }
}
-->
</style>
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<!--#include virtual="/server/banner.html" -->
<div id="education-content">
@@ -131,7 +131,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
<div id="footer">
<div class="unprintable">
@@ -170,7 +170,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/07 10:55:29 $
+$Date: 2015/10/08 16:04:53 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software-gimp.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/edu-software-gimp.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- edu-software-gimp.html 7 Oct 2015 10:55:29 -0000 1.11
+++ edu-software-gimp.html 8 Oct 2015 16:04:53 -0000 1.12
@@ -17,7 +17,7 @@
#content #mani-movie p { margin: .5em 0; }
-->
</style>
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<!--#include virtual="/server/banner.html" -->
<div id="education-content">
@@ -263,7 +263,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
<div id="footer">
<div class="unprintable">
@@ -302,7 +302,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/07 10:55:29 $
+$Date: 2015/10/08 16:04:53 $
<!-- timestamp end -->
</p>
</div>
Index: edu-software-tuxpaint.html
===================================================================
RCS file:
/webcvs/www/www/server/staging/nav-bar/test9/edu-software-tuxpaint.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- edu-software-tuxpaint.html 7 Oct 2015 10:55:29 -0000 1.16
+++ edu-software-tuxpaint.html 8 Oct 2015 16:04:53 -0000 1.17
@@ -14,17 +14,17 @@
width: 100%; padding: 0; margin: 0;
}
#content .stamp p { margin-bottom: 2em; }
address@hidden (max-width: 50em) {
address@hidden (max-width: 62em) {
#content #flowers { width: 14em; float: right; }
}
address@hidden (max-width: 37em) {
address@hidden (max-width: 33em) {
#content #flowers { width: 100%; }
#content .stamp { float: none; margin: auto; }
}
-->
</style>
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<!--#include virtual="/server/banner.html" -->
<div id="education-content">
@@ -218,7 +218,7 @@
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
<div id="footer">
<div class="unprintable">
@@ -257,7 +257,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/07 10:55:29 $
+$Date: 2015/10/08 16:04:53 $
<!-- timestamp end -->
</p>
</div>
Index: home2.fr.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home2.fr.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- home2.fr.html 7 Oct 2015 10:37:28 -0000 1.16
+++ home2.fr.html 8 Oct 2015 16:04:53 -0000 1.17
@@ -16,6 +16,7 @@
<style type="text/css" media="screen">
<!--
+div.inner #content { padding-left: 3%; padding-right: 3%; }
#home:after {
clear: both; content: ""; display: block;
height: 0px; visibility: hidden; width: 0px;
@@ -348,7 +349,7 @@
<p class="unprintable"><!-- timestamp start -->
Dernière mise à jour :
-$Date: 2015/10/07 10:37:28 $
+$Date: 2015/10/08 16:04:53 $
<!-- timestamp end -->
</p>
Index: home5.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/home5.html,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- home5.html 7 Oct 2015 10:37:28 -0000 1.46
+++ home5.html 8 Oct 2015 16:04:53 -0000 1.47
@@ -9,6 +9,7 @@
<style type="text/css" media="screen">
<!--
+div.inner #content { padding-left: 3%; padding-right: 3%; }
#home:after {
clear: both; content: ""; display: block;
height: 0px; visibility: hidden; width: 0px;
@@ -83,7 +84,7 @@
</style>
<!--#include virtual="/server/fs-gang-definitions.html" -->
<!--#include virtual="/po/home.translist" -->
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<!--#include virtual="/server/banner.html" -->
<p class="no-display">GNU is the only operating system developed
specifically to give its users freedom. What is GNU, and what freedom
@@ -285,7 +286,7 @@
</div><!-- /home -->
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
<p id="sisters">The <a href="http://www.fsf.org/">FSF</a> also has sister
organizations in <a href="http://www.fsfe.org">Europe</a>, <a
@@ -325,7 +326,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/07 10:37:28 $
+$Date: 2015/10/08 16:04:53 $
<!-- timestamp end -->
</p>
</div>
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- layout7.css 7 Oct 2015 10:37:28 -0000 1.102
+++ layout7.css 8 Oct 2015 16:04:53 -0000 1.103
@@ -180,15 +180,21 @@
.inner { overflow: hidden; }
-#searcher, #toplinks, #header, #content,
+#searcher, #toplinks, #header,
#mission-statement, #footer {
padding-left: 3%; padding-right: 3%;
}
+#content { padding-left: 10%; padding-right: 10%; }
#content ul#edu-navigation {
+ margin-left: -12.5%; margin-right: -12.5%;
+}
address@hidden (max-width: 40em) {
+ #content { padding-left: 3%; padding-right: 3%; }
+ #content ul#edu-navigation {
margin-left: -3.2%; margin-right: -3.2%;
+ }
}
-
/* Backgrounds */
#searcher, #edu-navigation, #fsf-links {
@@ -399,7 +405,7 @@
margin: 1em 0;
}
#content .note strong { font-size: 1.2em; }
address@hidden (max-width: 45em) {
address@hidden (max-width: 55em) {
#content .note { float: none; margin: auto; }
}
@@ -462,7 +468,7 @@
max-width: 20em;
margin: .3em 0 1em 1.5em;
}
address@hidden (max-width: 46em) {
address@hidden (max-width: 55em) {
#content div.summary {
float: none; max-width: 25em;
margin: auto; margin-top: 2.5em;
@@ -579,7 +585,7 @@
}
#content .photo img { width: 100%; }
address@hidden (max-width: 50em) {
address@hidden (max-width: 62em) {
#content .photo { float: none; margin: auto; }
}
@@ -801,7 +807,7 @@
#fsf-support a:hover { color: black; }
/* Try to optimize the header for narrow screens. */
address@hidden (max-width: 55em) {
address@hidden (max-width: 57em) {
#header #gnu-banner {
clear: both;
padding-top: .6em;
@@ -817,7 +823,7 @@
margin-left: 2em;
}
}
address@hidden (max-width: 35em) {
address@hidden (max-width: 40em) {
#header { font-size: .8em; }
#header #gnu-banner img { bottom: .2em; }
}
@@ -863,7 +869,7 @@
}
#navigation li.active a, #edu-navigation li.active a { color: #333; }
address@hidden (max-width: 50em) {
address@hidden (max-width: 55em) {
#navigation ul, ul#edu-navigation li,
#fsf-links ul { font-size: .9em; }
}
@@ -1089,6 +1095,6 @@
#links { display: none !important; }
/* For older versions of layout. */
-div#backtotop { padding-left: 3%; padding-right: 3%; }
+div#backtotop { padding-left: 3%; padding-right: 3% }
div#backtotop a { margin-top: 1em; }
Index: software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/software.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- software.html 7 Oct 2015 10:55:30 -0000 1.16
+++ software.html 8 Oct 2015 16:04:53 -0000 1.17
@@ -30,23 +30,23 @@
#content #dynamic-duo { float: left; margin: .3em 1.5em 1em 0; } -->
<!--#endif -->
<!--
address@hidden (max-width: 46em) {
address@hidden (max-width: 55em) {
#content #dynamic-duo { display: none; }
} -->
</style>
<!--#include virtual="/server/fs-gang-definitions.html" -->
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<!--#include virtual="/server/banner.html" -->
<h2>GNU Software</h2>
<div class="summary">
<ul>
- <li><strong><a href="/distros/free-distros.html">Wholly free GNU/Linux
Distributions</a></strong></li>
- <li><a href="/distros/distros.html">GNU/Linux Distributions</a></li>
- <li><a href="http://directory.fsf.org/wiki/GNU/">Free Software
Directory</a></li>
- <li><a href="/manual/manual.html">Manuals</a></li>
- <li><a href="/software/devel.html">Development resources</a></li>
- <li><a href="/help/gethelp.html">Get help</a></li>
+ <li><strong dir="ltr"><a href="/distros/free-distros.html">Wholly free
GNU/Linux Distributions</a></strong></li>
+ <li><span dir="ltr"><a href="/distros/distros.html">GNU/Linux
Distributions</a></span></li>
+ <li><span dir="ltr"><a href="http://directory.fsf.org/wiki/GNU/">Free
Software Directory</a><span dir="ltr"></li>
+ <li><span dir="ltr"><a href="/manual/manual.html">Manuals</a><span
dir="ltr"></li>
+ <li><span dir="ltr"><a href="/software/devel.html">Development
resources</a><span dir="ltr"></li>
+ <li><span dir="ltr"><a href="/help/gethelp.html">Get help</a><span
dir="ltr"></li>
</ul>
</div>
@@ -281,7 +281,7 @@
</p>
</div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/nav-bar/test9/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
<!--#include virtual="/server/fs-gang.html" -->
@@ -340,7 +340,7 @@
<p class="unprintable">Updated:
<!-- timestamp start -->
-$Date: 2015/10/07 10:55:30 $
+$Date: 2015/10/08 16:04:53 $
<!-- timestamp end -->
</p>
</div>
Index: style.rtl.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/style.rtl.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- style.rtl.css 7 Oct 2015 11:09:39 -0000 1.5
+++ style.rtl.css 8 Oct 2015 16:04:54 -0000 1.6
@@ -25,7 +25,7 @@
#fsf-frame, #backtotop a {
float: left;
}
address@hidden (max-width: 55em) {
address@hidden (max-width: 57em) {
#fsf-frame #fssbox { float: left; }
#fsf-frame #join-fsf { float: right; }
}
@@ -42,7 +42,7 @@
margin-right: 0; margin-left: 1em
}
#gnu-banner img {
- margin-left: .4em;
+ margin-left: .4em; margin-right: 0;
}
div#backtotop, th.gpl-matrix-license { text-align: left; }
#home .first-column {
@@ -59,7 +59,14 @@
float: left;
margin: .3em 1.5em 1em 0;
}
address@hidden (max-width: 46em) {
- #content .note { float: none; margin: .3em auto 1em auto; }
address@hidden (max-width: 55em) {
+ #content .note { float: none; margin: auto; }
+ #content div.summary {
+ float: none; max-width: 25em;
+ margin: auto; margin-top: 2.5em;
+ }
+}
address@hidden (max-width: 62em) {
+ #content .photo { float: none; margin: auto; }
}
- www/server/staging/nav-bar/test9 edu-software-g...,
Therese Godefroy <=