floating logo and search

gazetteer/static/css/main.css

@@ -16,16 +16,22 @@ border-bottom:1px solid #999;
 margin-bottom:2%;
 height:14%;}
 
+#logoMain
+{float:left;}
+
 #logo
 {
 margin-left:2%;
 padding-top:2%;
 }
 
+#logoText
+{margin-left:2%;}
+
 .searchForm
 {margin-left:2%;
 padding-top:2%;
-}
+float:left;}
 
 .search
 {width:30%; /*fine if i give this width in percent, right?*/

gazetteer/templates/search.html

@@ -22,8 +22,10 @@
 <!--<div class="wrapper">-->
 
 <div class="header">
+    <div id="logoMain">
         <img src="/static/images/logo-loc.png" width="141" height="32" alt="congress-logo" id="logo">
         <div id="logoText">Digital Gazetteer</div>
+    </div>
     <form action="" method="get" class="searchForm" id="searchForm"><!--method is right???-->
 	    <input type="text" placeholder="Search digital gazetteer" id="searchField" name="field" class="search" />
         <input type="submit" name="searchButton" value="Search" id="searchButton">