diff --git a/ui/Gruntfile.js b/ui/Gruntfile.js index 62cddcbef..eeb160d96 100644 --- a/ui/Gruntfile.js +++ b/ui/Gruntfile.js @@ -248,7 +248,7 @@ module.exports = function(grunt) { src: [ '<%= yeoman.dist %>/scripts/{,*/}*.js', '<%= yeoman.dist %>/styles/{,*/}*.css', - '<%= yeoman.dist %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}', + // '<%= yeoman.dist %>/images/{,*/}*.{png,jpg,jpeg,gif,webp,svg}', '<%= yeoman.dist %>/styles/fonts/*' ] } @@ -404,7 +404,7 @@ module.exports = function(grunt) { 'images/{,*/}*.{webp}', 'styles/fonts/{,*/}*.*' ] - }, { + },{ expand: true, cwd: '.tmp/images', dest: '<%= yeoman.dist %>/images', @@ -427,6 +427,12 @@ module.exports = function(grunt) { cwd: '<%= yeoman.app %>/styles', dest: '.tmp/styles/', src: '{,*/}*.css' + }, + images: { + expand: true, + cwd: '<%= yeoman.app %>/images', + dest: '<%= yeoman.dist %>/images', + src: '{,*/}*.{png,jpg,jpeg,gif,svg}' } }, @@ -439,7 +445,8 @@ module.exports = function(grunt) { 'copy:styles' ], dist: [ - 'copy:styles'/*, + 'copy:styles', + 'copy:images'/*, 'imagemin', 'svgmin'*/ ] diff --git a/ui/app/apple-touch-icon.png b/ui/app/apple-touch-icon.png deleted file mode 100644 index cfd4700dc..000000000 Binary files a/ui/app/apple-touch-icon.png and /dev/null differ diff --git a/ui/app/favicon.png b/ui/app/favicon.png deleted file mode 100644 index cfd4700dc..000000000 Binary files a/ui/app/favicon.png and /dev/null differ diff --git a/ui/app/images/brain-black.png b/ui/app/images/brain-black.png deleted file mode 100644 index cfd4700dc..000000000 Binary files a/ui/app/images/brain-black.png and /dev/null differ diff --git a/ui/app/images/brain-white.png b/ui/app/images/brain-white.png deleted file mode 100644 index 42cb34f7b..000000000 Binary files a/ui/app/images/brain-white.png and /dev/null differ diff --git a/ui/bower.json b/ui/bower.json index 3fdb8d93c..b395db1e0 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -1,6 +1,6 @@ { "name": "cortex", - "version": "1.0.2", + "version": "1.1.1", "dependencies": { "angular": "1.5.10", "angular-sanitize": "1.5.10", diff --git a/ui/package.json b/ui/package.json index 62340c891..f94ad7faa 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "cortex", - "version": "1.0.2", + "version": "1.1.1", "license": "AGPL-3.0", "repository": { "type": "git", diff --git a/version.sbt b/version.sbt index 48af491ec..61ca1d82e 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "1.1.0" +version in ThisBuild := "1.1.1"