From 1ee3cf8c1dea6a1b392ff47180c6038b36eeb587 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@discourse.org>
Date: Tue, 8 Jul 2014 15:57:41 -0700
Subject: [PATCH] fix some minor 404 search page issues

---
 app/assets/stylesheets/desktop/discourse.scss | 10 +++++++++-
 app/views/exceptions/not_found.html.erb       |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index d9accea9e..128ae2a2c 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -146,6 +146,8 @@ body {
     text-rendering: optimizelegibility;
   }
 
+  /* page not found styles */
+
   .page-not-found {
     margin: 20px 0 40px 0;
   }
@@ -154,7 +156,13 @@ body {
     margin-top: 20px;
   }
 
-  .popular-topics-title, .recent-topics-title {margin-bottom: 10px;}
+  .popular-topics-title, .recent-topics-title {
+    margin-bottom: 10px;
+  }
+
+  .page-not-found-topics .span8 {
+    line-height: 1.5em;
+  }
 
   // this removes the unwanted top margin on a paragraph under a heading
   h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {
diff --git a/app/views/exceptions/not_found.html.erb b/app/views/exceptions/not_found.html.erb
index 20bd3984c..f2160d862 100644
--- a/app/views/exceptions/not_found.html.erb
+++ b/app/views/exceptions/not_found.html.erb
@@ -3,7 +3,7 @@
 <h1 class="page-not-found"><%= t 'page_not_found.title' %></h1>
 
 <div class="row page-not-found-topics">
-  <div class="span8 pupular-topics">
+  <div class="span8 popular-topics">
     <h2 class="popular-topics-title"><%= t 'page_not_found.popular_topics' %></h2>
     <% @top_viewed.each do |t| %>
       <%= link_to t.title, t.relative_url %><br/>
@@ -26,7 +26,7 @@
     <div class="span10" style='padding-top: 20px'>
       <h2 class="page-not-found-search"><%= t 'page_not_found.search_title' %></h2>
       <p>
-        <form action='//google.com' id='google-search' onsubmit="return google_button_clicked()">
+        <form action='//google.com/search' id='google-search' onsubmit="return google_button_clicked()">
           <input type="text" id='user-query' value="<%= @slug %>">
           <input type='hidden' id='google-query' name="q">
           <button class="btn btn-primary"><%= t 'page_not_found.search_google' %></button>