Merge branch 'search-commit-ui-fix' into 'master'
Fixed commit search UI ## What does this MR do? Fixes the UI for commits in search. If the scope of the search is commits then it renders the list in a `ul` to match the same styling as that on the commits UI. ## Screenshots (if relevant) ![Screen_Shot_2016-09-05_at_15.30.12](/uploads/f567a224be44d5a9b015ac5d1c399bd7/Screen_Shot_2016-09-05_at_15.30.12.png) ## What are the relevant issue numbers? Closes #21868 See merge request !6205
This commit is contained in:
commit
5fa3aeb02a
2 changed files with 11 additions and 8 deletions
|
@ -10,6 +10,10 @@
|
|||
in group #{link_to @group.name, @group}
|
||||
|
||||
.results.prepend-top-10
|
||||
- if @scope == 'commits'
|
||||
%ul.list-unstyled
|
||||
= render partial: "search/results/commit", collection: @search_objects
|
||||
- else
|
||||
.search-results
|
||||
- if @scope == 'projects'
|
||||
.term
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
.search-result-row
|
||||
= render 'projects/commits/commit', project: @project, commit: commit
|
||||
|
|
Loading…
Reference in a new issue