#22 Use the new cortex logo

TheHive-Project · May 9, 2017 · 2862a9e · 2862a9e
1 parent f080f66
commit 2862a9e
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 11 deletions.
diff --git a/ui/app/images/favicons/favicon-128.png b/ui/app/images/favicons/favicon-128.png
diff --git a/ui/app/images/favicons/favicon-16x16.png b/ui/app/images/favicons/favicon-16x16.png
diff --git a/ui/app/images/favicons/favicon-196x196.png b/ui/app/images/favicons/favicon-196x196.png
diff --git a/ui/app/images/favicons/favicon-32x32.png b/ui/app/images/favicons/favicon-32x32.png
diff --git a/ui/app/images/favicons/favicon-96x96.png b/ui/app/images/favicons/favicon-96x96.png
diff --git a/ui/app/images/logo-small.svg b/ui/app/images/logo-small.svg
diff --git a/ui/app/index.html b/ui/app/index.html
@@ -9,7 +9,11 @@
     <meta name="viewport" content="width=device-width">
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
 
-    <link rel="icon" type="image/png" href="favicon.png" />
+	<link rel="icon" type="image/png" href="images/favicons/favicon-196x196.png" sizes="196x196" />
+	<link rel="icon" type="image/png" href="images/favicons/favicon-96x96.png" sizes="96x96" />
+	<link rel="icon" type="image/png" href="images/favicons/favicon-32x32.png" sizes="32x32" />
+	<link rel="icon" type="image/png" href="images/favicons/favicon-16x16.png" sizes="16x16" />
+	<link rel="icon" type="image/png" href="images/favicons/favicon-128.png" sizes="128x128" />
 
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
     <!-- build:css(.) styles/vendor.css -->

diff --git a/ui/app/styles/main.css b/ui/app/styles/main.css
@@ -7,13 +7,10 @@ body {
     margin-bottom: 30px;
 }
 
-
 .footer {
-    /*margin-top: 30px;*/
     height: 50px;
 }
 
-
 .clickable {
     cursor: pointer;
 }
@@ -26,12 +23,13 @@ body {
 .nowrap {
     white-space: nowrap;
 }
-/*.header,
-.footer {
-    padding-left: 15px;
-    padding-right: 15px;
-}*/
-
+.navbar-header {
+    padding-left: 10px;
+}
+.navbar-brand {
+    width: 130px;
+    padding: 12px 15px;
+}
 .footer {
     padding-top: 19px;
     border-top: 1px solid #e5e5e5;

diff --git a/ui/app/views/components/header.component.html b/ui/app/views/components/header.component.html
@@ -12,7 +12,10 @@
 <nav class="navbar navbar-static-top" ng-controller="NavCtrl as nav">
     <div class="container">
         <div class="navbar-header">
-            <a href class="navbar-brand"><b>Cortex</b></a>
+            <!-- <a href class="navbar-brand"><b>Cortex</b></a> -->
+            <a class="navbar-brand" ui-sref="analyzers">
+                <img alt="Cortex" src="images/logo-small.svg">
+            </a>
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
 				<i class="fa fa-bars"></i>
 			</button>