Commit ef7fcb46 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch 'tbulva-code-search-safari-zoom-bug' into 'master'

Fix for code search bug in Safari when zoomed

See merge request gitlab-org/gitlab!84363
parents e926bab8 b4beec4b
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.blob-content{ data: { blob_id: blob.id, path: blob.path, highlight_line: highlight, qa_selector: 'file_content' } } .blob-content{ data: { blob_id: blob.id, path: blob.path, highlight_line: highlight, qa_selector: 'file_content' } }
- blob.present.highlight.lines.each_with_index do |line, index| - blob.present.highlight.lines.each_with_index do |line, index|
- i = index + offset - i = index + offset
.line_holder.code-search-line .line_holder.code-search-line.gl-display-flex
.line-numbers .line-numbers
.gl-display-flex .gl-display-flex
%span.diff-line-num.gl-pl-3 %span.diff-line-num.gl-pl-3
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
%a{ href: "#{blob_link}#L#{i}", id: "blob-L#{i}", 'data-line-number' => i, class: 'gl-display-flex! gl-align-items-center gl-justify-content-end' } %a{ href: "#{blob_link}#L#{i}", id: "blob-L#{i}", 'data-line-number' => i, class: 'gl-display-flex! gl-align-items-center gl-justify-content-end' }
= sprite_icon('link', css_class: 'gl-ml-3! gl-mr-1!') = sprite_icon('link', css_class: 'gl-ml-3! gl-mr-1!')
= i = i
%pre.code.highlight %pre.code.highlight.flex-grow-1
%code %code
= line.html_safe = line.html_safe
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