codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some minor 404 search page issues

Browse source
This commit is contained in:
Jeff Atwood 2014-07-08 15:57:41 -07:00
parent 92d42a43fd
commit 1ee3cf8c1d
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/desktop/discourse.scss
View file

@ -146,6 +146,8 @@ body {
text-rendering: optimizelegibility; text-rendering: optimizelegibility;
} }
/* page not found styles */
.page-not-found { .page-not-found {
margin: 20px 0 40px 0; margin: 20px 0 40px 0;
} }
@ -154,7 +156,13 @@ body {
margin-top: 20px; 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 // this removes the unwanted top margin on a paragraph under a heading
h1+p, h2+p, h3+p, h4+p, h5+p, h6+p { h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {

4
app/views/exceptions/not_found.html.erb
View file

@ -3,7 +3,7 @@
<h1 class="page-not-found"><%= t 'page_not_found.title' %></h1> <h1 class="page-not-found"><%= t 'page_not_found.title' %></h1>
<div class="row page-not-found-topics"> <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> <h2 class="popular-topics-title"><%= t 'page_not_found.popular_topics' %></h2>
<% @top_viewed.each do |t| %> <% @top_viewed.each do |t| %>
<%= link_to t.title, t.relative_url %><br/> <%= link_to t.title, t.relative_url %><br/>
@ -26,7 +26,7 @@
<div class="span10" style='padding-top: 20px'> <div class="span10" style='padding-top: 20px'>
<h2 class="page-not-found-search"><%= t 'page_not_found.search_title' %></h2> <h2 class="page-not-found-search"><%= t 'page_not_found.search_title' %></h2>
<p> <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="text" id='user-query' value="<%= @slug %>">
<input type='hidden' id='google-query' name="q"> <input type='hidden' id='google-query' name="q">
<button class="btn btn-primary"><%= t 'page_not_found.search_google' %></button> <button class="btn btn-primary"><%= t 'page_not_found.search_google' %></button>