Compare commits

..

No commits in common. "f182add92afe3ca5a5c0dd078b2bc7583b293173" and "ba844bf59a34a28d6dc557cb361327231c1d5bfb" have entirely different histories.

2 changed files with 18 additions and 47 deletions

View File

@ -30,32 +30,28 @@
</nav> </nav>
</header> </header>
<main {{ if eq .Kind "page" }}class="h-entry"{{ else if in (slice "section" "taxonomy" "taxonomyTerm" ) .Kind }}class="h-feed"{{ end }}> <main {{ if eq .Kind "page" }}class="h-entry"{{ else if in (slice "section" "taxonomy" "taxonomyTerm" ) .Kind }}class="h-feed"{{ end }}>
<div class="content-box"> <header>
<header> {{- block "content-header" . -}}
{{- block "content-header" . -}} {{- end -}}
{{- end -}}
</header>
<section>
{{- block "content" . -}}
<!-- The part of the page that begins to differ between templates -->
{{ end }}
</section>
<footer>
{{- block "content-footer" . -}}
{{- end -}}
</footer>
</div>
<div class="asides-box">
<aside>
{{ block "author-card" . }}
{{ partial "author-card.html" . }}
{{ end }}
</aside>
<nav> <nav>
{{- block "content-menu" . -}} {{- block "content-menu" . -}}
{{- end -}} {{- end -}}
</nav> </nav>
</div> </header>
<section>
{{- block "content" . -}}
<!-- The part of the page that begins to differ between templates -->
{{ end }}
</section>
<footer>
{{- block "content-footer" . -}}
{{- end -}}
</footer>
<aside>
{{ block "author-card" . }}
{{ partial "author-card.html" . }}
{{ end }}
</aside>
</main> </main>
<footer> <footer>
{{- block "footer" . -}} {{- block "footer" . -}}

View File

@ -1,6 +1,5 @@
.box { .box {
display: flex; display: flex;
flex-direction: row;
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
} }
@ -29,27 +28,3 @@ nav.paginator ul {
padding-inline-start: 1em; padding-inline-start: 1em;
padding-inline-end: 1em; padding-inline-end: 1em;
} }
/* Define grid layout for wide screen browsers */
div.content-box {
grid-area: content;
}
div.asides-box {
grid-area: aside;
}
@media only screen and (min-width: 922px) {
div.asides-box {
max-width: 350px;
border-left: thin solid;
margin: 1em;
}
main {
display: grid;
grid-template-columns: 1fr 350px;
grid-template-areas:
"content aside";
}
}