www/server/staging/ghm2016 home-ghm-rsd.html la...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 16/07/25 17:25:33

Modified files:
        server/staging/ghm2016: home-ghm-rsd.html layout-rsd.css 

Log message:
        Add a GNUN marker for translators notes in home.html; more adjustments 
to notes, announcements, etc.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/home-ghm-rsd.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/layout-rsd.css?cvsroot=www&r1=1.10&r2=1.11

Patches:
Index: home-ghm-rsd.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/home-ghm-rsd.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- home-ghm-rsd.html   22 Jul 2016 19:50:44 -0000      1.7
+++ home-ghm-rsd.html   25 Jul 2016 17:25:32 -0000      1.8
@@ -9,10 +9,8 @@
 
 <style type="text/css" media="print,screen">
 <!--
-.first-column, .second-column { margin: 0; padding: 0; }
-#home:after {
-   clear: both; content: ""; display: block;
-   height: 0px; visibility: hidden; width: 0px;
+#content {
+   margin-bottom: 0 !important;
 }
 #home h2 {
    color: #333;
@@ -53,10 +51,6 @@
    text-align: justify;
    border-color: #e74c3c;
 }
-#content #mission-statement a[href^="http://"]:after,
- #content #mission-statement a[href^="https://"]:after {
-   content:"";
-}
 #fsfbanner {
    width: 18em;
    max-width: 100%;
@@ -68,11 +62,11 @@
    height: auto;
    margin: .4em 0;
 }
-p.back {
-   margin-bottom: 0;
+.first-column p.back, .translators-notes {
+   margin-bottom: 2.3em;
 }
 .emph-box p.back {
-   margin-top: 1em;
+   margin: 1em 2% 0;
 }
 .emph-box.white {
    margin: 2.3em 0;
@@ -93,8 +87,20 @@
    -webkit-border-radius: .4em;
    -opera-border-radius: .4em;
 }
-#content #backtotop { margin: 0 5%; }
-.translators-notes { display: none; }
+
+#home-footer {
+   font-size: .9em;
+   padding: 1.5em 3% 1.7em;
+   color: #333;
+}
+#home-footer p {
+   margin: 0;
+}
+#home-footer div.unprintable,
+ #home-footer .translators-credits {
+   margin-bottom: .7em;
+}
+
 
 @media (min-width: 62em) {
    .first-column {
@@ -264,6 +270,7 @@
 <p class="back"><a href="/gnu/gnu.html">More information</a></p>
 
 </div><!-- /first-column -->
+<!-- GNUN MARKER FOR TRANSLATORS' NOTES <div id-"footer"> -->
 <div class="second-column">
 
 <div id="Flashes" class="emph-box white">
@@ -341,9 +348,8 @@
   <a href="/software/powerguru/">powerguru</a><span class="gnun-split"></span>.
 See the package web pages for more information.</p>
 </div>
-
+<p class="back" id="backtotop"><a href="#header">BACK TO TOP</a></p>
 </div><!-- /second-column -->
-<p id="backtotop"><a href="#header">Back to top</a></p>
 </div><!-- /home -->
 
 </div><!-- for id="content", starts in the include above -->
@@ -371,7 +377,7 @@
  </ul>
 </div><!-- /fsf-links -->
 
-<div id="footer">
+<div id="home-footer">
 <div class="unprintable">
 
 <p>Please send general FSF &amp; GNU inquiries to
@@ -427,7 +433,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/07/22 19:50:44 $
+$Date: 2016/07/25 17:25:32 $
 <!-- timestamp end -->
 </p>
 </div>

Index: layout-rsd.css
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/layout-rsd.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- layout-rsd.css      22 Jul 2016 19:50:44 -0000      1.10
+++ layout-rsd.css      25 Jul 2016 17:25:32 -0000      1.11
@@ -210,7 +210,7 @@
 
 p, pre { margin-top: 1em; }   /* In combo.css: margin-bottom:1em. */
 address { margin-bottom: 1em; }
-ul, ol, blockquote { margin-left: 1.5%; margin-right: 1.5%; }
+ul, ol, blockquote { margin: 0 1.5%; }
 
 /* Lists of underlined links are difficult to read. The top margin
    gives a little more spacing between entries. */
@@ -219,7 +219,6 @@
 ul li p, ul li pre, ul ul li, ul li blockquote {
    margin-top: .3em; margin-bottom: 0;
 }
-ul ul, ol ul, table ul { margin-top: 0; margin-bottom: 0; }
 table li { margin-top: .2em; margin-bottom: .2em; }
 
 /* Separate description lists from preceding text */
@@ -279,7 +278,6 @@
 .noitalic, .italic em, .italic cite, .italic i {
    font-style: normal;
 }
-
 .inline-list li { display: inline }
 ul.no-bullet { list-style: none; }
 
@@ -412,22 +410,29 @@
 
 /*** NON-FLOATING INSETS AND HIGHLIGHTED STUFF ***/
 
+/** WITH BACKGROUND **/
+
+/* Strip the bottom margins of p and pre (NetSurf leaves the bottom margin
+   of the last element outside the parent div). */
+div.highlight-para > p, div.highlight-para > pre,
+ div.emph-box > p, div.emph-box > pre,
+ .lyrics > p { margin-bottom: 0; }
+
+/* Strip the top margin of the first element to avoid adjusting the padding
+   in each particular case. */
+div.highlight-para > *:first-child, 
+ div.emph-box > *:first-child,
+ .lyrics > *:first-child { margin-top: 0; }
+
 /* .highlight doesn't have a border. It can be applied to in-line elements.
    .highlight-para and .emph-box have borders. They are used for block 
elements.
    highlight-para can be used next to .note or .summary because it only has top
    and bottom borders. */
 
-.highlight-para, p.highlight, pre.emph-box, p.emph-box, pre.emph-box {
-   padding: .6em 1.2em;
-}
 div.highlight-para, div.emph-box { padding: 1.2em; }
 
-/* Strip the top and bottom margins to avoid uneven spacing between text and
-   border (NetSurf, for instance, leaves the bottom margin of the last element
-   outside the parent div). */
-div.highlight-para > *, div.emph-box > *, .lyrics > * { margin-bottom: 0; }
-div.highlight-para > *:first-child, div.emph-box > *:first-child,
- .lyrics > *:first-child { margin-top: 0; }
+.highlight-para, p.highlight,
+ p.emph-box, pre.emph-box { padding: .6em 1.2em; }
 
 .highlight { background-color: #fff1c0; }
 .highlight-para, p.highlight { background-color: #fff5d4; }
@@ -446,23 +451,30 @@
    margin-left: 3%; margin-right: 3%;
 }
 
-/* Announcements (div p, or div blockquote p) */
+/** WITH LEFT BORDER **/
+
+/* .announcement may be followed by blockquote. The only effect of is to
+   switch to italic font. The "italic" class can be used instead. */
+.announcement blockquote { margin: 0; }
+
 .announcement {
    font-size: 1.1em;
    padding: 0 1em;
    margin: 1.5em 0;
    border-left: .5em solid #fc7;
 }
-.announcement > *,
- .announcement > blockquote > * { margin-bottom: 0; }
-.announcement *:first-child,
- .announcement > blockquote > *:first-child { margin-top: 0; }
-div.announcement { padding-top: .5em; padding-bottom: .5em; }
+/* Currently, p, h3 and ul are found in div.announcement. Add some padding
+   so the border extends out a little bit. */
+.announcement p { margin: 0; padding: .3em 0; }
+.announcement ul { padding-bottom: .3em; }
+.announcement h3 {
+   font-size: 1.3em;
+   padding-top: .1em;
+   margin: 0;
+}
 
-/* The only effect of blockquote inside div.announcement is to switch to
-   italic font. The "italic" class can be used instead. */
-.announcement blockquote { margin: 0; }
 
+/** WITH NO BACKGROUND OR LEFT BORDER **/
 
 /* the urgent div should be enabled when we have something urgent to
    appear on every page - these typically come from johns, peterb or rms
@@ -489,7 +501,7 @@
    margin: 1em 0 0;
 }
 .trans-disclaimer a,
-.trans-disclaimer a:visited { color: #333; }
+ .trans-disclaimer a:visited { color: #333; }
 .trans-disclaimer a:hover { color: #777; }
 
 
@@ -513,59 +525,51 @@
 
 /*** FLOATING INSETS ***/
 
-/** Notes (div p, or blockquote p) **/
+/** NOTES (div.note p, or blockquote.note p) **/
 
 .note {
+   width: 44.7em; max-width: 91%;
    text-align: center;
-   padding: 1em;
+   padding: .6em 4%;
    margin: 1.5em auto;
    border: .15em dotted #6092d0;
 }
-.note > *,
- .note > * > li { margin-bottom: 0; }
-.note > *:first-child { margin-top: 0; }
-blockquote.note { font-style: normal; }
+.note p { padding: .4em 0; margin: 0; }
+
 
-/** Tables of contents **/
+/** TABLES OF CONTENTS **/
 
 .summary, .toc { 
-   padding: 1.5em;
+   max-width: 92%;
+   padding: 1.2em 4%;
+   margin: 2.5em auto 1.5em;
    background: #f5f5f5; 
 }
 .summary h3, .toc h3 {
    font-size: 1.3em;
+   margin-top: .5em;
    text-align: center;
 }
 .summary h4, .toc h4 {
    font-size: 1.1em;
 }
-/* Spacing between items is given by the top margin of li. */
-.summary > ul > li, .summary > ol > li
- .toc > ul > li, .toc > ol > li {
-   margin-top: .5em; margin-bottom: 0;
-}
-.summary > ul, .summary > ol, .toc > ul, .toc > ol {
-   margin: 0;
-}
-.summary > *:first-child, .summary > * > li:first-child, 
- .toc > *:first-child, .toc > * > li:first-child {
-   margin-top: 0;
+/* After floating columns: */
+.toc hr, .summary hr {
+   clear: both; visibility: hidden;
+   padding-bottom: .5em; margin: 0;
 }
 
-.toc {
-   width: 45em; max-width: 85%;
-   margin: 2em auto 1.5em;
-}
-.summary {
-   display: inline-block;
-   max-width: 94%;
-   margin: 0 0 1em;
-}
+.summary { width: 30em; }
+.toc { width: 45em; }
+
+
+/** ON WIDE SCREENS **/ 
 
 @media (min-width: 48em) {
    .note, .summary {
       clear: right;
       float: right;
+      padding: 1.2em;
       width: 20em;
       max-width: 40%;
       margin: .2em 0 1em 2em;
@@ -579,8 +583,6 @@
    }
 }
 
-/** Single short paragraph followed by 'clear:both' **/
-
 
 /*** IMAGES ***/
 
@@ -946,31 +948,22 @@
    height: 2em;
    margin: .3em .5em;
 }
-
 #backtotop {
-   text-align: right;
-   font-weight: bold;
-   margin: 0 5% 2em;
-}
-#backtotop a {
-   text-decoration: none;
-   padding: .3em .5em;
-   color: white;
-   background-color: #4080d0;
+   font-size: 1.1em;
+   margin-top: 1.8em;
 }
-#backtotop a:hover { color: #ddd; }
 
 
 /*** FOOTER ***/
 
 #footer:after {
    display: block; height: 1px;
-   content: ""; margin-top: 1.5em;
+   content: "";
 }
 #footer {
    clear: both;
    font-size: .9em;
-   padding-top: 1.5em;
+   padding-top: 1.5em; padding-bottom: 1em;
    color: #333;
    border-top: 1px solid #ccc;
 }