Merge branch 'master' into rbac-ingress-key-cert

istio · Dec 5, 2017 · 3228b41 · 3228b41
2 parents 537d922 + 335a53e
commit 3228b41
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/_includes/nav.html b/_includes/nav.html
@@ -23,7 +23,8 @@
             </button>
             <a class="navbar-brand" href="{{home}}/">
               <div>
-                <img src="{{home}}/img/istio-logo-and-name-horizontal.svg" alt="Istio Logo and Name" height="54px"/>
+                <img src="{{home}}/img/istio-logo.svg" alt="Istio Logo" height="54px"/>
+                <span class="brand-name">Istio</span>
               </div>
             </a>
           </div>

diff --git a/_sass/layouts/_landing.scss b/_sass/layouts/_landing.scss
@@ -31,6 +31,13 @@
       padding: 0;
     }
 
+    .hero-label {
+      color: white;
+      margin: 80px 0 0 0;
+      padding: 0;
+      font-size: 62px;
+    }
+
     .hero-lead {
       color: $white;
       display: block;
@@ -54,6 +61,9 @@
       .hero-logo {
         margin: 28px 0 0 0;
       }
+      .hero-lebal {
+        margin: 30px 0 0 0;
+      }
       .hero-lead {
         margin: 32px 0 0 0;
       }

diff --git a/_sass/modules/_nav.scss b/_sass/modules/_nav.scss
@@ -26,9 +26,11 @@
 
 .brand-name {
   color: $white;
-  font-weight: 300;
+  font-weight: 400;
   font-size: 1.7em;
   vertical-align: bottom;
+  line-height: 1.3em;
+  margin-left: 15px;
 }
 
 .navbar-brand {

diff --git a/index.html b/index.html
@@ -7,7 +7,8 @@
 <div class="nav-hero-container">
     <div class="hero">
         <div class="container">
-            <img class="hero-logo" alt="Istio Logo and Label" src="{{home}}/img/istio-logo-and-name-vertical.svg" />
+            <h1 class="hero-label">Istio</h1>
+            <img class="hero-logo" alt="Istio Logo" src="{{home}}/img/istio-logo.svg" />
             <h1 class="hero-lead">An open platform to connect, manage, and secure microservices</h1>
             <span class="hero-down-arrow fa fa-2 fa-caret-down"></span>
         </div>