Move the langbar to be part of the navbar - TODO: dropdown

This commit is contained in:
BBaoVanC 2021-11-04 21:04:27 -05:00
parent b9879729bf
commit 42f0046747
Signed by: bbaovanc
GPG Key ID: 18089E4E3CCF1D3A
2 changed files with 37 additions and 40 deletions

View File

@ -118,7 +118,7 @@ footer {
/* Navbar formatting */ /* Navbar formatting */
.navbar, .langbar { .topbar {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
flex-direction: row; flex-direction: row;
@ -127,33 +127,28 @@ footer {
margin-top: 5px; margin-top: 5px;
padding: 4px; padding: 4px;
align-items: flex-start; align-items: flex-start;
}
.navbar, .langpicker {
display: flex;
}
.navbar {
flex-grow: 1;
overflow: auto; overflow: auto;
} }
.navbar-item, .langbar-item { .navbar a, .langpicker a {
/*flex-grow: 1;*/
padding: 8px 12px; padding: 8px 12px;
border-radius: 12px; border-radius: 12px;
} }
/*.navbar-item:first-child, .navbar-item:hover, .langpicker-item:hover {
.langbar-item:first-child {
border-top-left-radius: 8px;
border-bottom-left-radius: 8px;
}
.navbar-item:last-child,
.langbar-item:last-child {
border-top-right-radius: 8px;
border-bottom-right-radius: 8px;
}*/
.navbar-item:hover, .langbar-item:hover {
background-color: #444; background-color: #444;
text-decoration: none; text-decoration: none;
} }
.navbar-item.active, .langbar-item.active { .topbar .active {
font-weight: bold; font-weight: bold;
} }

View File

@ -2,27 +2,29 @@
<a href="{{ .Site.Home.Permalink | absLangURL }}">{{ .Site.Title | markdownify }}</a> <a href="{{ .Site.Home.Permalink | absLangURL }}">{{ .Site.Title | markdownify }}</a>
</h2> </h2>
<nav class="navbar"> <div class="topbar">
{{ with .Site.Home }} <nav class="navbar">
<a class="navbar-item{{ if $.IsHome }} active{{ end }}" href="{{ .Permalink | absLangURL }}">{{ .Title }}</a> {{ with .Site.Home }}
<a class="navbar-item{{ if $.IsHome }} active{{ end }}" href="{{ .Permalink | absLangURL }}">{{ .Title }}</a>
{{ end }}
{{ range .Site.Menus.main }}
{{ $isActive := false }}
{{ if or ($.HasMenuCurrent .Menu .) ($.IsMenuCurrent .Menu .) }}
{{ $isActive = true }}
{{ end }}
<a class="navbar-item{{ if $isActive }} active{{ end }}" href="{{ .URL }}">{{ .Name }}</a>
{{ end }}
</nav>
{{ if .Site.IsMultiLingual }}
<nav class="langpicker">
{{ range .Site.Home.AllTranslations }}
<a class="langpicker-item{{ if eq .Language $.Site.Language }} active{{ end }}" href="{{ .Permalink }}">{{ .Language.LanguageName }}</a>
{{ end }}
</nav>
{{ end }} {{ end }}
</div>
{{ range .Site.Menus.main }}
{{ $isActive := false }}
{{ if or ($.HasMenuCurrent .Menu .) ($.IsMenuCurrent .Menu .) }}
{{ $isActive = true }}
{{ end }}
<a class="navbar-item{{ if $isActive }} active{{ end }}" href="{{ .URL }}">{{ .Name }}</a>
{{ end }}
</nav>
{{ if .Site.IsMultiLingual }}
<nav class="langbar">
{{ range .Site.Home.AllTranslations }}
<a class="langbar-item{{ if eq .Language $.Site.Language }} active{{ end }}" href="{{ .Permalink }}">{{ .Language.LanguageName }}</a>
{{ end }}
</nav>
{{ end }}