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
85a3c03c
Commit
85a3c03c
authored
Jan 21, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch '25709-diff-file-overflow' into 'master'"
This reverts merge request !8475
parent
1fce08f9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
46 deletions
+4
-46
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+0
-34
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+0
-4
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
+0
-4
No files found.
app/assets/stylesheets/framework/files.scss
View file @
85a3c03c
...
@@ -231,37 +231,3 @@ span.idiff {
...
@@ -231,37 +231,3 @@ 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 @
85a3c03c
...
@@ -37,10 +37,6 @@
...
@@ -37,10 +37,6 @@
.file-title
{
.file-title
{
cursor
:
pointer
;
cursor
:
pointer
;
a
:hover
{
text-decoration
:
none
;
}
&
:hover
{
&
:hover
{
background-color
:
$gray-normal
;
background-color
:
$gray-normal
;
}
}
...
...
app/views/projects/diffs/_file.html.haml
View file @
85a3c03c
.diff-file.file-holder
{
id:
file_hash
,
data:
diff_file_html_data
(
project
,
diff_file
.
file_path
,
diff_commit
.
id
)
}
.diff-file.file-holder
{
id:
file_hash
,
data:
diff_file_html_data
(
project
,
diff_file
.
file_path
,
diff_commit
.
id
)
}
.file-title
-flex-parent
.file-title
=
render
"projects/diffs/file_header"
,
diff_file:
diff_file
,
blob:
blob
,
diff_commit:
diff_commit
,
project:
project
,
url:
"#
#{
file_hash
}
"
=
render
"projects/diffs/file_header"
,
diff_file:
diff_file
,
blob:
blob
,
diff_commit:
diff_commit
,
project:
project
,
url:
"#
#{
file_hash
}
"
-
unless
diff_file
.
submodule?
-
unless
diff_file
.
submodule?
...
...
app/views/projects/diffs/_file_header.html.haml
View file @
85a3c03c
...
@@ -10,13 +10,13 @@
...
@@ -10,13 +10,13 @@
-
if
diff_file
.
renamed_file
-
if
diff_file
.
renamed_file
-
old_path
,
new_path
=
mark_inline_diffs
(
diff_file
.
old_path
,
diff_file
.
new_path
)
-
old_path
,
new_path
=
mark_inline_diffs
(
diff_file
.
old_path
,
diff_file
.
new_path
)
%strong
.file-title-name.has-tooltip
{
data:
{
title:
old_path
}
}
%strong
=
old_path
=
old_path
→
→
%strong
.file-title-name.has-tooltip
{
data:
{
title:
new_path
}
}
%strong
=
new_path
=
new_path
-
else
-
else
%strong
.file-title-name.has-tooltip
{
data:
{
title:
diff_file
.
new_path
}
}
%strong
=
diff_file
.
new_path
=
diff_file
.
new_path
-
if
diff_file
.
deleted_file
-
if
diff_file
.
deleted_file
deleted
deleted
...
...
changelogs/unreleased/25709-diff-file-overflow.yml
deleted
100644 → 0
View file @
1fce08f9
---
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