Commit 9497b1a7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Compare images

parent 31bc2b94
......@@ -101,18 +101,21 @@
margin:50px;
padding:1px;
max-width:400px;
}
&.diff_image_removed {
img {
&.diff_image_removed {
border: 1px solid #C00;
}
}
&.diff_image_added {
img {
&.diff_image_added {
border: 1px solid #0C0;;
}
}
&.img_compared {
img {
max-width:300px;
}
}
}
}
......
......@@ -35,7 +35,13 @@
- if file.text?
= render "commits/text_file", :diff => diff, :index => i
- elsif file.image?
.diff_file_content_image{:class => image_diff_class(diff)}
%img{:src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
- if diff.renamed_file || diff.new_file || diff.deleted_file
.diff_file_content_image
%img{:class => image_diff_class(diff), :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
- else
- old_file = (@commit.prev_commit.tree / diff.old_path)
.diff_file_content_image.img_compared
%img{:class => "diff_image_removed", :src => "data:#{file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
%img{:class => "diff_image_added", :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
- else
%p.nothing_here_message No preview for this file type
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