Merge branch 'issue_14771' into 'master'

Hide top search form on the search page Closes #14771 ![Screen_Shot_2016-04-11_at_6.04.19_PM](/uploads/44cf2110bad29c0df06d874740a3a61f/Screen_Shot_2016-04-11_at_6.04.19_PM.png) See merge request !3668

Merge branch 'issue_14771' into 'master'
31d9f655 · Jacob Schatz · d7c7f546 · d88d6e76 · 31d9f655
Commit 31d9f655 authored Apr 13, 2016 by Jacob Schatz
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

_default.html.haml app/views/layouts/header/_default.html.haml +1 -1

No files found.
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -8,7 +8,7 @@
      .navbar-collapse.collapse
        %ul.nav.navbar-nav
          %li.hidden-sm.hidden-xs
-            = render 'layouts/search'
+            = render 'layouts/search' unless current_controller?(:search)
          %li.visible-sm.visible-xs
            = link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
              = icon('search')