Fixed alignment of snippet search results
Also enabled syntaax highlight on the search results Closes #26832
This commit is contained in:
parent
f802ad370e
commit
41d05fa85a
|
@ -12,41 +12,34 @@
|
|||
%span.light= time_ago_with_tooltip(snippet.created_at)
|
||||
%h4.snippet-title
|
||||
- snippet_path = reliable_snippet_path(snippet)
|
||||
= link_to snippet_path do
|
||||
.file-holder
|
||||
.js-file-title.file-title
|
||||
.file-holder
|
||||
.js-file-title.file-title
|
||||
= link_to snippet_path do
|
||||
%i.fa.fa-file
|
||||
%strong= snippet.file_name
|
||||
- if markup?(snippet.file_name)
|
||||
.file-content.wiki
|
||||
- if markup?(snippet.file_name)
|
||||
.file-content.wiki
|
||||
- snippet_chunks.each do |chunk|
|
||||
- unless chunk[:data].empty?
|
||||
= render_markup(snippet.file_name, chunk[:data])
|
||||
- else
|
||||
.file-content.code
|
||||
.nothing-here-block Empty file
|
||||
- else
|
||||
.file-content.code.js-syntax-highlight
|
||||
.line-numbers
|
||||
- snippet_chunks.each do |chunk|
|
||||
- unless chunk[:data].empty?
|
||||
= render_markup(snippet.file_name, chunk[:data])
|
||||
- Gitlab::Git::Util.count_lines(chunk[:data]).times do |index|
|
||||
- offset = defined?(chunk[:start_line]) ? chunk[:start_line] : 1
|
||||
- i = index + offset
|
||||
= link_to snippet_path+"#L#{i}", id: "L#{i}", rel: "#L#{i}", class: "diff-line-num" do
|
||||
%i.fa.fa-link
|
||||
= i
|
||||
.blob-content
|
||||
- snippet_chunks.each do |chunk|
|
||||
- unless chunk[:data].empty?
|
||||
= highlight(snippet.file_name, chunk[:data], repository: nil, plain: snippet.no_highlighting?)
|
||||
- else
|
||||
.file-content.code
|
||||
.nothing-here-block Empty file
|
||||
- else
|
||||
.file-content.code.js-syntax-highlight
|
||||
.line-numbers
|
||||
- snippet_chunks.each do |chunk|
|
||||
- unless chunk[:data].empty?
|
||||
- Gitlab::Git::Util.count_lines(chunk[:data]).times do |index|
|
||||
- offset = defined?(chunk[:start_line]) ? chunk[:start_line] : 1
|
||||
- i = index + offset
|
||||
= link_to snippet_path+"#L#{i}", id: "L#{i}", rel: "#L#{i}", class: "diff-line-num" do
|
||||
%i.fa.fa-link
|
||||
= i
|
||||
- unless snippet == snippet_chunks.last
|
||||
%a.diff-line-num
|
||||
= "."
|
||||
%pre.code
|
||||
%code
|
||||
- snippet_chunks.each do |chunk|
|
||||
- unless chunk[:data].empty?
|
||||
= chunk[:data]
|
||||
- unless chunk == snippet_chunks.last
|
||||
%a
|
||||
= "..."
|
||||
- else
|
||||
.file-content.code
|
||||
.nothing-here-block Empty file
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Fix snippets search result spacing
|
||||
merge_request:
|
||||
author:
|
Loading…
Reference in New Issue