Tweak the colors and element positioning a bit on the new frontpage

3 files changed, 34 insertions, 7 deletions

diff --git a/app/views/layouts/second_generation/application.html.erb b/app/views/layouts/second_generation/application.html.erb
index 374b7e4..4f033dd 100644
--- a/app/views/layouts/second_generation/application.html.erb
+++ b/app/views/layouts/second_generation/application.html.erb
@@ -23,7 +23,8 @@
               :html => {:method => "get", :id => "main_menu_search_form"} do |f|
             %>
               
-              <%= text_field_tag :q, params[:q], :id => "main_menu_search_form_query" %>
+              <%= text_field_tag :q, params[:q],
+                :id => "main_menu_search_form_query", :class => "unfocused", %>
               <%= submit_tag "Search" %>
             <% end %>
           </li>
@@ -87,16 +88,18 @@
   <div id="footer">
     <div class="marginizer">
       <ul class="simple left">
-        <li><%= link_to image_tag("logo_shortcut_mini.png"), "http://shortcut.no/" %></li>
         <li><%= link_to "Contact", contact_path %> </li>
         <li><%= link_to t("views.layout.discussion"), "http://groups.google.com/group/gitorious" %></li>
         <li><%= link_to t("views.layout.blog"), "http://blog.gitorious.org/" %></li>
         
         <% if GitoriousConfig["terms_of_use"] -%>
-          <li><%= link_to "Terms of Service", "http://en.gitorious.org/tos" %></li>
-          <li><%= link_to "Privacy Policy", "http://en.gitorious.org/privacy_policy" %></li>
+          <li class="secondary"><%= link_to "Terms of Service", "http://en.gitorious.org/tos" %></li>
+          <li class="secondary"><%= link_to "Privacy Policy", "http://en.gitorious.org/privacy_policy" %></li>
         <% end %>
       </ul>
+      <ul class="meta">
+                <li class="meta"><%= link_to image_tag("logo_shortcut_mini.png"), "http://shortcut.no/" %></li>
+      </ul>
     </div>
   </div>
 </body>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 816c859..6995183 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -184,12 +184,14 @@ Event.observe(window, "load", function(e){
     searchInput.observe("focus", function(){
       if (searchInput.value == labelText) {
         searchInput.value = "";
+        searchInput.removeClassName("unfocused")
       }
     });
     
     searchInput.observe("blur", function(){
       if (searchInput.value == "") {
         searchInput.value = labelText;
+        searchInput.addClassName("unfocused")
       }
     });
     
diff --git a/public/stylesheets/screen.css b/public/stylesheets/screen.css
index 26cd109..c64bf30 100644
--- a/public/stylesheets/screen.css
+++ b/public/stylesheets/screen.css
@@ -61,11 +61,15 @@ Big header
   color:#fff;
 }
 
+#big_header a {
+  color: #92B92D;
+}
+
 #main_menu{
   float:right;
   height:50px;
   line-height:50px;
-  font-size:11px;
+  font-size:12px;
   
   text-shadow:rgba(0, 0, 0, 0.5) 0px -1px 1px; 
 }
@@ -75,7 +79,7 @@ Big header
 }
 
 #main_menu a{
-  color:#fff;
+  color: #92B92D;
 }
 
 #main_menu_search_form{
@@ -96,6 +100,10 @@ Big header
   -moz-border-radius:3px;
 }
 
+#main_menu_search_form_query.unfocused {
+  color: #777;
+}
+
 #main_menu_search_form_graphic_submit{
   width:20px;
   height:20px;
@@ -435,7 +443,20 @@ Footer
 }
 
 #footer a{
-  color:#999;
+  color: #92B92D;
+}
+
+#footer li.secondary a  {
+  color: #999;
+  font-size: 11px;
+}
+
+
+#footer ul.meta {
+  float: right;
+  position: relative;
+  list-style: none;
+  margin: 0;
 }
 
 /*####################
@@ -552,6 +573,7 @@ a.button_link.big{
   background-image:url(../images/buttons_big.png);
   background-repeat:no-repeat;
   background-position:right -138px;
+  color: #fff !important;
 }
 
 button.big span,