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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
af143b3f
Commit
af143b3f
authored
Jan 23, 2017
by
Filipa Lacerda
Committed by
Annabel Dunstone Gray
Feb 08, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'revert-
a91ff32b
' into 'master'"
This reverts merge request !8688
parent
75244061
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
4 deletions
+46
-4
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+34
-0
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+4
-0
app/views/projects/diffs/_file.html.haml
app/views/projects/diffs/_file.html.haml
+1
-1
app/views/projects/diffs/_file_header.html.haml
app/views/projects/diffs/_file_header.html.haml
+3
-3
changelogs/unreleased/25709-diff-file-overflow.yml
changelogs/unreleased/25709-diff-file-overflow.yml
+4
-0
No files found.
app/assets/stylesheets/framework/files.scss
View file @
af143b3f
...
...
@@ -231,3 +231,37 @@ span.idiff {
}
}
}
.file-title-flex-parent
{
display
:
flex
;
align-items
:
center
;
background-color
:
$gray-light
;
border-bottom
:
1px
solid
$border-color
;
padding
:
10px
$gl-padding
;
margin
:
0
;
border-radius
:
3px
3px
0
0
;
>
a
{
flex
:
1
;
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
color
:
$gl-text-color
;
}
small
{
margin
:
0
10px
0
0
;
}
.file-actions
{
white-space
:
nowrap
;
.btn
{
padding
:
0
10px
;
font-size
:
13px
;
line-height
:
28px
;
display
:
inline-block
;
}
}
}
app/assets/stylesheets/pages/diff.scss
View file @
af143b3f
...
...
@@ -37,6 +37,10 @@
.file-title
{
cursor
:
pointer
;
a
:hover
{
text-decoration
:
none
;
}
&
:hover
{
background-color
:
$gray-normal
;
}
...
...
app/views/projects/diffs/_file.html.haml
View file @
af143b3f
-
environment
=
local_assigns
.
fetch
(
:environment
,
nil
)
.diff-file.file-holder
{
id:
file_hash
,
data:
diff_file_html_data
(
project
,
diff_file
.
file_path
,
diff_commit
.
id
)
}
.file-title
.file-title
-flex-parent
=
render
"projects/diffs/file_header"
,
diff_file:
diff_file
,
blob:
blob
,
diff_commit:
diff_commit
,
project:
project
,
url:
"#
#{
file_hash
}
"
-
unless
diff_file
.
submodule?
...
...
app/views/projects/diffs/_file_header.html.haml
View file @
af143b3f
...
...
@@ -10,13 +10,13 @@
-
if
diff_file
.
renamed_file
-
old_path
,
new_path
=
mark_inline_diffs
(
diff_file
.
old_path
,
diff_file
.
new_path
)
%strong
%strong
.file-title-name.has-tooltip
{
data:
{
title:
old_path
}
}
=
old_path
→
%strong
%strong
.file-title-name.has-tooltip
{
data:
{
title:
new_path
}
}
=
new_path
-
else
%strong
%strong
.file-title-name.has-tooltip
{
data:
{
title:
diff_file
.
new_path
}
}
=
diff_file
.
new_path
-
if
diff_file
.
deleted_file
deleted
...
...
changelogs/unreleased/25709-diff-file-overflow.yml
0 → 100644
View file @
af143b3f
---
title
:
Responsive title in diffs inline, side by side, with and without sidebar
merge_request
:
8475
author
:
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