www/server/staging/nav-bar/test9 layout7.css st...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 15/09/23 15:51:49

Modified files:
        server/staging/nav-bar/test9: layout7.css style.rtl.css 
                                      license-list.html education.html 
                                      education.ar.html 

Log message:
        Fix margin problem with translators notes in education and home; minor 
adjustments.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.98&r2=1.99
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/style.rtl.css?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/license-list.html?cvsroot=www&r1=1.34&r2=1.35
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.html?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/education.ar.html?cvsroot=www&r1=1.4&r2=1.5

Patches:
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- layout7.css 23 Sep 2015 07:41:25 -0000      1.98
+++ layout7.css 23 Sep 2015 15:51:48 -0000      1.99
@@ -63,9 +63,6 @@
    #ff3     yellow: #urgent
    #973e3a  like the GNU-banner, just a bit more subdued: #navigation
    #820202-#f71111: #fs-gang gradient
-   #5b6a96-#c9cccf: #body gradient
-   #5b6a96  fallback from gradient (intermediate between banner blue and
-            #c9cccf)
 
 Borders
    black, #111, #333, #666: tables
@@ -163,7 +160,7 @@
 /*** MAIN DIVS ***/
 
 /* Width (class inner throughout the page) */
-.inner { padding: 0 3%; }
+.inner { margin: 0 3%; }
 
 #searcher, #translations, #header, #footer,
  #navigation, ul#edu-navigation, #fsf-links {
@@ -232,6 +229,26 @@
 
 .netscape4, .no-display { display: none !important; }
 
+.button a, .button a:visited {
+   color: #971611;
+   text-decoration: none;
+}
+.button a:hover {
+   color: #777;
+}
+.large a {
+   display: inline-block;
+   font-family: "FreeSans", sans-serif;
+   font-size: 1.6em;
+   line-height: 1.3em;
+   padding: .1em .4em;
+   background-color: #e7e9eb;
+   border: .4em solid #c9cccf;
+}
+.small {
+   font-size: 1.6em;
+   background-color: #e7e9eb;
+}
 
 /*** SPECIAL FEATURES ***/
 
@@ -492,6 +509,8 @@
 #navigation, #fsf-links {
    clear: both;
 }
+#fsf-links { margin-top: 2.5em; }
+
 #navigation ul, #fsf-links ul { margin: 0; }
 ul#edu-navigation { margin-top: 0; margin-bottom: 0; }
 
@@ -540,6 +559,7 @@
     #fsf-links ul { font-size: .9em; } 
 }
 
+
 /*** TAGS ***/
 
 div.page-tags {
@@ -567,7 +587,6 @@
    padding: 0;
    margin: 1em 0;
    color: #334683; text-shadow: #999 1px 1px 0;
-   
 }
 #content h1 { font-size: 2.4em; }
 #content h2 { font-size: 2em; }
@@ -596,7 +615,8 @@
    text-align: right;
    font-weight: bold;
    line-height: 1.5em;
-   padding: .4em 2%;
+   padding: 0 2%;
+   margin-top: 2em;
 }
 #content p.back a, .back a:visited { color: #333; }
 #content p.back a:hover { color: #777; }
@@ -604,7 +624,6 @@
 
 /*** FSF STUFF ***/
 
-#fsf-links { margin-top: 2.5em }
 #mission-statement { margin: 2em 0 1em 0; }
 
 #mission-statement {
@@ -658,7 +677,6 @@
    clear: both; content: ""; display: block;
    height: 0px; visibility: hidden; width: 0px;
 }
-
 #home .first-column {
    width: 60%;
    float: left;
@@ -685,41 +703,29 @@
 #home .button {
    text-align: center;
    font-weight: bold;
-   margin-top: 2em; margin-bottom: 2.3em;
-}
-.button a, .button a:visited {
-   color: #971611;
-   text-decoration: none;
-}
-.button a:hover {
-   color: #777;
-}
-.large a {
-   display: inline-block;
-   font-family: "FreeSans", sans-serif;
-   font-size: 1.6em;
-   line-height: 1.3em;
-   padding: .1em .4em;
-   background-color: #e7e9eb;
-   border: .4em solid #c9cccf;
+   margin-top: 2em; margin-bottom: 2.5em;
 }
-.small {
-   font-size: 1.6em;
-   background-color: #e7e9eb;
+#home .emph-box {
+   padding-bottom: .7em;
+   border-top-left-radius: 2em;
+   border-top-right-radius: 2em;
+   -moz-border-top-left-radius: 2em;
+   -moz-border-top-right-radius: 2em;
+   -khtml-border-top-left-radius: 2em;
+   -khtml-border-top-right-radius: 2em;
+   -webkit-border-top-left-radius: 2em;
+   -webkit-border-top-right-radius: 2em;
+   -opera-border-top-left-radius: 2em;
+   -opera-border-top-right-radius: 2em;
 }
-
 #home .emph-box p { font-size: .9em; }
 
 #Action {
    text-align: left;
    padding: 0 1em;
-   margin-bottom: 2.5em;
+   margin: 2.5em 0;
    border-left: .4em solid #b9bcbf; border-right: .4em solid #b9bcbf;
 }
-
-h2#Action {
-   text-align: center;
-}
 #Action h2 {
    float: none;
    text-align: center;
@@ -753,7 +759,7 @@
 }
 
 .emph-box {
-   padding: 0 1em; margin-bottom: 2.5em;
+   padding: 0 1em;
    background-color: #f0f2f4;
    border: 1px solid #c9cccf;
 }
@@ -761,18 +767,7 @@
    text-align: center;
    font-size: 1.5em;
 }
-#home .emph-box {
-   border-top-left-radius: 2em;
-   border-top-right-radius: 2em;
-   -moz-border-top-left-radius: 2em;
-   -moz-border-top-right-radius: 2em;
-   -khtml-border-top-left-radius: 2em;
-   -khtml-border-top-right-radius: 2em;
-   -webkit-border-top-left-radius: 2em;
-   -webkit-border-top-right-radius: 2em;
-   -opera-border-top-left-radius: 2em;
-   -opera-border-top-right-radius: 2em;
-}
+
 
 /*** NOTES AND ANNOUNCEMENTS ***/
 
@@ -895,20 +890,15 @@
    padding: .7em 3%;
    margin-top: 1.5em;
    background-color: #f0f2f4;
-   border-top: .2em solid #b9bcbf;
-   border-left: .2em solid #b9bcbf;
-   border-right: .2em solid #b9bcbf;
-   border-bottom: .4em solid #b9bcbf;
-   border-top-left-radius: 3em;
-   border-top-right-radius: 3em;
-   -moz-border-top-left-radius: 3em;
-   -moz-border-top-right-radius: 3em;
-   -khtml-border-top-left-radius: 3em;
-   -khtml-border-top-right-radius: 3em;
-   -webkit-border-top-left-radius: 3em;
-   -webkit-border-top-right-radius: 3em;
-   -opera-border-top-left-radius: 3em;
-   -opera-border-top-right-radius: 3em;
+   border-left: 1em solid #b9bcbf;
+   border-right: 1em solid #b9bcbf;
+   border-top: 1px solid #b9bcbf;
+   border-bottom: 1px solid #b9bcbf;
+   border-radius: 3em;
+   -moz-border-radius: 3em;
+   -khtml-border-radius: 3em;
+   -webkit-border-radius: 3em;
+   -opera-border-radius: 3em;
 }
 #outdated p {
    margin: 0.2em 0;
@@ -920,8 +910,14 @@
 #outdated a:hover { color: #777; }
 
 /* For translators notes */
-#content .translators-notes { clear: both; font-size: .9em; }
-#content .translators-notes hr { margin-top: 1.65em; }
+#content .translators-notes {
+   clear: both;
+   font-size: .9em; margin-top: 2.2em;
+}
+#content .translators-notes hr {
+   width: 20em;
+   text-align: left; margin-left: 0 !important;
+}
 
 
 /*** EDUCATION ***/

Index: style.rtl.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/style.rtl.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- style.rtl.css       14 Sep 2015 17:08:59 -0000      1.2
+++ style.rtl.css       23 Sep 2015 15:51:48 -0000      1.3
@@ -56,11 +56,14 @@
    border-left: 0;
    border-right: .5em solid #b9bcbf;
 }
-#content .note, #content div.summary #content div.photo {
+#content .note, #content div.summary, #content div.photo {
    clear: left;
    float: left;
    margin: .3em 1.5em 1em 0;
 }
+#content .translators-notes hr {
+   text-align: right; margin-right: 0 !important;
+}
 @media (max-width: 46em) {
    #content .note { float: none; margin: .3em auto 1em auto; }
 }

Index: license-list.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/license-list.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- license-list.html   7 Sep 2015 22:11:16 -0000       1.34
+++ license-list.html   23 Sep 2015 15:51:49 -0000      1.35
@@ -8,6 +8,7 @@
 <!--
 /* These statements are commented out in HTML to
    make them untranslatable.  */
+#content p.back { margin-top: 3em; }
 /* Definitions for color-coded border */
 #content dl.green, #content dl.orange,
  #content dl.red, #content dl.blue, #content dl.purple {
@@ -31,16 +32,13 @@
 }
 #content div#legend {
    float: right;
-   width: 18.4em;
+   width: auto; max-width: 100%;
    font-style: normal;
    padding: 0 1em 1em 1em;
-   margin: 2.5em 0 1.5em 1.5em;
+   margin: 2.5em 1.5em 1.5em 1.5em;
    background: #f0f2f4;
    border: 1px solid #c9cccf;
 }
address@hidden (max-width: 50em) {
-   #content div#legend { float: none; width: 40em; max-width: 80%; margin: 2em 
auto 0 auto; }
-}
 
 #content div#legend dl { margin: 1em 0 0 0; }
 #content div#legend dt { padding: 1em 0; margin: 0; }
@@ -79,7 +77,7 @@
 #legend dl.blue dt:after { content: "Licenses for works stating a viewpoint"; }
 </style>
 
-<!--#include virtual="/server/staging/nav-bar/test9/banner.html" -->
+<!--#include virtual="/server/banner.html" -->
 <h2 class="c">Various Licenses and Comments about&nbsp;Them</h2>
 
 <div class="toc">
@@ -864,6 +862,18 @@
 common, and widely recognized in the free software community.</p></dd>
 
 
+<dt><a id="UniversalPermissiveLicense" 
href="http://directory.fsf.org/wiki/License:Universal_Permissive_License";>
+    Universal Permissive License (UPL)</a>
+    <span class="anchor-reference-id">
+       (<a href="#UPL">#UPL</a>)</span></dt>
+<dd>
+<p>This is a lax, permissive non-copyleft free software license, compatible
+with the GNU GPL. The license does provide the ability to license
+patents along with the software work, however, we still recommend the
+Apache 2.0 license for avoiding patent treachery when choosing to put
+your work under a lax license.
+</p></dd>    
+
 <dt><a id="Unlicense" 
href="http://directory.fsf.org/wiki/License:TheUnlicense";>
     The Unlicense</a>
     <span class="anchor-reference-id">
@@ -2547,12 +2557,10 @@
 <p>3D-printer plans for decorative objects are artistic works; any of the
 Creative Commons licenses is ok for them.</p>
 
-<hr class="separator" />
-
 
-<p class="back"><strong><a href="/licenses/licenses.html">More about 
licenses</a></strong></p>
+<p class="back"><a href="/licenses/licenses.html">More about licenses</a></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" -->
 <div id="footer">
 <div class="unprintable">
 
@@ -2590,7 +2598,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/07 22:11:16 $
+$Date: 2015/09/23 15:51:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- education.html      22 Sep 2015 10:55:34 -0000      1.27
+++ education.html      23 Sep 2015 15:51:49 -0000      1.28
@@ -9,35 +9,32 @@
 <!--#include virtual="/education/po/education.translist" -->
 <style type="text/css" media="screen">
 <!--
+#content #education:after {
+   clear: both; content: ""; display: block;
+   height: 0px; visibility: hidden; width: 0px;
+}
 #content #video-container {
    float: left; max-width: 40em;
    margin: 1em 0 0 0;
 }
 #content #video-container p { text-align: justify; }
 #rms-movie { width: 100%; margin-bottom: .3em; }
-#content #indepth {
-   text-align: left;
-   margin: 1em 0 2em 1em; 
-}
-#content #indepth ul {
-   padding: 0 1em;
-   margin-top: 0;
-}
+#content #indepth { text-align: left; margin: 1em 0 0 1em; }
+#content #indepth ul { padding: 0 1em; margin-top: 0; }
 #content #indepth li { padding-bottom: 1em; }
 #content #indepth h3 { padding: 1em; margin: 0; }-->
 <!--#if expr="$LANGUAGE_SUFFIX = /\\.(ar|fa|he)/" -->
 <!--
-#content #indepth { text-align: right; }
+#content #indepth { text-align: right; margin: 1em 1em 0 0; }
 #content #video-container { float: right; } -->
 <!--#endif -->
 <!--
 @media (max-width: 68em) {
-   #content #video-container {
-      float: none; width: 40em; max-width: 100%;
-      margin: 2em auto; }
-   #content #indepth {
-      float: none; width: 39.5em; max-width: 98%;
-      margin: 2.5em auto; }
+   #content #video-container, #content #indepth {
+      float: none; margin: 2em auto 0 auto ;
+   }
+   #content #video-container { width: 40em; max-width: 100%; }
+   #content #indepth { width: 39.5em; max-width: 98%; }
 }
 -->
 </style>
@@ -114,7 +111,8 @@
 explains briefly and to the point the principles of Free Software and 
 how they connect to education.</p>
 
-<div id="video-container" class="imgleft">
+<div id="education">
+<div id="video-container">
 <!-- GNUN: localize URL /education/rms-education-es.ogv -->
 <video  id="rms-movie" controls="controls">
   <source
@@ -168,10 +166,10 @@
 <a href="/education/edu-system-india.html">education system in India.</a></li>
 </ul>
 </blockquote>
-
+</div> <!-- /#education -->
 </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">
 
@@ -210,7 +208,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2015/09/22 10:55:34 $
+$Date: 2015/09/23 15:51:49 $
 <!-- timestamp end -->
 </p>
 </div>

Index: education.ar.html
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/education.ar.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- education.ar.html   15 Sep 2015 21:25:56 -0000      1.4
+++ education.ar.html   23 Sep 2015 15:51:49 -0000      1.5
@@ -16,40 +16,32 @@
 <!--#include virtual="/education/po/education.translist" -->
 <style type="text/css" media="screen">
 <!--
+#content #education:after {
+   clear: both; content: ""; display: block;
+   height: 0px; visibility: hidden; width: 0px;
+}
 #content #video-container {
    float: left; max-width: 40em;
-   margin: 1em 0 2em 0;
-}
-#content #video-container p {
-   text-align: justify;
-   padding: 1em; margin: 0;
-   background-color: #f0f2f4;
-   border: 1px solid #c9cccf;
+   margin: 1em 0 0 0;
 }
+#content #video-container p { text-align: justify; }
 #rms-movie { width: 100%; margin-bottom: .3em; }
-#content #indepth {
-   text-align: left;
-   margin: 1em 0 2em 1em; 
-}
-#content #indepth ul {
-   padding: 0 1em;
-   margin-top: 0;
-}
+#content #indepth { text-align: left; margin: 1em 0 0 1em; }
+#content #indepth ul { padding: 0 1em; margin-top: 0; }
 #content #indepth li { padding-bottom: 1em; }
 #content #indepth h3 { padding: 1em; margin: 0; }-->
 <!--#if expr="$LANGUAGE_SUFFIX = /\\.(ar|fa|he)/" -->
 <!--
-#content #indepth { text-align: right; }
+#content #indepth { text-align: right; margin: 1em 1em 0 0; }
 #content #video-container { float: right; } -->
 <!--#endif -->
 <!--
 @media (max-width: 68em) {
-   #content #video-container {
-      float: none; max-width: 100%;  width: 40em;
-      margin: 2em auto; }
-   #content #indepth {
-      float: none; width: 39.5em; max-width: 98%;
-      margin: 2.5em auto; }
+   #content #video-container, #content #indepth {
+      float: none; margin: 2em auto 0 auto ;
+   }
+   #content #video-container { width: 40em; max-width: 100%; }
+   #content #indepth { width: 39.5em; max-width: 98%; }
 }
 -->
 </style>
@@ -84,7 +76,7 @@
 <h2>البرمجيات الحرة والتعليم</h2>
 </div>
 
-<blockquote class="note" id="free-games"><p>
+<blockquote class="note"><p>
 نبحث عن ألعاب تعليمية حرة، أو ألعاب يمكن 
إستخدامها لأغراض تعليمية. راسلنا
 <a href="mailto:address@hidden";>&lt;address@hidden&gt;</a>
 </p></blockquote>
@@ -118,7 +110,10 @@
 href="http://www.fsf.org/about/leadership/#rms";> ريتشارد ستالمان 
Richard
 Stallman</a> بإختصار وفي صميم الموضوع مبادئ 
البرمجيات الحرة وكيفترتبط
 بالتعليم.</p>
+
+<div id="education">
 <div id="video-container">
+
 <!-- GNUN: localize URL /education/rms-education-es.ogv -->
 <video  id="rms-movie" controls="controls">
   <source
@@ -126,14 +121,14 @@
     type='video/ogg; codecs="theora, vorbis"' />
 </video>
 
-<p>
+<div class="emph-box"><p>
  
 <!-- TRANSLATORS: Please replace the link to the video with subtitles in
      English with a link to the video with subtitles in your language, 
      if it exists. -->
 <a href="http://audio-video.gnu.org/video/rms-education-es-high-sub.en.ogv";>
 نزل و شاهد هذا المقطع</a>  بدقة وضوع أعلى  في 
صيغة <span dir="ltr">Ogg
-Theora (ogv)</span> الحرة.<span class="gnun-split"></span>
+Theora (ogv)</span> الحرة.
 
 <!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. -->
@@ -144,7 +139,7 @@
 <a 
href="/education/misc/rms-education-es-transcription.txt">بالأسبانية</a>,
 وأيضاً <a 
href="/education/misc/edu-misc.html#transcription-rms-education">
 لغات أخرى</a>. 
-<span class="gnun-split"></span>
+
 
 <!-- TRANSLATORS: please add the link to your language here in the first 
      place, followed by a comma. -->
@@ -153,10 +148,11 @@
 href="/education/misc/rms-education-es-sub.en.srt">بالإنجليزية</a>, 
<a
 href="/education/misc/rms-education-es-sub.es.srt">بالأسبانية</a>, 
وأيضاً <a
 href="/education/misc/edu-misc.html#subtitles-rms-education"> لغات 
أخرى</a>. 
-</p>
-</div> <!-- /video-container -->
-
+</p></div> 
+<!-- /.emph-box -->
+</div> 
 
+<!-- /#video-container -->
 <blockquote class="note" id="indepth">
 <h3>في العمق</h3>
 
@@ -172,8 +168,10 @@
 href="/education/edu-system-india.html"> النظام التعليمي في 
الهند. </a></li>
 </ul>
 </blockquote>
+</div> <!-- /education -->
 
 <div class="translators-notes">
+
 <!--TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.-->
  </div>
 </div>
@@ -227,7 +225,7 @@
 <p class="unprintable"><!-- timestamp start -->
 حُدثت:
 
-$Date: 2015/09/15 21:25:56 $
+$Date: 2015/09/23 15:51:49 $
 
 <!-- timestamp end -->
 </p>