Commit 2cd6cc7f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'improve-diff-header' into 'master'

Fix file mode going to next line in diff header

See merge request !432
parents 17192d1b 61700f61
...@@ -15,6 +15,11 @@ ...@@ -15,6 +15,11 @@
word-break: break-all; word-break: break-all;
margin-right: 200px; margin-right: 200px;
display: block; display: block;
.file-mode {
margin-left: 10px;
color: #777;
}
} }
.diff-btn-group { .diff-btn-group {
...@@ -34,11 +39,6 @@ ...@@ -34,11 +39,6 @@
font-family: $monospace_font; font-family: $monospace_font;
font-size: smaller; font-size: smaller;
} }
.file-mode {
font-family: $monospace_font;
margin-left: 10px;
}
} }
.diff-content { .diff-content {
overflow: auto; overflow: auto;
......
...@@ -13,12 +13,13 @@ ...@@ -13,12 +13,13 @@
- submodule_item = project.repository.blob_at(@commit.id, diff_file.file_path) - submodule_item = project.repository.blob_at(@commit.id, diff_file.file_path)
= submodule_link(submodule_item, @commit.id) = submodule_link(submodule_item, @commit.id)
- else - else
- if diff_file.renamed_file %span
%span= "#{diff_file.old_path} renamed to #{diff_file.new_path}" - if diff_file.renamed_file
- else = "#{diff_file.old_path} renamed to #{diff_file.new_path}"
%span= diff_file.new_path - else
- if diff_file.mode_changed? = diff_file.new_path
%span.file-mode= "#{diff_file.diff.a_mode}#{diff_file.diff.b_mode}" - if diff_file.mode_changed?
%span.file-mode= "#{diff_file.diff.a_mode}#{diff_file.diff.b_mode}"
.diff-btn-group .diff-btn-group
- if blob.text? - if blob.text?
......
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