Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Privacy
Imprint
Contact
Login methods
Sign in
Toggle navigation
Menu
Open sidebar
projects.thm.de
GitLab FOSS
Commits
500a3de7
Unverified
Commit
500a3de7
authored
Jan 08, 2018
by
Phil Hughes
Browse files
Fix changes dropdown ellipsis working across browsers
Closes #41561
parent
82e2d90b
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/pages/diff.scss
View file @
500a3de7
...
...
@@ -651,15 +651,13 @@
min-width
:
0
;
}
.diff-changed-file-name
,
.diff-changed-file-path
{
.diff-changed-file-name
{
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
.diff-changed-file-path
{
direction
:
rtl
;
color
:
$gl-text-color-tertiary
;
}
...
...
app/helpers/diff_helper.rb
View file @
500a3de7
...
...
@@ -226,4 +226,12 @@ def render_overflow_warning?(diff_files)
diffs
.
overflow?
end
def
diff_file_path_text
(
diff_file
,
max:
60
)
path
=
diff_file
.
new_path
return
path
unless
path
.
size
>
max
&&
max
>
3
"...
#{
path
[
-
(
max
-
3
)
..-
1
]
}
"
end
end
app/views/projects/diffs/_stats.html.haml
View file @
500a3de7
...
...
@@ -25,7 +25,7 @@
=
sprite_icon
(
diff_file_changed_icon
(
diff_file
),
size:
16
,
css_class:
"
#{
diff_file_changed_icon_color
(
diff_file
)
}
diff-file-changed-icon append-right-8"
)
%span
.diff-changed-file-content.append-right-8
%strong
.diff-changed-file-name
=
diff_file
.
blob
.
name
%span
.diff-changed-file-path.prepend-top-5
=
diff_file
.
new
_path
%span
.diff-changed-file-path.prepend-top-5
=
diff_file_path
_text
(
diff_file
)
%span
.diff-changed-stats
%span
.cgreen
<
+
#{
diff_file
.
added_lines
}
...
...
changelogs/unreleased/changes-dropdown-ellipsis.yml
0 → 100644
View file @
500a3de7
---
title
:
Fixed chanages dropdown ellipsis positioning
merge_request
:
author
:
type
:
fixed
spec/helpers/diff_helper_spec.rb
View file @
500a3de7
...
...
@@ -266,4 +266,14 @@
end
end
end
context
'#diff_file_path_text'
do
it
'returns full path by default'
do
expect
(
diff_file_path_text
(
diff_file
)).
to
eq
(
diff_file
.
new_path
)
end
it
'returns truncated path'
do
expect
(
diff_file_path_text
(
diff_file
,
max:
10
)).
to
eq
(
"...open.rb"
)
end
end
end
Write
Preview
Supports
Markdown
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