Commit 4a344c16 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Move search to separate layout

parent 68d146b4
......@@ -418,3 +418,7 @@ img.emoji {
overflow: hidden;
height: 220px;
}
.search-container {
margin-top: 30px;
}
......@@ -13,8 +13,6 @@
= link_to merge_requests_dashboard_path do
Merge Requests
%span.count= current_user.cared_merge_requests.opened.count
= nav_link(path: 'search#show') do
= link_to "Search", search_path
= nav_link(controller: :help) do
= link_to "Help", help_path
!!! 5
%html{ lang: "en"}
= render "layouts/head", title: "Search"
%body{class: "#{app_theme} application"}
= render "layouts/head_panel", title: "Search"
= render "layouts/flash"
.container.search-container
.content
= yield
......@@ -17,11 +17,6 @@ Feature: Dashboard active tab
Then the active main tab should be Merge Requests
And no other main tabs should be active
Scenario: On Dashboard Search
Given I visit dashboard search page
Then the active main tab should be Search
And no other main tabs should be active
Scenario: On Dashboard Help
Given I visit dashboard help page
Then the active main tab should be Help
......
......@@ -15,10 +15,6 @@ class DashboardActiveTab < Spinach::FeatureSteps
ensure_active_main_tab('Merge Requests')
end
Then 'the active main tab should be Search' do
ensure_active_main_tab('Search')
end
Then 'the active main tab should be Help' do
ensure_active_main_tab('Help')
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment