#25 Add missing logo and favicons

TheHive-Project · May 15, 2017 · 8434d51 · 8434d51
1 parent 171d525
commit 8434d51
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 6 deletions.
diff --git 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
diff --git a/ui/app/favicon.png b/ui/app/favicon.png
diff --git a/ui/app/images/brain-black.png b/ui/app/images/brain-black.png
diff --git a/ui/app/images/brain-white.png b/ui/app/images/brain-white.png
diff --git 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
@@ -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
@@ -1 +1 @@
-version in ThisBuild := "1.1.0"
+version in ThisBuild := "1.1.1"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version in ThisBuild := "1.1.0"
		version in ThisBuild := "1.1.1"