Merge pull request #3197 from nkubala/fonts

[website] unify fonts
GoogleContainerTools · Nov 6, 2019 · 29d522f · 29d522f
2 parents 5f66591 + 4737e19
commit 29d522f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 29 deletions.
diff --git a/docs/content/en/_index.html b/docs/content/en/_index.html
@@ -5,7 +5,7 @@
 
 
 <section class="main-color row td-box td-box--white position-relative td-box--gradient td-box--height-small">
-    <div class="text-color container-fluid main-container">
+    <div class="text-color container-fluid main-container skaffold-font">
         <div class="landing-section hero">
             <div class="row">
                 <div class="col-sm-1"></div>
@@ -111,29 +111,29 @@ <h4 class="h3 mb-4">Optimized Development</h4>
 
 {{< blocks/testimonial-section >}}
 
-<div class="col-lg-4 mb-5 mb-lg-0 text-center">
-    <div class="mb-4 h1">
-        <img src="../images/quora.png" style="max-width: 40%"></img>
-    </div>
-    <h4 class="testimonial h3 mb-4">"When we evaluated what workflows we could use with Kubernetes, Skaffold stood out
-        as a tool we'd want for both development and deployment. It gives us a common entry point across applications
-        that we can also reuse for CI/CD. Right now, all of our CI/CD pipelines for Kubernetes applications use Skaffold
-        when building and deploying."</h4>
-    <p class="testimonial-byline mb-0 text-left">- Taylor Barrella, Software Engineer, Quora</p>
-</div>
-
 <div class="col-lg-4 mb-5 mb-lg-0 text-center">
     <div class="mb-4 h1">
         <img src="../images/forgerock.png" style="max-width: 40%"></img>
     </div>
-    <h4 class="testimonial h3 mb-4">"ForgeRock made a strategic decision in 2016 to deliver our Identity and Access
-        Management platform on Kubernetes. Our customers love the strategy, but consistently gave us feedback that
+    <h4 class="testimonial h3 mb-4">"Our customers love [Kubernetes], but consistently gave us feedback that
         developing on Kubernetes was cumbersome. Skaffold hit the mark in addressing this problem. Changes to a docker
         image or a configuration that previously took several minutes to deploy now take seconds. Skaffold's plugin
         architecture gives us the ability to deploy to Helm or Kustomize, and to use various docker build plugins such
         as Kaniko. Skaffold replaced our bespoke collection of utilities and scripts with a streamlined tool that is
         easy to use."</h4>
-    <p class="testimonial-byline mb-0 text-left">- Warren Strange, Engineering Director, ForgeRock</p>
+    <p class="testimonial-byline mb-0 text-left">Warren Strange, Engineering Director, ForgeRock</p>
+</div>
+
+
+<div class="col-lg-4 mb-5 mb-lg-0 text-center">
+    <div class="mb-4 h1">
+        <img src="../images/quora.png" style="max-width: 40%"></img>
+    </div>
+    <h4 class="testimonial h3 mb-4">"When we evaluated what workflows we could use with Kubernetes, Skaffold stood out
+        as a tool we'd want for both development and deployment. It gives us a common entry point across applications
+        that we can also reuse for CI/CD. Right now, all of our CI/CD pipelines for Kubernetes applications use Skaffold
+        when building and deploying."</h4>
+    <p class="testimonial-byline mb-0 text-left">Taylor Barrella, Software Engineer, Quora</p>
 </div>
 
 <div class="col-lg-4 mb-5 mb-lg-0 text-center">
@@ -142,9 +142,9 @@ <h4 class="testimonial h3 mb-4">"ForgeRock made a strategic decision in 2016 to
     </div>
     <h4 class="testimonial h3 mb-4">"Skaffold is an amazing tool that simplified development and delivery for us.
         Skaffold hit our sweet spot by covering two dimensions: First, the entire development cycle from local
-        development, integration testing to delivery. Second, Skaffold enabled us to develop independent of the platform
-        on Linux, OSX and Windows with no platform specific logic required."</h4>
-    <p class="testimonial-byline mb-0 text-left">- Martin Höfling, Principal Consultant, TNG Technology Consulting
+        development, integration testing to delivery. Second, Skaffold enabled us to develop independently of the platform
+        on Linux, OSX, and Windows, with no platform specific logic required."</h4>
+    <p class="testimonial-byline mb-0 text-left">Martin Höfling, Principal Consultant, TNG Technology Consulting
         GmbH</p>
 </div>
 

diff --git a/docs/layouts/partials/hooks/head-end.html b/docs/layouts/partials/hooks/head-end.html
@@ -5,7 +5,7 @@
 <link href="/stylesheets/infopanel.css" rel="stylesheet">
 
 
-<link href="https://fonts.googleapis.com/css?family=Titillium+Web" rel="stylesheet">
+<link href="https://fonts.googleapis.com/css?family=Exo+2" rel="stylesheet">
 
 <script src="/javascripts/tabs.js"></script>
 <script src="/javascripts/fade.js"></script>

diff --git a/docs/layouts/partials/navbar.html b/docs/layouts/partials/navbar.html
@@ -1,5 +1,5 @@
 {{ $cover := .HasShortcode "blocks/cover" }}
-<nav class="skaffold-navbar navbar-font js-navbar-scroll navbar navbar-expand {{ if $cover}} td-navbar-cover {{ end }}flex-column flex-md-row td-navbar">
+<nav class="skaffold-navbar skaffold-font js-navbar-scroll navbar navbar-expand {{ if $cover}} td-navbar-cover {{ end }}flex-column flex-md-row td-navbar">
         <a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
 		<span class="navbar-logo">{{ if .Site.Params.ui.navbar_logo }}{{ with resources.Get "icons/logo.svg" }}{{ ( . | minify).Content | safeHTML }}{{ end }}{{ end }}</span><span class="skaffold-navbar text-uppercase font-weight-bold">{{ .Site.Title }}</span>
 	</a>

diff --git a/docs/layouts/shortcodes/blocks/testimonial-section.html b/docs/layouts/shortcodes/blocks/testimonial-section.html
@@ -3,7 +3,7 @@
 {{ $height := .Get "height" | default "auto"  }}
 {{ $type   := .Get "type" | default "" }} 
 <a id="td-block-{{ .Ordinal }}" class="td-offset-anchor"></a>
-<section class="testimonial-section row td-box td-box--{{ $col_id }} td-box--gradient td-box--height-{{ $height }}">
+<section class="testimonial-section skaffold-font row td-box td-box--{{ $col_id }} td-box--gradient td-box--height-{{ $height }}">
 	<div class="col">
 		<div class="row {{ $type }}">
 			{{ .Inner | markdownify}}

diff --git a/docs/layouts/shortcodes/blocks/values-section.html b/docs/layouts/shortcodes/blocks/values-section.html
@@ -3,7 +3,7 @@
 {{ $height := .Get "height" | default "auto"  }}
 {{ $type   := .Get "type" | default "" }} 
 <a id="td-block-{{ .Ordinal }}" class="td-offset-anchor"></a>
-<section class="values-section row td-box td-box--{{ $col_id }} td-box--gradient td-box--height-{{ $height }}">
+<section class="values-section skaffold-font row td-box td-box--{{ $col_id }} td-box--gradient td-box--height-{{ $height }}">
 	<div class="col">
 		<div class="row {{ $type }}">
 			{{ .Inner | markdownify}}

diff --git a/docs/static/stylesheets/font.css b/docs/static/stylesheets/font.css
@@ -1,5 +1,4 @@
 .main-container {
-    font-family: 'Titillium Web';
     margin-left: 0;
     margin-right: 0;
 }
@@ -15,16 +14,14 @@
     transition: 3s
 }
 
-.navbar-font {
-    font-family: 'Titillium Web';
-}
-
 .testimonial {
-    font-family: 'Telex';
     font-size: 1rem;
 }
 
 .testimonial-byline {
     text-align: center !important;
-    font-style: italic;
+}
+
+.skaffold-font {
+    font-family: 'Exo 2';
 }