Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[website] unify fonts #3197

Merged
merged 2 commits into from
Nov 6, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docs/content/en/_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -119,7 +119,7 @@ <h4 class="testimonial h3 mb-4">"When we evaluated what workflows we could use w
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>
<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">
Expand All @@ -133,7 +133,7 @@ <h4 class="testimonial h3 mb-4">"ForgeRock made a strategic decision in 2016 to
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">
Expand All @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion docs/layouts/partials/hooks/head-end.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion docs/layouts/partials/navbar.html
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion docs/layouts/shortcodes/blocks/testimonial-section.html
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion docs/layouts/shortcodes/blocks/values-section.html
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
2 changes: 2 additions & 0 deletions docs/static/stylesheets/colors.css
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ input.td-search-input::placeholder {
}

.values-section {
/* font-family: 'Titillium Web'; */
nkubala marked this conversation as resolved.
Show resolved Hide resolved

background-color: var(--values-color);
color: var(--values-foreground);

Expand Down
11 changes: 4 additions & 7 deletions docs/static/stylesheets/font.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.main-container {
font-family: 'Titillium Web';
margin-left: 0;
margin-right: 0;
}
Expand All @@ -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';
}