Commit a91ff32b authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '25709-diff-file-overflow' into 'master'

Responsive title in diffs inline, side by side, with and without sidebar

Closes #25709

See merge request !8475
parents ff75bd04 1446a03e
...@@ -231,3 +231,37 @@ span.idiff { ...@@ -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;
}
}
}
...@@ -37,6 +37,10 @@ ...@@ -37,6 +37,10 @@
.file-title { .file-title {
cursor: pointer; cursor: pointer;
a:hover {
text-decoration: none;
}
&:hover { &:hover {
background-color: $gray-normal; background-color: $gray-normal;
} }
......
.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 .file-title-flex-parent
= 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?
......
...@@ -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 %strong.file-title-name.has-tooltip{ data: { title: old_path } }
= old_path = old_path
→ →
%strong %strong.file-title-name.has-tooltip{ data: { title: new_path } }
= new_path = new_path
- else - else
%strong %strong.file-title-name.has-tooltip{ data: { title: diff_file.new_path } }
= diff_file.new_path = diff_file.new_path
- if diff_file.deleted_file - if diff_file.deleted_file
deleted deleted
......
---
title: Responsive title in diffs inline, side by side, with and without sidebar
merge_request: 8475
author:
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