Move search to separate layout

Dmitriy Zaporozhets
1 parent 68d146b4
Showing 5 changed files with 14 additions and 11 deletions Show diff stats
app/assets/stylesheets/common.scss
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/search.html.haml
features/dashboard/active_tab.feature
features/steps/dashboard/dashboard_active_tab.rb
@@ -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
@@ -0,0 +1,10 @@
+!!! 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 &lt; 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
	@@ -418,3 +418,7 @@ img.emoji {		@@ -418,3 +418,7 @@ img.emoji {
418	overflow: hidden;	418	overflow: hidden;
419	height: 220px;	419	height: 220px;
420	}	420	}
		421	+
		422	+.search-container {
		423	+ margin-top: 30px;
		424	+}
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+!!! 5
	2	+%html{ lang: "en"}
	3	+ = render "layouts/head", title: "Search"
	4	+ %body{class: "#{app_theme} application"}
	5	+ = render "layouts/head_panel", title: "Search"
	6	+ = render "layouts/flash"
	7	+
	8	+ .container.search-container
	9	+ .content
	10	+ = yield