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

Move search to separate layout

parent 68d146b4
...@@ -418,3 +418,7 @@ img.emoji { ...@@ -418,3 +418,7 @@ img.emoji {
overflow: hidden; overflow: hidden;
height: 220px; height: 220px;
} }
.search-container {
margin-top: 30px;
}
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
= link_to merge_requests_dashboard_path do = link_to merge_requests_dashboard_path do
Merge Requests Merge Requests
%span.count= current_user.cared_merge_requests.opened.count %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 = nav_link(controller: :help) do
= link_to "Help", help_path = 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 ...@@ -17,11 +17,6 @@ Feature: Dashboard active tab
Then the active main tab should be Merge Requests Then the active main tab should be Merge Requests
And no other main tabs should be active 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 Scenario: On Dashboard Help
Given I visit dashboard help page Given I visit dashboard help page
Then the active main tab should be Help Then the active main tab should be Help
......
...@@ -15,10 +15,6 @@ class DashboardActiveTab < Spinach::FeatureSteps ...@@ -15,10 +15,6 @@ class DashboardActiveTab < Spinach::FeatureSteps
ensure_active_main_tab('Merge Requests') ensure_active_main_tab('Merge Requests')
end 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 Then 'the active main tab should be Help' do
ensure_active_main_tab('Help') ensure_active_main_tab('Help')
end 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