Compare commits

..

No commits in common. "85a39501fbfbb5a505ee48f4702354d2e7d9b13a" and "e9cea2af30a84d743f5de2c63b7457c6c4f4a039" have entirely different histories.

2 changed files with 11 additions and 40 deletions

View File

@ -98,10 +98,6 @@ main {
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
p a {
text-decoration: underline;
}
& > p > img { & > p > img {
max-width: 100%; max-width: 100%;
} }
@ -160,7 +156,6 @@ nav {
article { article {
display: flex; display: flex;
flex-direction: column;
&.preview { &.preview {
margin-bottom: 3rem; margin-bottom: 3rem;
@ -182,15 +177,21 @@ article {
} }
} }
&.page, &.post { &.page {
& > .image { & > .image {
display: none;
text-align: right; text-align: right;
& > img { & > img {
display: block;
height: auto; height: auto;
width: 100%; width: 100%;
} }
@media screen and (min-width: $small) {
display: block;
padding-left: 1.5em;
width: 60%;
}
} }
& > .text { & > .text {
@ -201,35 +202,6 @@ article {
} }
} }
} }
&.page > .image {
display: none;
@media screen and (min-width: $small) {
display: block;
padding-left: 1.5em;
width: 60%;
}
}
&.post {
& > .image {
margin-bottom: 1em;
@media screen and (min-width: $small) {
padding-left: 1.5em;
width: 60%;
}
}
@media screen and (min-width: $small) {
flex-direction: row-reverse;
}
}
@media screen and (min-width: $small) {
flex-direction: row;
}
} }
a { a {

View File

@ -1,9 +1,9 @@
{{ define "main" }} {{ define "main" }}
<h1>{{ .Title }}</h1> <h1>{{ .Title }}</h1>
{{ $pages := .Site.GetPage "/pages" }} {{ $textContent := .Content }}
{{ $page := . }}
{{ with .Resources.GetMatch "image.jpg" }} {{ with .Resources.GetMatch "image.jpg" }}
<article class="{{ if $pages.InSection $page }}page{{ else }}post{{ end }}"> <article class="page">
<section class="text">{{ $textContent }}</section>
<section class="image"> <section class="image">
<img alt="{{ .Title }}" src="{{ .RelPermalink }}"> <img alt="{{ .Title }}" src="{{ .RelPermalink }}">
{{ $params := .Params }} {{ $params := .Params }}
@ -16,7 +16,6 @@
{{ end }} {{ end }}
{{ end }} {{ end }}
</section> </section>
<section class="text">{{ $page.Content }}</section>
</article> </article>
{{ else }} {{ else }}
{{ .Content }} {{ .Content }}