www/server/staging body-include-2.html educatio...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 19/12/12 06:22:34

Modified files:
        server/staging : body-include-2.html education.css 

Log message:
        Move the menu switch out of #navigation; fix a few other bugs.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/body-include-2.html?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/education.css?cvsroot=www&r1=1.12&r2=1.13

Patches:
Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/body-include-2.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- body-include-2.html 10 Dec 2019 15:58:04 -0000      1.5
+++ body-include-2.html 12 Dec 2019 11:22:32 -0000      1.6
@@ -30,14 +30,14 @@
       alt=" [A GNU head] " /><strong>GNU</strong> <span>Operating 
System</span></a>
 <!-- <p id="fsf-support">Sponsored by the <a href="#mission-statement">Free 
Software Foundation</a></p> -->
 </div><!-- /gnu-banner -->
-<div class="clear-banner"></div>
 
-<div id="navigation">
- <input type="checkbox" id="main-menu" />
- <label for="main-menu">
-  <img src="/server/staging/layout/menu.png"
+<input type="checkbox" id="main-menu" />
+<label for="main-menu">
+ <img id="menu-icon" src="/server/staging/layout/menu.png"
        alt="&nbsp;[3-bar menu icon]&nbsp;" />
- </label>
+</label>
+<div style="clear: both"></div>
+<div id="navigation">
  <ul>
 <!--#set var="MARK_START" value=" <span class='no-display'>=</span> " -->
 <!--#set var="MARK_END" value=" <span class='no-display'>=</span> " -->
@@ -113,7 +113,7 @@
 <!--#endif -->
   <li id="more-links"><a href="#fsf-links">More &#9660;</a></li>
  </ul>
- <div class="clear-nav"></div>
+<div style="clear: both"></div>
 </div><!--  /navigation -->
 </div><!-- /header -->
 <!-- end of server/body-include-2 -->

Index: education.css
===================================================================
RCS file: /webcvs/www/www/server/staging/education.css,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- education.css       11 Dec 2019 16:24:24 -0000      1.12
+++ education.css       12 Dec 2019 11:22:33 -0000      1.13
@@ -76,7 +76,7 @@
     display: inline-block;
     text-align: left;
     font-size: inherit;
-    padding: 0 6% 0 0;
+    padding: 0 6% .5em 0;
     margin: 0;
 }
 form.header input[type="text"] {
@@ -148,33 +148,19 @@
     background: white;
 }
 
-input#search-button, input#language-button, input#main-menu,
- #page-languages label, #searcher label, #navigation label {
+input#search-button, input#language-button, input#main-menu {
     display: none;
 }
-#searcher img {
+#searcher img, #page-languages img, img#menu-icon {
     display: none
 }
-#page-languages img {
-    display: none;
-}
 
-/* These changes enable hiding the navbar behind a 3-bar menu. */
+/* #navigation is now in #header. */
 #navigation {
-    background: none;
-}
-#navigation ul {
-    background: #a42e2b;
     margin: 0 -3.2%;
-    clear: both;
-}
-.clear-header {
-    clear: both;
-}
-#navigation img {
-    display: none;
 }
 
+
 @media (min-width: 0) {
     #searcher img,  input#search-button {
         display: none
@@ -191,18 +177,17 @@
         display: table-cell;
         vertical-align: middle;
         text-align: left;
-        /* padding: 0 .5em; */
         padding: 0;
     }
     #skip {
         display: none;
     }
-    /*#skip, */#set-language {
+    #set-language {
         display: table-cell;
         vertical-align: middle;
         margin: 0;
     }
-    /* #skip, */#set-language {
+    #set-language {
         padding: 0 .5em;
     }
     #page-languages {
@@ -256,7 +241,7 @@
     }
 }
 
-@media (max-width: 40em) {
+@media (max-width: 50em) {
     #toplinks {
         padding: .3em 3%;
     }
@@ -284,44 +269,32 @@
 }
 
 @media (max-width: 30em) {
-    body { font-size: .9em; }
-    #gnu-banner span { display: none; }
 
     /* Hide the navbar behind a 3-bar menu. */
     #header {
-        position: relative;
+        width: 94%;
         border-bottom: .1em solid #a42e2b;
     }
     #gnu-banner {
         float: left;
-        padding: 0 0 .4em;
-        margin-left: 6%;
-    }
-    .clear-banner {
-        clear: none;
-    }
-    .clear-nav {
-        clear: both;
-    }
-    #navigation label {
-        display: inline;
+        text-align: center;
+        padding: .1em 0 .5em;
     }
-    #navigation img {
-        display: inline;
+    img#menu-icon {
+        display: block;
         float: right;
-        height: 1.45em; min-height: 1.45em;
-        margin: 1.4em 6% 0 0
+        height: 1.45em;
+        padding-top: .5em;
     }
-    #navigation ul {
+    #navigation {
         display: none;
     }
-    #navigation input#main-menu:checked ~ ul {
+    input#main-menu:checked ~ #navigation  {
         display: block;
-        border: none;
-    }
-    #navigation input#main-menu:checked ~ .clear-nav {
-        clear: none;
     }
+
+    body { font-size: .9em; }
+    #gnu-banner span { display: none; }
 }
 
 @media (min-width: 60em) {
@@ -330,7 +303,6 @@
         padding: .5em 20%;
     }
 }
-/* End space-savers */
 
 
 /*** From graphics.css ***/