Merge pull request #121 from Mitrichius/fix-safari-reader-view

Remove lang switcher from reader view #14
This commit is contained in:
Dmitry Kolosov 2021-12-19 14:36:07 +03:00 committed by GitHub
commit 0b15d3bc48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 41 additions and 29 deletions

View File

@ -281,6 +281,16 @@ main h1 {
/* Articles */ /* Articles */
.post-header {
margin-top: 1em;
line-height: 1.1em;
margin-bottom: 1em;
}
.post-header header {
display: inline;
}
.post-navigation { .post-navigation {
background: var(--nav-bg-color); background: var(--nav-bg-color);
text-align: center; text-align: center;
@ -331,12 +341,6 @@ article:not(:last-of-type) {
padding-bottom: 2em; padding-bottom: 2em;
} }
article header {
margin-top: 1em;
line-height: 1.1em;
margin-bottom: 1em;
}
article header h1 { article header h1 {
font-size: 1.35em; font-size: 1.35em;

View File

@ -8,10 +8,12 @@
{{ $pages := where .Pages "Type" "in" site.Params.mainSections }} {{ $pages := where .Pages "Type" "in" site.Params.mainSections }}
{{ range $pages }} {{ range $pages }}
<div class="post-short-list h-entry"> <div class="post-short-list h-entry">
<header class="post-header"> <div class="post-header">
<h2 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}"><a class="u-url" href="{{ .RelPermalink }}">{{ trim .Title " " }}</a></h2> <header>
{{ partial "post-language-switcher.html" . }} <h2 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}"><a class="u-url" href="{{ .RelPermalink }}">{{ trim .Title " " }}</a></h2>
</header> {{ partial "post-language-switcher.html" . }}
</header>
</div>
{{ partial "post-info.html" . }} {{ partial "post-info.html" . }}
</div> </div>
{{ end }} {{ end }}

View File

@ -8,11 +8,13 @@
{{ end }} {{ end }}
<article class="post h-entry"> <article class="post h-entry">
<header class="post-header"> <div class="post-header">
<h1 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}">{{ trim .Title " " }}</h1> <header>
<h1 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}">{{ trim .Title " " }}</h1>
{{ partial "post-language-switcher.html" . }} {{ partial "post-language-switcher.html" . }}
</header> </header>
</div>
<div class="content e-content"> <div class="content e-content">
{{ .Content }} {{ .Content }}
</div> </div>

View File

@ -1,16 +1,18 @@
{{ if .IsTranslated }} {{ if .IsTranslated }}
{{ $pageLang := .Page.Lang}} {{ $pageLang := .Page.Lang}}
<ul class="post-translations"> <span>
{{ range .AllTranslations }} <ul class="post-translations">
{{ if eq .Lang $pageLang }} {{ range .AllTranslations }}
<li> {{ if eq .Lang $pageLang }}
{{ upper .Lang }} <li>
</li> {{ upper .Lang }}
{{ else }} </li>
<li> {{ else }}
<a href="{{ .Permalink }}">{{ upper .Lang }}</a> <li>
</li> <a href="{{ .Permalink }}">{{ upper .Lang }}</a>
</li>
{{ end }}
{{ end }} {{ end }}
{{ end }} </ul>
</ul> </span>
{{ end }} {{ end }}

View File

@ -1,8 +1,10 @@
<article class="post-list h-feed"> <article class="post-list h-feed">
<header class="post-header"> <div class="post-header">
<h1 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}"><a class="u-url" href="{{ .RelPermalink }}">{{ trim .Title " " }}</a></h1> <header>
<h1 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}"><a class="u-url" href="{{ .RelPermalink }}">{{ trim .Title " " }}</a></h1>
</header>
{{ partial "post-language-switcher.html" . }} {{ partial "post-language-switcher.html" . }}
</header> </div>
{{ if not .Site.Params.disableSummary }} {{ if not .Site.Params.disableSummary }}
<div class="content post-summary p-summary"> <div class="content post-summary p-summary">