www/server/staging/ghm2016 edu-resources.html e...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 16/08/06 07:01:33

Modified files:
        server/staging/ghm2016: edu-resources.html edu-software.html 
                                education.html layout-rsd.css 

Log message:
        Fix .edu-note.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/edu-resources.html?cvsroot=www&r1=1.4&r2=1.5
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/edu-software.html?cvsroot=www&r1=1.3&r2=1.4
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/education.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/layout-rsd.css?cvsroot=www&r1=1.19&r2=1.20

Patches:
Index: edu-resources.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/edu-resources.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- edu-resources.html  4 Aug 2016 13:55:14 -0000       1.4
+++ edu-resources.html  6 Aug 2016 07:01:33 -0000       1.5
@@ -3,13 +3,6 @@
 <!--#set var="DISABLE_TOP_ADDENDUM" value="yes" -->
 <title>Free Educational Resources
 - GNU Project - Free Software Foundation</title>
-<style type="text/css" media="screen">
-<!--
-.edu-note {
-   width: 45em; max-width: 100%;
-   margin: 2em auto;
-}
-</style>
 <!--#include virtual="/education/po/edu-resources.translist" -->
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link rel="stylesheet" href="/combo.css" media="screen" />
@@ -36,7 +29,7 @@
 
 <h3>Educational Free Software</h3>
 
-<p class="text-left">In our <a href="/education/edu-software.html">Educational 
+<p>In our <a href="/education/edu-software.html">Educational 
 Free Software</a> section we present some examples of how free programs 
 are being used by educational institutions around the world and how they
 are putting into practice the four freedoms that Free Software grants to 
@@ -184,7 +177,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/08/04 13:55:14 $
+$Date: 2016/08/06 07:01:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: edu-software.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/edu-software.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- edu-software.html   4 Aug 2016 13:55:13 -0000       1.3
+++ edu-software.html   6 Aug 2016 07:01:33 -0000       1.4
@@ -4,13 +4,6 @@
 
 <title>Educational Free Software
 - GNU Project - Free Software Foundation</title>
-<style type="text/css" media="screen">
-<!--
-.edu-note {
-   width: 45em; max-width: 100%;
-   margin: 2em auto;
-}
-</style>
 <!--#include virtual="/education/po/edu-software.translist" -->
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <link rel="stylesheet" href="/combo.css" media="screen" />
@@ -146,7 +139,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/08/04 13:55:13 $
+$Date: 2016/08/06 07:01:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/education.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- education.html      4 Aug 2016 13:55:13 -0000       1.5
+++ education.html      6 Aug 2016 07:01:33 -0000       1.6
@@ -9,7 +9,7 @@
 <!--#include virtual="/education/po/education.translist" -->
 <style type="text/css" media="screen">
 <!--
-#video-container, .edu-note {
+#video-container {
    width: 40em; max-width: 100%;
    margin: 2em auto;
 }
@@ -17,7 +17,7 @@
 #rms-movie { width: 100%; }
 
 @media (min-width: 48em) {
-  .edu-note {
+   #content .edu-note {
       float: right;
       max-width: 40%;
       margin: 3.2em 0 2.5em 1.5em;
@@ -26,7 +26,7 @@
 <!--#if expr="$LANGUAGE_SUFFIX = /[.](ar|fa|he)/" -->
 <!--
 @media (min-width: 48em) {
-  .edu-note {
+   #content .edu-note {
       float: left;
       margin: 3.4em 1.5em 2.5em 0;
    }
@@ -193,7 +193,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/08/04 13:55:13 $
+$Date: 2016/08/06 07:01:33 $
 <!-- timestamp end -->
 </p>
 </div>

Index: layout-rsd.css
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/layout-rsd.css,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- layout-rsd.css      5 Aug 2016 16:59:06 -0000       1.19
+++ layout-rsd.css      6 Aug 2016 07:01:33 -0000       1.20
@@ -550,7 +550,7 @@
 /* One <p> only */
 .note, .edu-note {
    max-width: 100%;
-   margin: 0 auto;
+   margin: 2em auto;
 }
 .note p, .edu-note p {
    text-align: center;