Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
4a344c16
Commit
4a344c16
authored
Jun 06, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move search to separate layout
parent
68d146b4
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
11 deletions
+14
-11
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+4
-0
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+0
-2
app/views/layouts/search.html.haml
app/views/layouts/search.html.haml
+10
-0
features/dashboard/active_tab.feature
features/dashboard/active_tab.feature
+0
-5
features/steps/dashboard/dashboard_active_tab.rb
features/steps/dashboard/dashboard_active_tab.rb
+0
-4
No files found.
app/assets/stylesheets/common.scss
View file @
4a344c16
...
...
@@ -418,3 +418,7 @@ img.emoji {
overflow
:
hidden
;
height
:
220px
;
}
.search-container
{
margin-top
:
30px
;
}
app/views/layouts/nav/_dashboard.html.haml
View file @
4a344c16
...
...
@@ -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
app/views/layouts/search.html.haml
0 → 100644
View file @
4a344c16
!!! 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
features/dashboard/active_tab.feature
View file @
4a344c16
...
...
@@ -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
...
...
features/steps/dashboard/dashboard_active_tab.rb
View file @
4a344c16
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment