Skip to content

Commit

Permalink
put back inline-block for select2 drop downs
Browse files Browse the repository at this point in the history
  • Loading branch information
ncannasse committed Apr 22, 2016
1 parent 534d1e4 commit 28ded93
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 93 deletions.
184 changes: 92 additions & 92 deletions bin/castle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/Main.hx
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,8 @@ class Main extends Model {
var height = v.size * (v.height == null?1:v.height);
var max = width > height ? width : height;
var zoom = max <= 32 ? 2 : 64 / max;
var html = '<div class="tile" id="_c${id}" style="width : ${Std.int(width * zoom)}px; height : ${Std.int(height * zoom)}px; background : url(\'$path\') -${Std.int(v.size*v.x*zoom)}px -${Std.int(v.size*v.y*zoom)}px; "></div>';
var inl = isInline ? 'display:inline-block;' : '';
var html = '<div class="tile" id="_c${id}" style="width : ${Std.int(width * zoom)}px; height : ${Std.int(height * zoom)}px; background : url(\'$path\') -${Std.int(v.size*v.x*zoom)}px -${Std.int(v.size*v.y*zoom)}px; $inl"></div>';
html += '<img src="$path" style="display:none" onload="$(\'#_c$id\').css({backgroundSize : ((this.width*$zoom)|0)+\'px \' + ((this.height*$zoom)|0)+\'px\' '+(zoom > 1 ? ", imageRendering : 'pixelated'" : "") +'}); if( this.parentNode != null ) this.parentNode.removeChild(this)"/>';
return html;
}
Expand Down

0 comments on commit 28ded93

Please sign in to comment.