Option for logo only visible on 'home' page

mozilla · May 10, 2019 · 0efb92b · 0efb92b
1 parent 0aebf18
commit 0efb92b
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 19 deletions.
diff --git a/meteor/client/menu.html b/meteor/client/menu.html
@@ -11,8 +11,7 @@
         <div id="header" class="row center">
             <span id="nav-main">
                 <ul>
-                    <li><img class="mozillalogo" src="/images/mozilla.svg"></li>
-                    <li><a class="mozdef" href="/" title="MOZDEF">MOZDEF</a></li>
+                    <li><a href="/">Home</a></li>
                     {{#if isFeature "kibana"}}
                         <li> <a target="_blank" href={{ resolveKibanaURL mozdef.kibanaURL }}>Kibana</a>
                             <ul>

diff --git a/meteor/client/mozdef.html b/meteor/client/mozdef.html
@@ -8,7 +8,7 @@
 <head>
     <meta name="viewport" content="width=1024">
     <link rel="shortcut icon" type="image/svg" href="/images/favicon.ico" />
-    <title>mozdef::mozilla defense platform</title>
+    <title>mozdef::mozilla enterprise defense platform</title>
 </head>
 
 <body>
@@ -58,7 +58,8 @@
 <template name="hello">
     <div class="container">
         <div class="row center">
-            <p class="welcome">{{greeting}}<br>Hand made by Mozilla</p>
+            <!--a nice greeting-->
+                <p class="welcome"><img class="mozdeflogo" src="/images/moz_defense-platform_01.png"><br/>{{greeting}}</p>
         </div>
     </div>
 </template>

diff --git a/meteor/client/mozdef.js b/meteor/client/mozdef.js
@@ -174,14 +174,14 @@ if ( Meteor.isClient ) {
         greeting: function() {
             if ( typeof console !== 'undefined' )
                 console.log( "mozdef starting" );
-            return "MozDef: The Mozilla Defense Platform";
+            return "Hand Made by Mozilla";
         }
     } );
 
     Template.hello.events( {
         'click': function() {
             // template data, if any, is available in 'this'
-            Session.set( 'displayMessage', 'Welcome &amp; to mozdef.' )
+            Session.set( 'displayMessage', 'Welcome to mozdef.' )
         }
     } );
 

diff --git a/meteor/imports/themes/classic/mozdef.css b/meteor/imports/themes/classic/mozdef.css
@@ -81,6 +81,21 @@ caption, legend {
     overflow: visible;
 }
 
+/* Home Page Styling */
+.welcome {
+    height: 180px;
+    width: 600px;
+    margin-left: 25%;
+    text-align: center;
+    color: var(--txt-primary-color);
+    vertical-align: middle;
+}
+
+.mozdeflogo{
+  width: 500px;
+  vertical-align: middle;
+}
+
 #bottom-toolbar {
   background: var(--bg-secondary-color);
   width: 100%;
@@ -285,10 +300,6 @@ td{
   color: var(--txt-primary-color);
 }
 
-.welcome {
-    text-align: center;
-}
-
 .tabcontent{
     margin-top: 20px;
 }

diff --git a/meteor/imports/themes/dark/mozdef.css b/meteor/imports/themes/dark/mozdef.css
@@ -61,6 +61,21 @@ caption, legend {
     overflow: visible;
 }
 
+/* Home Page Styling */
+.welcome {
+    height: 180px;
+    width: 600px;
+    margin-left: 25%;
+    text-align: center;
+    color: var(--txt-primary-color);
+    vertical-align: middle;
+}
+
+.mozdeflogo{
+  width: 500px;
+  vertical-align: middle;
+}
+
 #bottom-toolbar {
   background: #444444;
   width: 100%;
@@ -233,11 +248,6 @@ td{
   color:white;
 }
 
-
-.welcome {
-    text-align: center;
-}
-
 .tabcontent{
     margin-top: 20px;
 }

diff --git a/meteor/imports/themes/light/mozdef.css b/meteor/imports/themes/light/mozdef.css
@@ -72,6 +72,27 @@ caption, legend {
     overflow: visible;
 }
 
+/* Home Page Styling */
+.welcome {
+    height: 180px;
+    width: 600px;
+    margin-left: 25%;
+    text-align: center;
+    color: var(--txt-primary-color);
+    vertical-align: middle;
+}
+
+.mozdeflogo{
+  width: 500px;
+  vertical-align: middle;
+}
+
+/* dc-chart empty color */
+.dc-chart .empty-chart .pie-slice path {
+    fill: #bcb8b8;
+    cursor: default;
+}
+
 #bottom-toolbar {
   background: var(--bg-secondary-color);
   width: 100%;
@@ -282,10 +303,6 @@ td{
   color: var(--txt-primary-color);
 }
 
-.welcome {
-    text-align: center;
-}
-
 .tabcontent{
     margin-top: 20px;
 }

diff --git a/meteor/public/images/moz_defense-platform_01.png b/meteor/public/images/moz_defense-platform_01.png