Skip to content

Moved language menu to top nav #15565

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.

Sign up for GitHub

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+47 −64
Open

Moved language menu to top nav #15565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eac64a2
moved language menu to top nav
milinddethe15 Aug 15, 2024
e3b27ae
change lang menu title to en/关于
milinddethe15 Aug 16, 2024
cad3559
Merge branch 'master' into lang-dropdown
milinddethe15 Dec 27, 2024
24f5b0b
add language switcher with dropdown
milinddethe15 Jan 9, 2025
c5cd1e8
Update assets/sass/misc/_header.scss
milinddethe15 Jan 9, 2025
7c161a4
Update _header.scss
milinddethe15 Jan 9, 2025
c3e74f6
fix header width
milinddethe15 Jan 13, 2025
ab0a99f
header min-width and inline-flex display
milinddethe15 Jan 18, 2025
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
27 changes: 0 additions & 27 deletions assets/sass/misc/_footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,33 +71,6 @@
}
}

.footer-languages {
margin-top: 1.7rem;
display: flex;
align-self: center;

&-item {
display: inline-flex;
align-items: center;
font-weight: $mediumWeight;

&:not(:first-child) {
margin-left: 1rem;
}

&.active {
color: $accentColor;
}
}

svg.icon.tick {
fill: $accentColor;
stroke: $accentColor;
stroke-width: 3px;
margin-right: .5rem;
}
}

.footer-policies {
grid-area: footer-policies;
list-style-type: none;
Expand Down
10 changes: 8 additions & 2 deletions assets/sass/misc/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@
margin-left: 1rem;
}

svg.language-outline {
width: 1.6em;
height: 1.6em;
stroke-width: 0;
}

#search-show {
display: none;
@media (min-width: $bp-lg) {
Expand Down Expand Up @@ -417,7 +423,7 @@
}

&-links {
display: inline-block;
display: inline-flex;

&-item {
display: inline-block;
Expand Down Expand Up @@ -472,7 +478,7 @@
}

&-footer {
display: inline-block;
display: inline-flex;
margin: 0;

#try-istio { margin-left: 1rem; }
Expand Down
2 changes: 1 addition & 1 deletion hugo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ disableAliases = true

[[menu.main]]
identifier = "docs"
name = "Documentation"
name = "Docs"
title = "Documentation"
url = "/docs/"
weight = 5
Expand Down
13 changes: 0 additions & 13 deletions layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,6 @@
<a class="logo" href="{{ $home.Permalink }}" aria-label="logotype">
{{ with resources.Get "inline_images/istio-logo-with-brand.svg" }}{{ .Content | safeHTML }}{{ end }}
</a>

<div class="footer-languages">
{{ $currentLanguage := $home.Lang }}
{{ $supportedLanguages := .Site.Data.args.supported_languages }}

{{ range $supportedLanguages}}
{{ $active := eq $currentLanguage .code }}
<a tabindex="-1" lang="{{.code}}" id="switch-lang-{{.code}}" class="footer-languages-item {{ if $active }}active{{ end }}">
{{ if $active }}{{ partial "icon.html" "tick" }}{{ end }}
{{ .name }}
</a>
{{ end }}
</div>
</div>

<ul class="footer-policies">
Expand Down
58 changes: 37 additions & 21 deletions layouts/partials/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{{ $home := .Site.GetPage "home" }}
{{ $section := .Section }}
{{ $current := . }}
{{ $currentLanguage := .Site.GetPage.Lang }}
{{ $supportedLanguages := .Site.Data.args.supported_languages }}

<header class="main-navigation {{ if .IsHome }}main-navigation--transparent{{ end }}">
<nav class="main-navigation-wrapper container-l">
Expand All @@ -21,33 +23,47 @@
<div id="header-links" class="main-navigation-links-wrapper">
<ul class="main-navigation-links">
{{ $currentPage := .}}
{{ range .Site.Menus.main }}
{{ $active := or (eq $currentPage.Title .Name) (or ($currentPage.HasMenuCurrent "main" .) ($currentPage.IsMenuCurrent "main" .)) }}
{{ if .HasChildren }}
<li class="main-navigation-links-item">
{{ range .Site.Menus.main }}
{{ $active := or (eq $currentPage.Title .Name) (or ($currentPage.HasMenuCurrent "main" .) ($currentPage.IsMenuCurrent "main" .)) }}
{{ if .HasChildren }}
<li class="main-navigation-links-item">
<a {{ if ne .URL "" }}href="{{ .URL | relLangURL }}"{{end}} class="main-navigation-links-link has-dropdown {{ if $active }}active{{ end }}">
<span>{{ .Name }}</span>
{{ partial "icon.html" "dropdown-arrow" }}
</a>
<span>{{ .Name }}</span>
{{ partial "icon.html" "dropdown-arrow" }}
</a>

<ul class="main-navigation-links-dropdown">
{{ range .Children }}
<li class="main-navigation-links-dropdown-item">
<a href="{{ .URL | relLangURL }}" class="main-navigation-links-link">{{ .Name }}</a>
</li>
{{ end }}
</ul>
</li>
{{ else }}
<li class="main-navigation-links-item">
<ul class="main-navigation-links-dropdown">
{{ range .Children }}
<li class="main-navigation-links-dropdown-item">
<a href="{{ .URL | relLangURL }}" class="main-navigation-links-link">{{ .Name }}</a>
</li>
{{ end }}
</ul>
</li>
{{ else }}
<li class="main-navigation-links-item">
<a {{ if ne .URL "" }}href="{{ .URL | relLangURL }}"{{end}} class="main-navigation-links-link {{ if $active }}active{{ end }}">
<span>{{ .Name }}</span>
<span>{{ .Name }}</span>
</a>
</li>
{{ end }}
{{ end }}
<li class="main-navigation-links-item">
<a class="main-navigation-links-link has-dropdown">
{{ partial "icon.html" "language-outline" }}
</a>
<ul class="main-navigation-links-dropdown">
{{ range $supportedLanguages }}
{{ $active := eq $currentLanguage .code }}
<li class="main-navigation-links-dropdown-item">
<a tabindex="-1" lang="{{.code}}" id="switch-lang-{{.code}}" class="main-navigation-links-link ">
{{ .name }}
</a>
</li>
{{ end }}
{{ end }}
{{ end }}
</ul>
</li>
</ul>

<div class="main-navigation-footer">
<button id="search-show" class="search-show" title='{{ i18n "search" }}' aria-label='{{ i18n "search_label" }}'>{{ partial "icon.html" "magnifier" }}</button>
<a href='{{ "/docs/setup/getting-started" | relLangURL }}' class="btn btn--primary" id="try-istio">{{ i18n "try_istio" }}</a>
Expand Down
1 change: 1 addition & 0 deletions src/icons/language-outline.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.