From 4109609e639048b02c9a27a35a971db0801eb36f Mon Sep 17 00:00:00 2001
From: vitalets <noginsk@rambler.ru>
Date: Fri, 28 Dec 2012 16:09:05 +0400
Subject: [PATCH] move img dir outside css, fixes #46
---
CHANGELOG.txt | 1 +
grunt.js | 6 +++---
src/editable-form/editable-form.css | 2 +-
src/{editable-form => }/img/loading.gif | Bin
4 files changed, 5 insertions(+), 4 deletions(-)
rename src/{editable-form => }/img/loading.gif (100%)
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