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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
eed4439e
Commit
eed4439e
authored
Sep 11, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed overflow issue in changes dropdown
parent
7bd66b76
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+9
-1
app/views/projects/diffs/_stats.html.haml
app/views/projects/diffs/_stats.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/diff.scss
View file @
eed4439e
...
@@ -634,8 +634,16 @@
...
@@ -634,8 +634,16 @@
padding-top
:
8px
;
padding-top
:
8px
;
padding-bottom
:
8px
;
padding-bottom
:
8px
;
}
}
.diff-changed-file
{
display
:
flex
;
align-items
:
center
;
}
}
}
.diff-file-changes-path
{
.diff-file-changes-path
{
@include
str-truncated
(
78%
);
flex
:
1
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
}
}
app/views/projects/diffs/_stats.html.haml
View file @
eed4439e
...
@@ -21,9 +21,9 @@
...
@@ -21,9 +21,9 @@
%ul
%ul
-
diff_files
.
each
do
|
diff_file
|
-
diff_files
.
each
do
|
diff_file
|
%li
%li
%a
{
href:
"##{hexdigest(diff_file.file_path)}"
,
title:
diff_file
.
new_path
}
%a
.diff-changed-file
{
href:
"##{hexdigest(diff_file.file_path)}"
,
title:
diff_file
.
new_path
}
=
icon
(
"
#{
diff_file_changed_icon
(
diff_file
)
}
fw"
,
class:
"
#{
diff_file_changed_icon_color
(
diff_file
)
}
append-right-5"
)
=
icon
(
"
#{
diff_file_changed_icon
(
diff_file
)
}
fw"
,
class:
"
#{
diff_file_changed_icon_color
(
diff_file
)
}
append-right-5"
)
%span
.diff-file-changes-path
=
diff_file
.
new_path
%span
.diff-file-changes-path
.append-right-5
=
diff_file
.
new_path
.pull-right
.pull-right
%span
.cgreen
<
%span
.cgreen
<
+
#{
diff_file
.
added_lines
}
+
#{
diff_file
.
added_lines
}
...
...
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