Merge pull request #39 from grafana/fixlogo

fix logo paths
grafana · Dec 20, 2016 · 205cf4c · 205cf4c
2 parents d6f0e93 + 1793260
commit 205cf4c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -13,25 +13,19 @@ module.exports = function(grunt) {
       src_to_dist: {
         cwd: 'src',
         expand: true,
-        src: ['**/*', '!**/*.js', '!**/*.scss', '!img/*', '!src/plugin.json'],
+        src: ['**/*', '!**/*.js', '!**/*.scss'],
         dest: 'dist'
       },
-      img_to_dist: {
-        cwd: 'src',
-        expand: true,
-        src: ['img/*'],
-        dest: 'dist/src/'
-      },
       pluginDef: {
         expand: true,
-        src: [ 'plugin.json', 'README.md' ],
+        src: ['README.md'],
         dest: 'dist'
       }
     },
 
     watch: {
       rebuild_all: {
-        files: ['src/**/*', 'plugin.json'],
+        files: ['src/**/*'],
         tasks: ['default'],
         options: {spawn: false}
       }
@@ -84,5 +78,5 @@ module.exports = function(grunt) {
     }
   });
 
-  grunt.registerTask('default', ['clean', 'copy:src_to_dist','copy:img_to_dist', 'copy:pluginDef', 'babel', 'mochaTest']);
+  grunt.registerTask('default', ['clean', 'copy:src_to_dist', 'copy:pluginDef', 'babel', 'mochaTest']);
 };
diff --git a/dist/src/img/simpleJson_logo.svg → dist/img/simpleJson_logo.svg b/dist/src/img/simpleJson_logo.svg → dist/img/simpleJson_logo.svg
diff --git a/dist/plugin.json b/dist/plugin.json
@@ -17,8 +17,8 @@
       "url": "http://raintank.io"
     },
     "logos": {
-      "small": "src/img/simpleJson_logo.svg",
-      "large": "src/img/simpleJson_logo.svg"
+      "small": "img/simpleJson_logo.svg",
+      "large": "img/simpleJson_logo.svg"
     },
     "links": [
       {"name": "GitHub", "url": "https://github.com/grafana/simple-json-datasource"},

diff --git a/src/plugin.json b/src/plugin.json
@@ -17,8 +17,8 @@
       "url": "http://raintank.io"
     },
     "logos": {
-      "small": "src/img/simpleJson_logo.svg",
-      "large": "src/img/simpleJson_logo.svg"
+      "small": "img/simpleJson_logo.svg",
+      "large": "img/simpleJson_logo.svg"
     },
     "links": [
       {"name": "GitHub", "url": "https://github.com/grafana/simple-json-datasource"},