diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3c0ff23..aeb236c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,7 @@ X-editable changelog Version 1.3.1 wip ---------------------------- +[enh #46] move 'img' dir outside 'css' (vitalets) [enh #48] fix handling of newlines in textarea input (jmfontaine) [enh #47] set select source to function (brianchance) [bug] fix inline container move on next line in IE7 (vitalets) diff --git a/grunt.js b/grunt.js index 07c2d72..58f1f3c 100644 --- a/grunt.js +++ b/grunt.js @@ -194,9 +194,9 @@ module.exports = function(grunt) { copy: { dist: { files: { - '<%= dist %>/bootstrap-editable/css/img/' : 'src/editable-form/img/*', - '<%= dist %>/jqueryui-editable/css/img/' : 'src/editable-form/img/*', - '<%= dist %>/jquery-editable/css/img/' : 'src/editable-form/img/*', + '<%= dist %>/bootstrap-editable/img/' : 'src/img/*', + '<%= dist %>/jqueryui-editable/img/' : 'src/img/*', + '<%= dist %>/jquery-editable/img/' : 'src/img/*', //licences '<%= dist %>/': ['LICENSE-MIT', 'README.md', 'CHANGELOG.txt'] }, diff --git a/src/editable-form/editable-form.css b/src/editable-form/editable-form.css index f8d82ed..b48357f 100644 --- a/src/editable-form/editable-form.css +++ b/src/editable-form/editable-form.css @@ -39,7 +39,7 @@ } .editableform-loading { - background: url('img/loading.gif') center center no-repeat; + background: url('../img/loading.gif') center center no-repeat; height: 25px; width: auto; min-width: 25px; diff --git a/src/editable-form/img/loading.gif b/src/img/loading.gif similarity index 100% rename from src/editable-form/img/loading.gif rename to src/img/loading.gif