Improve header

- fix header height
       61px->60px
    - check for elements before displaying
    - align theme-toggle
    - rm unnecessary elements
    - rm theme-toggle class
    - rm menu class
This commit is contained in:
Aditya Telange 2021-01-31 17:05:40 +05:30
parent ebbeca4ab4
commit f8781e2cc8
No known key found for this signature in database
GPG Key ID: 82E844EF3DA99E77
2 changed files with 60 additions and 51 deletions

View File

@ -13,7 +13,7 @@
} }
.logo, .logo,
.menu { #menu {
display: flex; display: flex;
margin: auto var(--gap); margin: auto var(--gap);
} }
@ -25,7 +25,6 @@
.logo a { .logo a {
font-size: 24px; font-size: 24px;
font-weight: 700; font-weight: 700;
margin-inline-end: 10px
} }
.logo a img { .logo a img {
@ -37,9 +36,14 @@
margin-inline-end: 8px margin-inline-end: 8px
} }
.theme-toggle svg { #theme-toggle svg {
height: 18px; height: 18px;
}
a#theme-toggle {
font-size: 24px;
user-select: none; user-select: none;
margin: auto 4px;
cursor: pointer cursor: pointer
} }
@ -52,22 +56,22 @@ body:not(.dark) #sun {
display: none display: none
} }
.menu { #menu {
list-style: none; list-style: none;
word-break: keep-all; word-break: keep-all;
overflow-x: auto; overflow-x: auto;
white-space: nowrap white-space: nowrap
} }
.menu li+li { #menu li+li {
margin-inline-start: var(--gap) margin-inline-start: var(--gap)
} }
.menu a { #menu a {
font-size: 16px font-size: 16px
} }
.menu .active { #menu .active {
font-weight: 500; font-weight: 500;
border-bottom: 2px solid currentColor border-bottom: 2px solid currentColor
} }
@ -75,13 +79,18 @@ body:not(.dark) #sun {
.lang-switch li, .lang-switch li,
.lang-switch ul, .lang-switch ul,
.logo-switches { .logo-switches {
display: inline-flex display: inline-flex;
margin: auto 4px;
}
.lang-switch {
display: flex;
flex-wrap: inherit
} }
.lang-switch a { .lang-switch a {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
margin: 0 8px
} }
.logo-switches { .logo-switches {

View File

@ -50,6 +50,7 @@
<header class="header"> <header class="header">
<nav class="nav"> <nav class="nav">
<div class="logo"> <div class="logo">
{{- if .Title }}
<a href="{{ "" | absLangURL }}" accesskey="h" title="{{ .Site.Params.label.text | default .Site.Title }} (Alt + H)"> <a href="{{ "" | absLangURL }}" accesskey="h" title="{{ .Site.Params.label.text | default .Site.Title }} (Alt + H)">
{{- if .Site.Params.label.icon }} {{- if .Site.Params.label.icon }}
<img src="{{- .Site.Params.label.icon -}}" alt="logo" aria-label="logo" <img src="{{- .Site.Params.label.icon -}}" alt="logo" aria-label="logo"
@ -57,57 +58,56 @@
{{- end -}} {{- end -}}
{{- .Site.Params.label.text | default .Site.Title -}} {{- .Site.Params.label.text | default .Site.Title -}}
</a> </a>
{{- end }}
<span class="logo-switches"> <span class="logo-switches">
{{- if (not .Site.Params.disableThemeToggle) }} {{- if (not .Site.Params.disableThemeToggle) }}
<span class="theme-toggle" title="(Alt + T)"> <a id="theme-toggle" accesskey="t" title="(Alt + T)">
<a id="theme-toggle" accesskey="t"> <svg id="moon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"
<svg id="moon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"
fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
stroke-linejoin="round"> <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"></path>
<path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79z"></path> </svg>
</svg> <svg id="sun" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"
<svg id="sun" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"
fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
stroke-linejoin="round"> <circle cx="12" cy="12" r="5"></circle>
<circle cx="12" cy="12" r="5"></circle> <line x1="12" y1="1" x2="12" y2="3"></line>
<line x1="12" y1="1" x2="12" y2="3"></line> <line x1="12" y1="21" x2="12" y2="23"></line>
<line x1="12" y1="21" x2="12" y2="23"></line> <line x1="4.22" y1="4.22" x2="5.64" y2="5.64"></line>
<line x1="4.22" y1="4.22" x2="5.64" y2="5.64"></line> <line x1="18.36" y1="18.36" x2="19.78" y2="19.78"></line>
<line x1="18.36" y1="18.36" x2="19.78" y2="19.78"></line> <line x1="1" y1="12" x2="3" y2="12"></line>
<line x1="1" y1="12" x2="3" y2="12"></line> <line x1="21" y1="12" x2="23" y2="12"></line>
<line x1="21" y1="12" x2="23" y2="12"></line> <line x1="4.22" y1="19.78" x2="5.64" y2="18.36"></line>
<line x1="4.22" y1="19.78" x2="5.64" y2="18.36"></line> <line x1="18.36" y1="5.64" x2="19.78" y2="4.22"></line>
<line x1="18.36" y1="5.64" x2="19.78" y2="4.22"></line> </svg>
</svg> </a>
</a>
</span>
{{- end}} {{- end}}
{{ $lang := .Lang}} {{ $lang := .Lang}}
{{ $separator := or .Title (not .Site.Params.disableThemeToggle)}}
{{- with $.Site.Home.AllTranslations }} {{- with $.Site.Home.AllTranslations }}
<span class="lang-switch">
<span>|</span> <ul class="lang-switch">
<ul> {{- if $separator }}<li>|</li>{{ end }}
{{- range . -}} {{- range . -}}
{{- if ne $lang .Lang }} {{- if ne $lang .Lang }}
<li> <li>
<a href="{{- .Permalink -}}" title="{{ .Language.LanguageName | default (.Lang | humanize) }}" <a href="{{- .Permalink -}}" title="{{ .Language.LanguageName | default (.Lang | humanize) }}"
aria-label="{{ .Language.LanguageName | default (.Lang | humanize) }}"> aria-label="{{ .Language.LanguageName | default (.Lang | humanize) }}">
{{- if (and $.Site.Params.displayFullLangName (.Language.LanguageName)) }} {{- if (and $.Site.Params.displayFullLangName (.Language.LanguageName)) }}
{{- .Language.LanguageName | emojify -}} {{- .Language.LanguageName | emojify -}}
{{- else }} {{- else }}
{{- .Lang | humanize -}} {{- .Lang | humanize -}}
{{- end -}} {{- end -}}
</a> </a>
</li> </li>
{{- end -}} {{- end -}}
{{- end}} {{- end}}
</ul> </ul>
</span>
{{- end }} {{- end }}
</span> </span>
</div> </div>
{{- $currentPage := . }} {{- $currentPage := . }}
<ul class="menu" id="menu" onscroll="menu_on_scroll()"> <ul id="menu" onscroll="menu_on_scroll()">
{{- range .Site.Menus.main }} {{- range .Site.Menus.main }}
{{- $menu_item_url := (cond (strings.HasSuffix .URL "/") .URL (printf "%s/" .URL) ) | absLangURL }} {{- $menu_item_url := (cond (strings.HasSuffix .URL "/") .URL (printf "%s/" .URL) ) | absLangURL }}
{{- $page_url:= $currentPage.Permalink | absLangURL }} {{- $page_url:= $currentPage.Permalink | absLangURL }}