From 84f663567945279b78df5f96dcfb13efd4c8f212 Mon Sep 17 00:00:00 2001
From: Amy Hendrix <sabreuse@gmail.com>
Date: Sun, 13 Jul 2014 20:07:42 -0400
Subject: [PATCH] Continue cleaning up header styling

---
 .../custom_bootstrap/variables.less           |  4 ++--
 app/assets/stylesheets/overrides.css.less     | 22 +------------------
 app/views/layouts/_header.html.haml           |  8 +++----
 3 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/app/assets/stylesheets/custom_bootstrap/variables.less b/app/assets/stylesheets/custom_bootstrap/variables.less
index 0f72d41b5..f0743bb4c 100644
--- a/app/assets/stylesheets/custom_bootstrap/variables.less
+++ b/app/assets/stylesheets/custom_bootstrap/variables.less
@@ -22,7 +22,7 @@
 @font-family-mono:        Monaco, Menlo, Consolas, "Courier New", monospace;
 
 @font-size-base:          15px;
-@font-family-base:        @font-family-sans-serif;
+@font-family-base:        @font-family-serif;
 @line-height-base:        1.5;
 @alt-font-family:         @font-family-sans-serif;
 
@@ -40,7 +40,7 @@
 @navbar-default-link-color: darken(@beige, 20%);
 @navbar-default-link-hover-color: @beige;
 @navbar-default-link-active-color: @beige;
-@navbar-brand-color: lighten(@green, 20%);
+@navbar-default-brand-color: lighten(@green, 20%);
 
 @dropdown-bg: lighten(@beige, 10%);
 @dropdown-link-color: @brown;
diff --git a/app/assets/stylesheets/overrides.css.less b/app/assets/stylesheets/overrides.css.less
index d977424db..3d051601b 100644
--- a/app/assets/stylesheets/overrides.css.less
+++ b/app/assets/stylesheets/overrides.css.less
@@ -149,10 +149,6 @@ li.crop-hierarchy {
   list-style-type: disc;
 }
 
-.navbar-inner {
-    border-width: 0px !important; 
-}
-
 .navbar-bottom {
     margin: 40px 0px 0px 0px !important;
 }
@@ -177,22 +173,6 @@ li.crop-hierarchy {
   }
 }
 
-.navbar-inner {
-  border: none !important;
-  background-image: none !important;
-  -webkit-border-radius: 0px; 
-  -moz-border-radius: 0px;
-  border-radius: 0px; 
-}
-
-.navbar-bottom .navbar-inner {
+.navbar-bottom .navbar {
   text-align: center;
 }
-
-.navbar-bottom .container{
-    padding: 20px 0px 40px 0px;
-}
-
-.navbar-search{
-    padding-bottom: 7px;
-}
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 6b749be3b..568b08154 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -1,5 +1,5 @@
-.navbar.navbar-fixed-top(role="navigation")
-  .container-fluid
+.navbar.navbar-default.navbar-fixed-top(role="navigation")
+  .container
     .navbar-header
       %button.navbar-toggle(data-target="#navbar-collapse" data-toggle="collapse")
         %span.sr-only Toggle Navigation
@@ -65,6 +65,6 @@
           %li= link_to 'Sign in', new_member_session_path
           %li= link_to 'Sign up', new_member_registration_path
 
-      = form_tag crops_search_path, :method => :get, :class => 'navbar-search pull-right' do
+      = form_tag crops_search_path, :method => :get, :class => 'navbar-form pull-right' do
         .input
-          = text_field_tag 'search', nil, :class => 'search-query input-medium', :placeholder => 'Search crops'
+          = text_field_tag 'search', nil, :class => 'search-query input-medium form-control', :placeholder => 'Search crops'