deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2026 from koenpunt/extended-image-diff

Browse source 
Added bg for transparent images
This commit is contained in:
Dmitriy Zaporozhets 2012-11-21 12:56:06 -08:00
parent 7392d28dca 1de0ea28b9
commit 9e8aadb0f0
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/trans_bg.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 58 B

5
app/assets/stylesheets/sections/commits.scss
View file

@ -133,9 +133,12 @@
.image { .image {
display: inline-block; display: inline-block;
margin:50px; margin:50px;
padding:1px;
max-width:400px; max-width:400px;
img{
background: url('trans_bg.gif');
}
&.diff_removed { &.diff_removed {
img{ img{
border: 1px solid #C00; border: 1px solid #C00;

15
app/views/commit/show.html.haml
View file

@ -7,4 +7,19 @@
:javascript :javascript
$(function(){ $(function(){
PerLineNotes.init(); PerLineNotes.init();
var w, h;
$('.diff_file').each(function(){
$('.image.diff_removed img', this).on('load', $.proxy(function(event){
var w = event.currentTarget.naturalWidth
, h = event.currentTarget.naturalHeight;
$('.image.diff_removed .image-info', this).append(' | <b>W:</b> ' + w + 'px | <b>H:</b> ' + h + 'px');
}, this));
$('.image.diff_added img', this).on('load', $.proxy(function(event){
var w = event.currentTarget.naturalWidth
, h = event.currentTarget.naturalHeight;
$('.image.diff_added .image-info', this).append(' | <b>W:</b> ' + w + 'px | <b>H:</b> ' + h + 'px');
}, this));
});
}); });