www/server/staging/gnuhealth home1.html body-in...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 16/09/06 21:57:02

Modified files:
        server/staging/gnuhealth: home1.html body-include-2.html 
                                  layout.css 

Log message:
        Remove div#fsf-frame; clean up.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/gnuhealth/home1.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/gnuhealth/body-include-2.html?cvsroot=www&r1=1.2&r2=1.3
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/gnuhealth/layout.css?cvsroot=www&r1=1.1&r2=1.2

Patches:
Index: home1.html
===================================================================
RCS file: /webcvs/www/www/server/staging/gnuhealth/home1.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- home1.html  3 Sep 2016 20:14:37 -0000       1.1
+++ home1.html  6 Sep 2016 21:57:02 -0000       1.2
@@ -15,58 +15,14 @@
 
 <style type="text/css" media="print,screen">
 <!--
-/* === Not necessary with the new version of layout.css === */
-#content:after { display: none; }
-#fsf-frame { display: none; }
-ol li { margin: 1em 0 0 1em; }
-ul li { margin: .5em 0 0 1em; }
-h2 { text-shadow: none; }
-.emph-box p { font-size: 1em; }
-.emph-box p, .emph-box ul { margin-bottom: 0; } /* For NetSurf */
-.translators-notes ol li { margin: .5em 0 0 1.1em; }
-#backtotop { font-size: 1em; }
-
+/* === Banner === */
+#gnuhealth { display: none; }
 @media (min-width: 57em) {
-   #fsf-frame { display: block; }
-}
-/* ======================= */
-
-#home .button {
-   font-size: 1.8em;
-   text-align: center;
-   font-weight: bold;
-   margin: 1.7em 0;
-}
-.button a, .button a:visited {
+   #gnuhealth {
    display: block;
-   padding: .4em .6em;
-   text-decoration: none;
-   color: #004caa;
-   background: #f5f5f5;
-   border: .1em solid #4080d0;
-   border-radius: .3em;
-   -moz-border-radius: .3em;
-   -khtml-border-radius: .3em;
-   -webkit-border-radius: .3em;
-   -opera-border-radius: .3em;
-}
-.button a:hover {
-   color: #004caa;
-   background: #eee;
-}
-
-/* This inactivates the old style. */
-.large {
-   padding: 0;
-   background: none;
-   border: none;
-}
-#home .button {
-   box-shadow: none;
-   -moz-box-shadow: none;
-   -webkit-box-shadow: none;
-   -icab-box-shadow: none;
-   -o-box-shadow: none;
+      width: 100%;
+      margin-top: 2.3em;
+   }
 }
 /* ======================= */
 
@@ -85,9 +41,6 @@
 h2.first {
    margin-top: 1em;
 }
-.first-column p.back {
-   margin-bottom: 0;
-}
 #gnu-linux {
    width: 30em; max-width: 100%;
    text-align: center;
@@ -96,10 +49,26 @@
 #gnu-linux img {
    width: 100%;
 }
+.button {
+   font-size: 1.8em;
+   margin: 1.7em 0;
+}
+.button a, .button a:visited {
+   padding: .4em .6em;
+   color: #a42e2b;
+   background: #eee;
+   border: .1em solid #ccc;
+}
+.button a:hover {
+   color: #777;
+}
+.first-column p.back {
+   margin-bottom: 0;
+}
 
 .second-column .emph-box {
    padding: 0 1.2em 1.2em;
-   margin-top: 2em;
+   margin-top: 1.5em;
 }
 .second-column .emph-box.white {
    background: white;
@@ -107,10 +76,7 @@
 .second-column .emph-box .back {
    margin-top: 1em;
 }
-#Flashes p, #unmaint p, #blurb p, #blurb p small {
-   font-size: .9em;
-}
-h3, h4 {
+h3 {
    margin-top: .7em;
 }
 h3 img {
@@ -120,41 +86,34 @@
 #blurb h4 { 
    text-align: left;
    font-size: 1.5em;
+   margin-top: .4em;
 }
 #blurb h4 img {
    float: left;
    margin-right: .5em;
 }
+#Flashes p, #unmaint li, #blurb p, #blurb p small {
+   font-size: .9em;
+}
+#unmaint li, #blurb p {
+   color: #404040;
+}
+#unmaint strong {
+   display: block;
+   font-size: 1.1em;
+   color: black;
+}
 
 .clear {
    clear: both;
-   height: 1.8em;
+   height: 2em;
 }
 .translators-notes {
    width: 44.4em; max-width: 100%;
    margin: 0 auto;
 }
-#backtotop {
-   float: right; margin: 2em 5% 1.8em;
-}
-#mission-statement {
-   margin-bottom: 0;
-}
-#sisters {
-   font-size: .9em;
-   margin: 0 3% 2em;
-}
-
-/* === Banner === */
-#gnuhealth { display: none; }
address@hidden (min-width: 57em) {
-   #gnuhealth {
-      display: block;
-      width: 100%;
-      margin-top: 2.3em;
-   }
-}
-/* ======================= */
+#mission-statement { margin-bottom: 0; }
+#sisters { font-size: .9em; margin: 0 3% 2em; }
 
 @media (min-width: 57em) {
    .first-column {
@@ -204,11 +163,11 @@
 below</a>.</p>
 
 <div id="gnu-linux">
-<p class="button large"><a
+<p class="button"><a
       href="/distros/free-distros.html">Try GNU/Linux!</a></p>
 
 <a href="/distros/screenshot.html"><img
-   src="gnewsense2-medium.jpg"
+   src="/distros/screenshots/gnewsense2-medium.jpg"
    alt="Screenshot of GNU"/></a>
 </div>
 
@@ -289,7 +248,7 @@
 <div class="second-column">
 
 <a href="http://www.gnuhealthcon.org/2016-las_palmas/";><img id="gnuhealth"
-src="gnuhealthcon2016_small.jpg" alt="GNUHealth Conference 2016" /></a>
+src="/server/staging/gnuhealth/gnuhealthcon2016_small.jpg" alt="GNUHealth 
Conference 2016" /></a>
 
 <div id="Flashes" class="emph-box white">
 <h3><a href="http://planet.gnu.org/";>Planet GNU</a>
@@ -331,13 +290,17 @@
 <div id="unmaint" class="emph-box">
 <ul>
 <li><strong>Can you contribute to any of
-the <a href="http://www.fsf.org/campaigns/priority-projects/";>High
-Priority Projects</a>?</strong></li>
+these <a href="http://www.fsf.org/campaigns/priority-projects/";>High
+Priority Projects</a>?</strong> Gnash, coreboot, free distributions of
+GNU/Linux, GNU Octave, drivers for network routers, reversible
+debugging in GDB, automatic transcription, PowerVR drivers, and also
+free software replacements for Skype, OpenDWG libraries, and Oracle
+Forms.</li>
 
 <li><strong>Can you take over an <a
 href="/server/takeaction.html#unmaint">unmaintained GNU
 package</a>?</strong>
-<p><span class="gnun-split"></span>
+<span class="gnun-split"></span>
   <a href="/software/halifax/">halifax</a>,
   <a href="/software/metahtml/">metahtml</a>,
   <a href="/software/orgadoc/">orgadoc</a><span class="gnun-split"></span>,
@@ -348,7 +311,7 @@
   <a href="/software/gnuae/">gnuae</a>,
   <a href="/software/metaexchange/">metaexchange</a>,
   <a href="/software/powerguru/">powerguru</a><span class="gnun-split"></span>.
-See the package web pages for more information.</p></li>
+See the package web pages for more information.</li>
 </ul>
 </div>
 
@@ -365,7 +328,7 @@
 <div class="clear"></div>
 
 </div><!-- for id="content", starts in the include above -->
-<!--#include virtual="/server/staging/gnuhealth/footer-text.html" -->
+<!--#include virtual="/server/footer.html" -->
 
 <p id="sisters">The <a href="http://www.fsf.org/";>FSF</a> also has sister
 organizations in <a href="http://www.fsfe.org";>Europe</a>, <a
@@ -419,7 +382,8 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. -->
 
-<p>Copyright &copy; 1996-2016 <a
+<p>Copyright &copy; 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 <a
 href="http://www.fsf.org";>Free Software Foundation</a>, Inc.</p>
 
 <p>This page is licensed under a <a rel="license"
@@ -430,7 +394,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2016/09/03 20:14:37 $
+$Date: 2016/09/06 21:57:02 $
 <!-- timestamp end -->
 </p>
 </div>

Index: body-include-2.html
===================================================================
RCS file: /webcvs/www/www/server/staging/gnuhealth/body-include-2.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- body-include-2.html 3 Sep 2016 20:03:46 -0000       1.2
+++ body-include-2.html 6 Sep 2016 21:57:02 -0000       1.3
@@ -8,7 +8,6 @@
    #GNUHealthCon2016
 </p>
 <div id="header">
-<div id="fsf-frame">
 <div id="fssbox">
 <p><a href="http://www.fsf.org/fss";>Free Software Supporter</a></p>
 <form action="https://my.fsf.org/civicrm/profile/create?reset=1&amp;gid=31"; 
method="post">
@@ -25,7 +24,6 @@
  </p>
 </form>
 </div><!-- /fssbox -->
-</div><!-- /fsf-frame -->
 
 <div id="gnu-banner">
  <a href="/">

Index: layout.css
===================================================================
RCS file: /webcvs/www/www/server/staging/gnuhealth/layout.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- layout.css  3 Sep 2016 20:12:47 -0000       1.1
+++ layout.css  6 Sep 2016 21:57:02 -0000       1.2
@@ -45,8 +45,7 @@
    #100070  purplish blue: normal visited links, normal hover
    blue     #urgent links
 
-   #a42e2b  red: GNU banner, #outdated, #join-fsf hover
-   #e74c3c  #join-fsf
+   #a42e2b  red: GNU banner, #outdated, #join-fsf
 
 Backgrounds
    #999     hr
@@ -55,13 +54,10 @@
    #eee     #edu-navigation, submit
    #f5f5f5  #translations, #footer, .emph-box, .summary, .toc, .lyrics,
             .listing
-   white    body, .note, edu-note
+   white    body, .note, edu-note, #join-fsf
 
    #a42e2b  red: #navigation
 
-   #004caa  blue: #join-fsf:hover
-   #4080d0  blue: #join-fsf, #fssbox submit:focus
-
    #ff3     yellow: #urgent
 
    #fff1c0  light orange: span.highlight, table headers
@@ -78,8 +74,8 @@
    #4080d0  focused inputs, #fssbox submit
    #6092d0  .note, edu-note
 
-   #a42e2b  active link in edu-navbar, #join-fsf hover
-   #e74c3c  .big-section h3, #join-fsf
+   #a42e2b  active link in edu-navbar, #join-fsf
+   #e74c3c  .big-section h3
    #fc7     .announcement, .highlight-para
 */
 
@@ -279,9 +275,9 @@
 
 .big { font-size: 1.3em; padding: .3em 0; }
 
+.inline-list li { display: inline }
 .no-bullet li { list-style: none; }
 
-.inline-list li { display: inline; }
 .no-display { display: none; }
 
 
@@ -340,9 +336,6 @@
    border: .1em solid #999;
 }
 
-.button.small { font-size: 1.3em; }
-/* The large button is defined in home.html. */
-
 
 /*** SPECIAL BORDERS ***/
 
@@ -800,31 +793,24 @@
 
 #fssbox, #join-fsf { display: none; }
 
-/* When eventually #join-fsf moves to body-include-1, #fsf-frame
-   can be removed; its definitions will be applied to #fssbox. */
-#fsf-frame {
+#fssbox {
    float: right;
    font-size: .9em;
    text-align: center;
-   margin: .8em 0;
+   line-height: 1.3em;
+   margin: 1.8em 0;
 }
-#fsf-frame p { margin: 0; }
+#fssbox p { margin: 0; }
 
 #join-fsf a, #join-fsf a:visited {
-   display: inline-block;
    color: #a42e2b;
    background: white;
-   border-color: #e74c3c;
+   border-color: #a42e2b;
 }
 #join-fsf a:hover {
-   color: #a42e2b;
-   background: #f5f5f5;
+   color: #777;
 }
 
-#fssbox {
-   padding: 0;
-   margin-top: 1em;
-}
 #fssbox a, #fssbox a:visited {
    font-weight: bold;
    color: #004caa;
@@ -835,10 +821,10 @@
 
 #fssbox form input[type="submit"] {
    color: #004caa;
-   border: .1em solid #4080d0;
+   border-color: #4080d0;
 }
 #fssbox form input[type="text"]:focus + input[type="submit"] {
-   background-color: white;
+   background: white;
 }
 
 /** GNU banner **/