mirror of https://github.com/istio/istio.io.git
A few fixes (#1007)
- Add support for showing the archive date in the footer. - Fix invalid HTML in the header which improves the responsive layout. In particular, the down arrow for the dropdown menu tends to stay on the same line as the cog more than before. - Tone down the blue color of links so it's not so intense. There's still good contrast between links and normal text. - Remove broken og:image meta tag from each page. It used to point to a logo.png file, which we deleted months ago. Turns out it's not intended for web site logos anyway. - Add og:url and og:site_name per best practices. - Remove one more stray border on the community page. I thought I got rid of 'em last time, but I missed one.
This commit is contained in:
Martin Taillefer
GitHub
parent
2b15486854
commit
fd5d4a2cb2
|
|
@ -1,4 +1,5 @@
|
|||
version: 0.6pre
|
||||
short_version: 0.6
|
||||
archive: false
|
||||
archive_date: DD-MMM-YYYY
|
||||
search_engine_id: "013699703217164175118:veyyqmfmpj4"
|
||||
|
|
|
|||
|
|
@ -46,7 +46,11 @@
|
|||
<div class="col-12">
|
||||
<p class="description text-center" role="contentinfo">
|
||||
Istio Release {{site.data.istio.version}}, Copyright © 2018 Istio Authors<br>
|
||||
This site was built on {{site.time | date_to_string | split: ' ' | join: '-'}}
|
||||
{% if site.data.istio.archive %}
|
||||
Archived on {{site.data.istio.archive_date}}
|
||||
{% else %}
|
||||
This site was built on {{site.time | date_to_string | split: ' ' | join: '-'}}
|
||||
{% endif %}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
{% assign visibility = "visible" %}
|
||||
{% endif %}
|
||||
|
||||
<a class="navbar-brand d-flex w-50 mr-auto" href="{{home}}/" style="visibility: {{visibility}}">
|
||||
<a class="navbar-brand" href="{{home}}/" style="visibility: {{visibility}}">
|
||||
<img class="logo" src="{{home}}/img/istio-logo.svg" alt="Istio Logo"/>
|
||||
{% if site.data.istio.archive %}
|
||||
<span class="brand-name">Istioldie {{site.data.istio.short_version}}</span>
|
||||
|
|
@ -23,106 +23,115 @@
|
|||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
||||
<div class="collapse navbar-collapse" id="navbarCollapse">
|
||||
<div class="navbar-nav justify-content-end">
|
||||
<a class="nav-item nav-link {% if current[1] == 'about' %}active{% endif %}" href="{{home}}/about/intro.html">About</a>
|
||||
<a class="nav-item nav-link {% if current[1] == 'blog' %}active{% endif %}" href="{{latest_blog_post}}">Blog</a>
|
||||
<a class="nav-item nav-link {% if current[1] == 'docs' %}active{% endif %}" href="{{home}}/docs/">Docs</a>
|
||||
<a class="nav-item nav-link {% if current[1] == 'help' %}active{% endif %}" href="{{home}}/help">Help</a>
|
||||
<a class="nav-item nav-link {% if current[1] == 'community.html' %}active{% endif %}" href="{{home}}/community">Community</a>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse justify-content-end" id="navbarCollapse">
|
||||
<ul class="navbar-nav">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if current[1] == 'about' %}active{% endif %}" href="{{home}}/about/intro.html">About</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if current[1] == 'blog' %}active{% endif %}" href="{{latest_blog_post}}">Blog</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if current[1] == 'docs' %}active{% endif %}" href="{{home}}/docs/">Docs</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if current[1] == 'help' %}active{% endif %}" href="{{home}}/help">Help</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link {% if current[1] == 'community.html' %}active{% endif %}" href="{{home}}/community">Community</a>
|
||||
</li>
|
||||
|
||||
<div class="dropdown">
|
||||
<a href="" class="nav-link nav-item dropdown-toggle" data-toggle="dropdown" aria-haspopup="true"
|
||||
aria-expanded="false">
|
||||
<i class='fa fa-lg fa-cog'></i>
|
||||
</a>
|
||||
<li class="nav-item dropdown" id="gearDropdown">
|
||||
<a href="" class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
<i class='fa fa-lg fa-cog'></i>
|
||||
</a>
|
||||
|
||||
<div class="dropdown-menu">
|
||||
{% assign target = "" %}
|
||||
{% if current[1] == 'about' %}
|
||||
{% assign target = "about" %}
|
||||
{% elsif current[1] == 'blog' %}
|
||||
{% assign target = "blog" %}
|
||||
{% elsif current[1] == 'community.html' %}
|
||||
{% assign target = "community" %}
|
||||
{% elsif current[1] == 'help' %}
|
||||
{% assign target = "help" %}
|
||||
{% elsif current[1] == 'docs' %}
|
||||
{% assign target = "docs" %}
|
||||
{% if current[2] == 'reference' %}
|
||||
{% assign target = "docs/reference" %}
|
||||
{% elsif current[2] == 'guides' %}
|
||||
{% assign target = "docs/guides" %}
|
||||
{% elsif current[2] == 'tasks' %}
|
||||
{% assign target = "docs/tasks" %}
|
||||
{% elsif current[2] == 'concepts' %}
|
||||
{% assign target = "docs/concepts" %}
|
||||
{% elsif current[2] == 'setup' %}
|
||||
{% assign target = "docs/setup" %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if site.data.istio.archive %}
|
||||
<li>
|
||||
<i style="visibility: hidden" class='fa fa-check'></i>
|
||||
<a href="https://istio.io/{{target}}">Latest</a>
|
||||
</li>
|
||||
{% else %}
|
||||
<li>
|
||||
<i class='fa fa-check'></i>
|
||||
<a href="https://istio.io/{{target}}">{{site.data.istio.short_version}}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{% for a in site.data.archives.archives %}
|
||||
|
||||
{% if a == "v0.1" %}
|
||||
{% if target == "docs/setup" %}
|
||||
{% assign target = "docs/tasks/installing-istio" %}
|
||||
{% elsif target == "docs/guides" %}
|
||||
{% assign target = "docs/samples" %}
|
||||
{% elsif target == "help" %}
|
||||
{% assign target = "faq" %}
|
||||
{% endif %}
|
||||
{% else if a == "v0.2" %}
|
||||
{% if target == "help" %}
|
||||
{% assign target = "faq" %}
|
||||
<ul class="dropdown-menu" aria-labelledby="gearDropdown">
|
||||
{% assign target = "" %}
|
||||
{% if current[1] == 'about' %}
|
||||
{% assign target = "about" %}
|
||||
{% elsif current[1] == 'blog' %}
|
||||
{% assign target = "blog" %}
|
||||
{% elsif current[1] == 'community.html' %}
|
||||
{% assign target = "community" %}
|
||||
{% elsif current[1] == 'help' %}
|
||||
{% assign target = "help" %}
|
||||
{% elsif current[1] == 'docs' %}
|
||||
{% assign target = "docs" %}
|
||||
{% if current[2] == 'reference' %}
|
||||
{% assign target = "docs/reference" %}
|
||||
{% elsif current[2] == 'guides' %}
|
||||
{% assign target = "docs/guides" %}
|
||||
{% elsif current[2] == 'tasks' %}
|
||||
{% assign target = "docs/tasks" %}
|
||||
{% elsif current[2] == 'concepts' %}
|
||||
{% assign target = "docs/concepts" %}
|
||||
{% elsif current[2] == 'setup' %}
|
||||
{% assign target = "docs/setup" %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
<li>
|
||||
{% assign selected = false %}
|
||||
{% if site.data.istio.archive %}
|
||||
{% assign vname = site.data.istio.short_version | prepend: "v" %}
|
||||
{% if vname == a %}
|
||||
{% assign selected = true %}
|
||||
{% if site.data.istio.archive %}
|
||||
<li>
|
||||
<i style="visibility: hidden" class='fa fa-check'></i>
|
||||
<a href="https://istio.io/{{target}}">Latest</a>
|
||||
</li>
|
||||
{% else %}
|
||||
<li>
|
||||
<i class='fa fa-check'></i>
|
||||
<a href="https://istio.io/{{target}}">{{site.data.istio.short_version}}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{% for a in site.data.archives.archives %}
|
||||
|
||||
{% if a == "v0.1" %}
|
||||
{% if target == "docs/setup" %}
|
||||
{% assign target = "docs/tasks/installing-istio" %}
|
||||
{% elsif target == "docs/guides" %}
|
||||
{% assign target = "docs/samples" %}
|
||||
{% elsif target == "help" %}
|
||||
{% assign target = "faq" %}
|
||||
{% endif %}
|
||||
{% else if a == "v0.2" %}
|
||||
{% if target == "help" %}
|
||||
{% assign target = "faq" %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if selected %}
|
||||
<i class='fa fa-check'></i>
|
||||
{% else %}
|
||||
<i style="visibility: hidden;" class='fa fa-check'></i>
|
||||
{% endif %}
|
||||
<li>
|
||||
{% assign selected = false %}
|
||||
{% if site.data.istio.archive %}
|
||||
{% assign vname = site.data.istio.short_version | prepend: "v" %}
|
||||
{% if vname == a %}
|
||||
{% assign selected = true %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
<a href="https://archive.istio.io/{{a}}/{{target}}">Archive {{a}}</a>
|
||||
{% if selected %}
|
||||
<i class='fa fa-check'></i>
|
||||
{% else %}
|
||||
<i style="visibility: hidden;" class='fa fa-check'></i>
|
||||
{% endif %}
|
||||
|
||||
<a href="https://archive.istio.io/{{a}}/{{target}}">Archive {{a}}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
|
||||
<li class="dropdown-divider"></li>
|
||||
|
||||
<li>
|
||||
<i class='fa fa-check light'></i>
|
||||
<a href="" onclick="setActiveStyleSheet('light');return false;">Light Theme</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
|
||||
<li class="dropdown-divider"></li>
|
||||
|
||||
<li>
|
||||
<i class='fa fa-check light'></i>
|
||||
<a href="" onclick="setActiveStyleSheet('light');return false;">Light Theme</a>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<i class='fa fa-check dark'></i>
|
||||
<a href="" onclick="setActiveStyleSheet('dark');return false;">Dark Theme</a>
|
||||
</li>
|
||||
</div>
|
||||
</div>
|
||||
<li>
|
||||
<i class='fa fa-check dark'></i>
|
||||
<a href="" onclick="setActiveStyleSheet('dark');return false;">Dark Theme</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<form name="cse" id="searchbox" class="form-inline justify-content-end" role="search">
|
||||
<input type="hidden" name="cx" value="{{site.data.istio.search_engine_id}}" />
|
||||
|
|
|
|||
|
|
@ -9,19 +9,23 @@ layout: compress
|
|||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
<meta name="title" content="{{page.title}}">
|
||||
<meta name="og:title" content="{{page.title}}">
|
||||
<meta name="og:image" content="{{home}}/img/logo.png"/>
|
||||
<meta name="theme-color" content="#466BB0"/>
|
||||
|
||||
{% if page.overview == nil %}
|
||||
<meta name="description" content="An open platform to connect, manage, and secure microservices.">
|
||||
<meta name="og:description" content="An open platform to connect, manage, and secure microservices.">
|
||||
{% assign description = "An open platform to connect, manage, and secure microservices." %}
|
||||
{% else %}
|
||||
<meta name="description" content="{{page.overview}}">
|
||||
<meta name="og:description" content="{{page.overview}}">
|
||||
{% assign description = page.overview %}
|
||||
{% endif %}
|
||||
|
||||
<meta name="title" content="{{page.title}}">
|
||||
<meta name="description" content="{{description}}">
|
||||
|
||||
<!-- Open Graph protocol -->
|
||||
<meta name="og:title" content="{{page.title}}">
|
||||
<meta name="og:description" content="{{description}}">
|
||||
<meta name="og:url" content="{{page.url}}">
|
||||
<meta name="og.site_name" content="Istio">
|
||||
|
||||
{% if site.data.istio.archive %}
|
||||
{% if page.title == 'Istio' %}
|
||||
<title>Istioldie {{site.data.istio.short_version}}</title>
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
td.logo {
|
||||
width : 65px;
|
||||
border: none;
|
||||
}
|
||||
|
||||
td.desc {
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ $backgroundColor: $white;
|
|||
$textColor: #535f61;
|
||||
$textCodeColor: #d14;
|
||||
|
||||
$linkColor: #469BFF;
|
||||
$linkColor: #469Bdd;
|
||||
$linkHoverColor: darken($linkColor, 20%);
|
||||
$linkDisabledColor: #CCCCCC;
|
||||
$linkActiveColor: #b05464;
|
||||
|
|
|
|||
Loading…
Reference in New Issue