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

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 14/04/15 15:31:40

Modified files:
        server/staging/nav-bar/test9: layout7.css style.css 

Log message:
        Fix margins for Emacs manual, pages using style.css and pages with 
translation list near the nav bar.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/layout7.css?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/nav-bar/test9/style.css?cvsroot=www&r1=1.6&r2=1.7

Patches:
Index: layout7.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/layout7.css,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- layout7.css 14 Apr 2014 17:14:24 -0000      1.25
+++ layout7.css 15 Apr 2014 15:31:39 -0000      1.26
@@ -82,8 +82,6 @@
    #333         #e7e9eb        10.38          546
    #333         #c9cccf         7.83          459
    #404040      #d1d4d7         6.97          444
-   #444         white           9.74          561
-   #505050      #f0f2f4         7.18          486
    #555         white           7.46          510
 
 Red from GNU banner
@@ -96,8 +94,7 @@
    #334683      #fff570         7.91          379
    #334683      #e7e9eb         7.36          428
    #334683      #777            2.0           110
-   #334683      #505050         1.20           76
-   #334683      #444            1.09           67
+   #334683      #555            1.20           76
    #334683      #333            1.41          118
    #334683      black           2.34          271
 
@@ -252,6 +249,7 @@
    background-color: #f0f2f4;
    border: .15em solid #d1d4d7;
 }
+
 #translations span {
    display: inline; white-space: nowrap;
    margin-right: .5em;
@@ -273,13 +271,21 @@
    color: #777;
 }
 
+/* For translation lists below the navigation bar. */
+#content #translations p { margin-top: 0; }
+#content #translations {
+   margin-left: -1.65%; margin-right: -1.65%;
+   border-top: .35em  solid #d1d4d7;
+}
+
 /* Still used in some outdated translations. */
 #translations h3, #translations h4 {
    font-size: 1em; font-weight: bold;
-   padding: 1em 0 0 0;
+   padding: 1em 1.5% 0 1.5%;
    margin: 0;
 }
 #translations ul {
+   margin: 1em 1.5%;
    background: #f0f2f4;
 }
 #translations li {

Index: style.css
===================================================================
RCS file: /webcvs/www/www/server/staging/nav-bar/test9/style.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- style.css   14 Apr 2014 19:51:22 -0000      1.6
+++ style.css   15 Apr 2014 15:31:39 -0000      1.7
@@ -4,10 +4,23 @@
 @import url('layout7.css');
 
 /* some very basic styling for the pages that still use this. */
+body { margin: auto; width: 99%; max-width:74.92em; padding-bottom: 1em; }
 
-body { padding: 0 1% 1em 1%; }
+/* For pages which don't use #null-wrapper or .inner (Emacs manual,
+   for example) */
+body h2,body h3, body h4, body h5, body p {
+   margin-left: 1.5%; margin-right: 1.5%;
+}
+body ul, body dl, body blockquote { padding-left: 1.5%; padding-right: 1%; }
+
+/* Specifically for sections of the Emacs manual which start at the top
+   of the page. */
 div.node { border-top: 1em solid white; }
-#navigation, #footer, #translations, #searcher {
-   padding-left: 2.6%; padding-right: 2.6%;
-   margin-left: -1.11%; margin-right: -1.11%;
+
+/* This restores the normal margin for pages which use #null-wrapper
+   or .inner. */
+#null-wrapper h2, #null-wrapper h3, #null-wrapper h4, #null-wrapper h5,
+ #null-wrapper p, .inner h2, .inner h3, .inner h4, .inner h5, .inner p {
+   margin-left: 0; margin-right: 0;
 }
+