www/server/staging/ghm2016 body-include-1-rsd.h...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 16/08/30 11:27:41

Modified files:
        server/staging/ghm2016: body-include-1-rsd.html layout-rsd.css 

Log message:
        Float #join-fsf in the searcher.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/body-include-1-rsd.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/server/staging/ghm2016/layout-rsd.css?cvsroot=www&r1=1.21&r2=1.22

Patches:
Index: body-include-1-rsd.html
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/body-include-1-rsd.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- body-include-1-rsd.html     1 Aug 2016 22:57:10 -0000       1.6
+++ body-include-1-rsd.html     30 Aug 2016 11:27:41 -0000      1.7
@@ -7,6 +7,7 @@
 <!--#set var="language_selector"
  value='<a href="/server/select-language.html?callback=$cb" rel="nofollow">' 
-->
 <!--#set var="closing_anchor" value='</a>' -->
+<div id="searcher">
 <div id="toplinks">
  <a href="#content">Skip to main text</a>
  <span class="gnun-split"></span>
@@ -16,7 +17,7 @@
  <!--#echo encoding="none" var="closing_anchor" -->
 </div> <!-- /toplinks -->
 
-<div id="searcher">
+ <p id="join-fsf" class="button"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN&nbsp;THE&nbsp;FSF</a></p>
  <form method="get" action="//www.gnu.org/cgi-bin/estseek.cgi">
   <div>
   <input name="phrase" id="phrase" type="text" size="18" accesskey="s"
@@ -24,7 +25,7 @@
   <input type="submit" value="Search" />
   </div>
  </form>
- <p id="join-fsf" class="button"><a 
href="https://www.fsf.org/associate/support_freedom?referrer=4052";>JOIN&nbsp;THE&nbsp;FSF</a></p>
+ <div style="clear: both"></div>
 </div><!-- /searcher -->
 <!--#if expr="$TRANSLATION_LIST" -->
 <!--#echo encoding="none" var="TRANSLATION_LIST" -->

Index: layout-rsd.css
===================================================================
RCS file: /webcvs/www/www/server/staging/ghm2016/layout-rsd.css,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- layout-rsd.css      11 Aug 2016 15:30:21 -0000      1.21
+++ layout-rsd.css      30 Aug 2016 11:27:41 -0000      1.22
@@ -299,8 +299,6 @@
 
 /*** FORMS ***/
 
-form, form div { display: inline; }
-
 form input {
    line-height: 1.2em;
    font-family: inherit;
@@ -735,19 +733,14 @@
 
 #toplinks {
    float: left;
-   /* For NetSurf 1.2, and maybe a few other browsers. */
-   padding: .5em 2em .3em;
-}
-/* For standard browsers. */
address@hidden (min-width: 0) {
-   #toplinks { padding: .5em 3% .3em; }
+   text-align: left;
+   margin: .35em 1em .35em 0;
 }
-#toplinks a, #toplinks a:visited {
+#searcher #toplinks a, #toplinks a:visited {
    white-space: nowrap;
    /* the next line is a workaround for Midori 0.5.8 */
    display: inline-block;
    font-weight: bold;
-   font-size: .9em;
    color: #404040;
    text-decoration: none;
    margin-right: 1em;
@@ -764,7 +757,11 @@
    font-weight: bold;
    padding-top: .3em; padding-bottom: .3em;
 }
-#searcher #join-fsf { margin-left: 1em; }
+#searcher p#join-fsf {
+   float: right;
+   margin: 0 0 0 2em;
+}
+#searcher form { margin-top: .05em; }
 
 
 /*** TRANSLATION LIST ***/