diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-29 18:40:16 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-29 18:40:16 +0000 |
| commit | 39a55bdf1a1613f362bcd7da444b291210454160 (patch) | |
| tree | 306b9cf2b98d3e5f2684ba9ab1311a8dfb1d1cb8 /app/views/layouts | |
| parent | 5bf9f69df7f46b1c82bf3c02bf806a9f604480e5 (diff) | |
| parent | 7534d0ef46debee418fa36d65670cd1e43810baa (diff) | |
| download | gitlab-ce-39a55bdf1a1613f362bcd7da444b291210454160.tar.gz | |
Merge branch 'search-layout' into 'master'
Improvements to search layout
Improve search layout to match new UI style and make it more mobile-firendly
See merge request !585
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_head_panel.html.haml | 5 | ||||
| -rw-r--r-- | app/views/layouts/search.html.haml | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml index 8d4c7b39b19..3a9956ed189 100644 --- a/app/views/layouts/_head_panel.html.haml +++ b/app/views/layouts/_head_panel.html.haml @@ -13,8 +13,9 @@ .navbar-collapse.collapse %ul.nav.navbar-nav - %li.hidden-sm.hidden-xs - = render 'layouts/search' + - unless current_controller?(:search) + %li.hidden-sm.hidden-xs + = render 'layouts/search' %li.visible-sm.visible-xs = link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom'} do = icon('search') diff --git a/app/views/layouts/search.html.haml b/app/views/layouts/search.html.haml index f9d8db06e10..4b526686be4 100644 --- a/app/views/layouts/search.html.haml +++ b/app/views/layouts/search.html.haml @@ -2,9 +2,5 @@ %html{ lang: "en"} = render "layouts/head", title: "Search" %body{class: "#{app_theme} application", :'data-page' => body_data_page} - = render "layouts/broadcast" = render "layouts/head_panel", title: link_to("Search", search_path) - .container.navless-container - .content - = render "layouts/flash" - = yield + = render 'layouts/page' |