merged

gazetteer/static/css/main.css

@@ -12,8 +12,6 @@ color:#666;}
 .header
 {width:100%;
 /*background-color:grey;*/
-border-bottom:1px solid #c6c6c6;
-margin-bottom:2%;
 height:14%;}
 
 #logoMain
@@ -89,20 +87,35 @@ margin-bottom:1%;
 height:68%;
 }
 
+
+.nav
+{height:4%;
+width:100%;
+margin-bottom:2%;}
+
 .nav ul
-{background-image:url(../img/admin/default-bg.gif);
+{padding-top: 4px;
+padding-bottom: 4px;
+padding-left:1%;
+background-image:url(http://gazetteer.in/admin/media/img/admin/default-bg.gif);
 background-color:#7CA0C7;} 
 
 .nav ul li
-{height:4%;
-width:100%;
-padding-right: 60px;
+{padding-right: 60px;
 list-style:none;
 display:inline;
 color:#FFF;
 font-weight:bold;
 cursor:pointer;}
 
+.nav ul li a
+{text-decoration:none;
+color:#FFF;}
+
+.nav ul li a:hover
+{color:#5B80B2;}
+
+
 .mapListSection
 {float:left;
 width:33%;
@@ -139,12 +152,14 @@ cursor:pointer;}
 #totalResults
 {font-size:10px;
 float:left;
-padding-left:4px;}
+padding-left:4px;
+color:#666;}
 
 #showingResults
 {font-size:10px;
 float:right;
-padding-right:4px;}
+padding-right:4px;
+color:#666;}
 
 #noOfResults, #currPageNo, #totalPages, #of
 {font-weight:normal;}
@@ -221,7 +236,7 @@ transform:scale(1.25);}*/
 
 .firstLast
 {font-size:10px;
-padding-bottom:20px;
+padding-bottom:22px;
 padding-left: 4px;
 padding-right: 4px;
 cursor:pointer;

gazetteer/templates/search.html

@@ -29,7 +29,7 @@
     
     <div id="user-tools"> 
  
-        Welcome,<strong> admin.</strong><a href="/admin/password_change/"> Change password</a> /
+    <!--Welcome,<strong> admin.</strong><a href="/admin/password_change/"> Change password</a> /
      <a href="/admin/logout/">Log out</a>--> 
         <p id="logoText">Digital Gazetteer Demo</p>
         <p id="entropyLink"><a href="http://entropyfree.com">by Entropy Free LLC</a></p>
@@ -48,12 +48,12 @@
 
 <div class="content">
 
-    <div class="nav module">
-        <ul id="navMenu">
-        <li>Dummy Link A</li>
-        <li>Dummy Link B</li>
-        <li>Dummy Link C</li>
-        <li>Dummy Link D</li>
+    <div class="nav">
+        <ul>
+        <li><a href="">Dummy Link A</a></li>
+        <li><a href="">Dummy Link B</a></li>
+        <li><a href="">Dummy Link C</a></li>
+        <li><a href="">Dummy Link D</a></li>
         </ul>
     </div>