Merge pull request #12 from makyo/dreams

Add dreams, zoom on map
This commit is contained in:
Madison Scott-Clary
2019-12-22 15:38:02 -08:00
committed by GitHub
13 changed files with 2697 additions and 2577 deletions

View File

@ -0,0 +1,7 @@
---
date: 2019-12-21
type: single
back: /jay/3
---
[![A dream](/dreams/1.png)](/dreams/1.png)

View File

@ -0,0 +1,7 @@
---
date: 2019-12-21
type: single
back: /poet-and-mystic/8
---
[![A dream](/dreams/2.png)](/dreams/2.png)

View File

@ -0,0 +1,6 @@
---
date: 2019-12-21
type: single
---
[![A dream](/dreams/3.png)](/dreams/3.png)

View File

@ -13,7 +13,7 @@ It was a perfect punishment. My dad lamented once that he couldn't send me to my
I hadn't thought of it that way. I hadn't thought of it that way.
The bench, though, was perfect. It faced a dining table, and across from that, the computer which was kept powered off. No reading. No talking. No moving from the bench. If more than one of us were in trouble at the same time, no looking at each other; we sat on opposite ends. The bench, though, was perfect. It faced a <a class="pulse" href="/aside/dreams/1">dining table</a>, and across from that, the computer which was kept powered off. No reading. No talking. No moving from the bench. If more than one of us were in trouble at the same time, no looking at each other; we sat on opposite ends.
When he started taking up martial arts, he brought Zach and I with him. He thought...well, I don't know what he thought. That it would make us men? That it would teach us to defend ourselves? When he started taking up martial arts, he brought Zach and I with him. He thought...well, I don't know what he thought. That it would make us men? That it would teach us to defend ourselves?

File diff suppressed because it is too large Load Diff

View File

@ -158,3 +158,5 @@ through the fields out back of the house and talk.
Now, it's just me, alone, quiet, thinking Now, it's just me, alone, quiet, thinking
of you by the shore, forever drinking of you by the shore, forever drinking
of sweet water.</div> of sweet water.</div>
<a class="pulse" href="/aside/dreams/2">From a dream.</a>

BIN
static/dreams/1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

BIN
static/dreams/2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 70 KiB

BIN
static/dreams/3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

View File

@ -9,6 +9,10 @@ digraph Map {
"Aside 2" [href="/aside/2"] "Aside 2" [href="/aside/2"]
"Aside 3" [href="/aside/3"] "Aside 3" [href="/aside/3"]
"Dreams 1" [href="/aside/dreams/1"]
"Dreams 2" [href="/aside/dreams/2"]
/* "Dreams 3" [href="/aside/dreams/3"] */
node[group="dad",style="filled",fillcolor="#cccccc",fontcolor="#222222"] node[group="dad",style="filled",fillcolor="#cccccc",fontcolor="#222222"]
"Dad 1" [href="/dad/1"] "Dad 1" [href="/dad/1"]
"Dad 2" [href="/dad/2"] "Dad 2" [href="/dad/2"]
@ -386,7 +390,7 @@ digraph Map {
"Furry 7" -> "Younes 1" "Furry 7" -> "Younes 1"
// Jay // Jay
/* none */ "Jay 3" -> "Dreams 1"
// Koan // Koan
/* none */ /* none */
@ -403,6 +407,7 @@ digraph Map {
// Poet and Mystic // Poet and Mystic
/*"Poet and Mystic 1" -> "Manifesto Project 1"*/ /*"Poet and Mystic 1" -> "Manifesto Project 1"*/
"Poet and Mystic 13" -> "Agony and Ecstasy" "Poet and Mystic 13" -> "Agony and Ecstasy"
"Poet and Mystic 8" -> "Dreams 2"
// Poly // Poly
"Poly 1" -> "Jay 1" "Poly 1" -> "Jay 1"

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 157 KiB

After

Width:  |  Height:  |  Size: 155 KiB

View File

@ -1,6 +1,22 @@
{{ define "main" }} {{ define "main" }}
<main id="main"> <main id="main"{{ if (isset .Params "fit" )}} class="fit"{{ end }}>
{{ if (ge .Date.Year 2019) }}<p class="date">{{ .Date.Format "January 2, 2006" }}</p>{{ end }} {{ if (ge .Date.Year 2019) }}<p class="date">{{ .Date.Format "January 2, 2006" }}</p>{{ end }}
{{ if (isset .Params "fit") }}
<div class="zoom">
<script type="text/javascript">
function toggle() {
document.querySelector('#main').classList.toggle('fit');
document.querySelector('#main').classList.toggle('full');
}
</script>
<a href="javascript:toggle()">
<svg xmlns="http://www.w3.org/2000/svg" stroke-miterlimit="10" font-weight="400" font-size="12" viewBox="0 0 268.313 268.453" width="268.313" height="268.453" font-family="Dialog" color-interpolation="auto" stroke="#000" stroke-linecap="square" style="width: 2rem; height: 2rem;"><path d="M268.313 238.078q0 3.375-5.344 9-4.078 3.797-8.156 7.735-3.938 4.5-12.657 12.515-1.406 1.125-3.937 1.125-3.094 0-11.672-9.281l-40.64-40.5q-5.485-4.781-15.048-15.188-.984-1.265-.984-3.656 0-4.36 6.047-8.719l-10.266-10.265q-30.797 22.64-63.984 22.64-40.922 0-71.297-30.445T0 101.531Q0 60.61 30.516 30.305 61.03 0 101.953 0q41.203 0 71.578 30.375t30.375 71.578q0 32.203-22.218 63l9.843 9.844q5.485-4.781 8.157-4.781 3.937 0 11.953 8.297 12.515 12.375 37.547 37.265 6.468 5.906 18 18.422 1.125 1.547 1.125 4.078zM189 177.61q-5.203-5.203-10.125-9.421-2.953 2.671-5.062 5.484 3.234 3.516 10.265 9.844zm4.36-78.187q0-37.266-26.86-64.195-26.86-26.93-64.125-26.93-37.406 0-64.055 26.86-26.648 26.859-26.648 64.265 0 37.547 26.578 64.055 26.578 26.507 64.125 26.507 37.406 0 64.195-26.578 26.79-26.578 26.79-63.984zm-12.657 85.922L171 176.063q-.984.703-2.39 2.39l9.703 9.844q1.828-1.828 2.39-2.953zm61.031 70.172l-56.671-56.532 18.421-18.421q-2.39-1.829-3.796-1.829-1.97 0-11.32 9.493-9.352 9.492-9.352 11.742 0 1.547 2.25 3.937 8.297 8.86 29.25 29.39 25.03 24.61 27.14 24.61 2.672 0 4.078-2.39zM181.688 99.14q0 33.609-22.852 56.32-22.852 22.71-56.04 22.71H98.86q-29.109 0-52.382-22.921-23.274-22.922-23.274-51.89 5.625 25.734 25.172 41.835 19.547 16.102 45.703 16.102 29.39 0 50.203-20.813 20.813-20.812 20.813-50.203 0-24.89-15.188-44.297Q134.86 27 110.672 20.25h1.406q9.281 0 24.188 6.75 21.375 9.703 33.398 29.04 12.024 19.335 12.024 43.1zM87.609 64.125q0 10.547-7.804 18.352Q72 90.28 61.453 90.28q-8.719 0-15.75-5.414-7.031-5.414-9.422-13.851 7.735 11.812 20.532 11.812 9.421 0 16.382-6.82 6.961-6.82 6.961-16.102 0-14.625-12.234-20.531 8.437 2.672 14.062 9.422t5.625 15.328z" stroke="none"/></svg>
</a>
</div>
{{ end }}
{{ .Content }} {{ .Content }}
{{ if (isset .Params "back") }}
<div style="text-align: center;"><a href="{{ .Params.back }}" class="pulse">&laquo; back to where we left off</a></div>
{{ end }}
</main> </main>
{{end}} {{end}}

View File

@ -22,6 +22,14 @@ a {
text-decoration: none; text-decoration: none;
border-bottom: 1px solid; border-bottom: 1px solid;
} }
.zoom {
display: block;
text-align: center;
}
.zoom a {
border: none;
font-size: 2em;
}
abbr { abbr {
text-decoration: none; text-decoration: none;
cursor: help; cursor: help;
@ -76,6 +84,14 @@ main {
padding: 1rem; padding: 1rem;
font-family: 'Gentium Book Basic', serif; font-family: 'Gentium Book Basic', serif;
} }
main.full {
max-width: 100%;
text-align: center;
}
main.fit svg {
max-width: 100%;
height: auto;
}
.date { .date {
font-size: 10pt; font-size: 10pt;
opacity: 0.3; opacity: 0.3;