~evanj/evanjon.es

723a53aecbde2ea6abf8f21c33bc9b4330e490cc — Evan M Jones 5 months ago 1d7fc6b
Fix(css/html): Tweaking little things.
9 files changed, 124 insertions(+), 288 deletions(-)

M internal/s/tmpl/css/main.css
D internal/s/tmpl/html/_footer.html
D internal/s/tmpl/html/_header.html
M internal/s/tmpl/html/index.html
D internal/s/tmpl/html/index.html.backup
M internal/s/tmpl/html/item.html
D internal/s/tmpl/html/item.html.backup
D internal/s/tmpl/html/list.html.backup
M internal/s/tmpl/tmpls_embed.go
M internal/s/tmpl/css/main.css => internal/s/tmpl/css/main.css +33 -41
@@ 2,68 2,60 @@ body {
  line-height: 1.4;
}

main {
  max-width: 500px;
  margin: 15px;
  word-wrap: break-word;
}

main h1 img { 
  width: 79px;
  height: 79px;
}

h1 {
  display: flex;
  align-items: baseline;
}

h1 span {
  display: inline-block;
  margin: 0 0 0 10px;
pre { 
  line-hieght: 1;
}

img {
  max-width: 100%%;
  vertical-align: middle;
}

pre {
  word-wrap: break-word;
  white-space: pre-wrap;
header h1 { 
  margin: 0;
}

a {
header h1 a {
  text-decoration: none;
}

input {
  width: 60%;
body main { 
  padding: 15px;
  max-width: 500px;
}

blockquote { 
  margin: 0;
  padding: 0;
  margin-left: initial;
  font-style: italic;
}

blockquote + p > em,
blockquote + cite,
blockquote + p > cite { 
  font-style: normal;
blockquote + p > cite,
blockquote + p > em {
  display: block; 
  margin-top: -10px;
}

blockquote + p > em:before,
blockquote + cite:before,
blockquote + p > cite:before { 
blockquote + p > cite:before,
blockquote + p > em:before { 
  font-style: italic;
  content: '-- ';
  margin-left: 40px;
  padding-left: 40px;
}

.list h2 { 
  margin: 0;
body.list > main > a {
  text-decoration: none;
}

body.list > main > a:hover > section > h2 {
  text-decoration: underline;
}

.list section div { 
body.list > main > a > section > h2 {
  margin-bottom: 0;
}

body.list > main > a > section > div { 
  margin-left: 40px;
}

img { 
  max-width: 100%%;
  vertical-align: middle;
}

D internal/s/tmpl/html/_footer.html => internal/s/tmpl/html/_footer.html +0 -25
@@ 1,25 0,0 @@
<!--
<footer>
  <div>
    <p>&copy 2015-2020 Evan Jones</p>
    <p>Powered by <a href='https://cms.evanjon.es'>https://cms.evanjon.es/</a></p>
  </div>
  <div>
    <a href='https://git.sr.ht/~evanj/evanjon.es/'>{{ template "img/_code-24px.svg" }}</a>
    <a href='mailto:me@evanjon.es'>{{ template "img/_email-24px.svg" }}</a>
    <a href='/rss'>{{ template "img/_rss_feed-24px.svg" }}</a>
    <a href='/static/me@evanjon.es.gpg'>{{ template "img/_vpn_key-24px.svg" }}</a>
  </div>
</footer>
-->

<footer class=list>
  <strong>Footer Things</strong>
  <div class=thing>&copy 2015-2020 Evan Jones</div>
  <div class=thing>Powered by <a href='https://cms.evanjon.es'>https://cms.evanjon.es/</a></div>
  <div class=thing><a href='https://git.sr.ht/~evanj/evanjon.es/'>Source Code</a>
  <div class=thing><a href='mailto:me@evanjon.es'>Email</a>
  <div class=thing><a href='/rss'>RSS Feed</a>
  <div class=thing><a href='//e3.evanjon.es/25dce601-7dab-4647-6f54-4d2710ef18fa.gpg'>Public Key</a>
</footer>


D internal/s/tmpl/html/_header.html => internal/s/tmpl/html/_header.html +0 -6
@@ 1,6 0,0 @@
<header>
  <a href='/'>
    <h1>{{ .Item.Name }}</h1>
    <p>/{{ .Item.Slug }}</p>
  </a>
</header>

M internal/s/tmpl/html/index.html => internal/s/tmpl/html/index.html +12 -4
@@ 8,10 8,18 @@
<body>
  <style>{{ template "css/main.css" }}</style>
  <main>
    <h1>
      <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
      <div><span><a href='/'>{{ .Item.Name }}</a></span></div>
    </h1>
    <header>
      <table> 
        <tr>
          <td valign=bottom width=94 height=79>
            <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
          </td>
          <td valign=bottom>
            <h1><a href='/'>{{ .Item.Name }}</a></h1>
          </td>
        </tr>
      </table>
    </header>
    <article>{{ .Item.Desc }}</article>
    <hr>
    <a href='https://git.sr.ht/~evanj/evanjon.es/'>Source Code</a>, 

D internal/s/tmpl/html/index.html.backup => internal/s/tmpl/html/index.html.backup +0 -79
@@ 1,79 0,0 @@
<!DOCTYPE html>
<html lang=en>
  <head>
    {{ template "html/_head.html" }}
    <title>Evan's Site</title>
    <meta name=description content="{{ .Item.Short }}">
  </head>
  <body class=index>
    <style>{{ template "css/main.css" }}</style>

    <div>
      <header>
        <!--
        <img src='/static/me.jpg' />
        -->
        <h1>Evan Jones</h1>
        <a href='mailto:me@evanjon.es'>me@evanjon.es</a>
        <p>ID, USA</p>
        <br/>
        <blockquote>Blogs are a conversation no one wanted to have with you.</blockquote>
        <cite>Michelle Wolf</cite>
      </header>
  
      <br/>
  
      <main>
        <article>
          {{ .Item.Desc }}
        </article>
      </main>
  
      <br/>
  
      <nav class=list>
        <strong>Website Links</strong>
        <div class=thing><a href='/blog'>Blog posts</a></div>
        <div class=thing><a href='/about'>About me</a></div>
        <div class=thing><a href='/quote'>List of quotes I like</a></div>
        <div class=thing><a href='/anime'>Anime recommendations</a></div>
        <div class=thing><a href='/links'>Cool things on the Internet</a></div>
      </nav>
  
      <br/>
  
      <aside class=list>
        <strong>Some Projects</strong>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/cms'>cms</a></div>
        <div class=thing>A cms for most.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/e3'>e3</a></div>
        <div class=thing>Bare-bones object storage.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/zan'>Zanzibar</a></div>
        <div class=thing>A programming language that cares about your fingers. No implementation yet.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/wtf2'>wtf2</a></div>
        <div class=thing>A modern version of <a href='https://linux.die.net/man/6/wtf'>wtf(6)</a>.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/ascii'>ASCII</a>
        <div class=thing>An API to transform images to ASCII.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/ego'>Ego</a>
        <div class=thing>Evan's Go, a fork of the Go programming language to add the maybe monad (a la Rust result).</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/smscp'>smscp</a></div>
        <div class=thing>The easiest way to copy text snippets to and from your devices.</div>
  
        <div class=thing><a href='https://git.sr.ht/~evanj/wigly'>Wigly</a></div>
        <div class=thing>A tiny React inspired UI library for the web.</div>
  
      </aside>
  
      <br/>

      {{ template "html/_footer.html" }}
    </div>
  </body>
</html>

M internal/s/tmpl/html/item.html => internal/s/tmpl/html/item.html +17 -4
@@ 8,12 8,25 @@
<body>
  <style>{{ template "css/main.css" }}</style>
  <main>
    <h1>
      <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
      <div><span><a href='/{{ .Item.Slug }}'>{{ .Item.Name }}</a></span></div>
    </h1>
    <header>
      <table> 
        <tr>
          <td valign=bottom width=94 height=79>
            <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
          </td>
          <td valign=bottom>
            <h1><a href='/{{ .Item.Slug }}'>{{ .Item.Name }}</a></h1>
          </td>
        </tr>
      </table>
    </header>
    <article>{{ .Item.Desc }}</article>
    <hr>
    <nav>
      <a href='/'>Home</a>,
      <a href='/blog'>Blog</a>
    </nav>
    <hr>
    <footer>Last edit {{ .Item.PrettyDate }}</footer>
  </main>
</body>

D internal/s/tmpl/html/item.html.backup => internal/s/tmpl/html/item.html.backup +0 -41
@@ 1,41 0,0 @@
<!DOCTYPE html>
<html lang=en>
  <head>
    {{ template "html/_head.html" }}
    <title>{{ .Item.Name }}</title>
    <meta name=description content="{{ .Item.Short }}">
  </head>
  <body class=item>
    <style>{{ template "css/main.css" }}</style>

    <div>
      <header>
        <h1>{{ .Item.Name }}</h1>
      </header>
  
      <nav>
        {{ if .ShowDate }}
        <a href='/blog'>Go to blog post list</a>
        {{ else }}
        <a href='/'>Go to homepage</a>
        {{ end }}
      </nav>
  
      <br/>
  
      {{ if .ShowDate }}
      <i>{{ .Item.PrettyDate }}</i>
      {{ end }}
  
      <br/>
  
      <main>
        <article>
          {{ .Item.Desc }}
        </article>
      </main>
  
      <footer><!-- for margin -->&nbsp;</footer>
    </div>
  </body>
</html>

D internal/s/tmpl/html/list.html.backup => internal/s/tmpl/html/list.html.backup +0 -39
@@ 1,39 0,0 @@
<!DOCTYPE html>
<html lang=en>
  <head>
    {{ template "html/_head.html" }}
    <title>Evan's Blog</title>
  </head>
  <body class=list>
    <style>{{ template "css/main.css" }}</style>

    <div>
      <header>
        <h1>Blog Posts</h1>
      </header>
  
      <nav>
        <a href='/'>Go to homepage</a>
      </nav>
  
      <br/> 
  
      <main>
        <article>
          {{ range .List }}
          <a class=link href='/{{ .Slug }}'>
            <section class=list>
              <div><strong class=active>{{ .Name }}</strong></div>
              <i class='inactive thing'>{{ .PrettyDate }}</i>
              <p class='inactive thing'>{{ .Short }}</p>
            </section>
          </a>
          <br/> 
          {{ end }}
        </article>
      </main>
  
      <footer><!-- for margin -->&nbsp;</footer>
    </div>
  </body>
</html>

M internal/s/tmpl/tmpls_embed.go => internal/s/tmpl/tmpls_embed.go +62 -49
@@ 11,71 11,63 @@ func init() {
  line-height: 1.4;
}

main {
  max-width: 500px;
  margin: 15px;
  word-wrap: break-word;
}

main h1 img { 
  width: 79px;
  height: 79px;
}

h1 {
  display: flex;
  align-items: baseline;
}

h1 span {
  display: inline-block;
  margin: 0 0 0 10px;
}

img {
  max-width: 100%;
  vertical-align: middle;
pre { 
  line-hieght: 1;
}

pre {
  word-wrap: break-word;
  white-space: pre-wrap;
header h1 { 
  margin: 0;
}

a {
header h1 a {
  text-decoration: none;
}

input {
  width: 60%!;(MISSING)
body main { 
  padding: 15px;
  max-width: 500px;
}

blockquote { 
  margin: 0;
  padding: 0;
  margin-left: initial;
  font-style: italic;
}

blockquote + p > em,
blockquote + cite,
blockquote + p > cite { 
  font-style: normal;
blockquote + p > cite,
blockquote + p > em {
  display: block; 
  margin-top: -10px;
}

blockquote + p > em:before,
blockquote + cite:before,
blockquote + p > cite:before { 
blockquote + p > cite:before,
blockquote + p > em:before { 
  font-style: italic;
  content: '-- ';
  margin-left: 40px;
  padding-left: 40px;
}

.list h2 { 
  margin: 0;
body.list > main > a {
  text-decoration: none;
}

.list section div { 
body.list > main > a:hover > section > h2 {
  text-decoration: underline;
}

body.list > main > a > section > h2 {
  margin-bottom: 0;
}

body.list > main > a > section > div { 
  margin-left: 40px;
}

img { 
  max-width: 100%;
  vertical-align: middle;
}
`

	tmpls["css/main.css.backup"] = `body {


@@ 209,10 201,18 @@ img {
<body>
  <style>{{ template "css/main.css" }}</style>
  <main>
    <h1>
      <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
      <div><span><a href='/'>{{ .Item.Name }}</a></span></div>
    </h1>
    <header>
      <table> 
        <tr>
          <td valign=bottom width=94 height=79>
            <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
          </td>
          <td valign=bottom>
            <h1><a href='/'>{{ .Item.Name }}</a></h1>
          </td>
        </tr>
      </table>
    </header>
    <article>{{ .Item.Desc }}</article>
    <hr>
    <a href='https://git.sr.ht/~evanj/evanjon.es/'>Source Code</a>, 


@@ 318,12 318,25 @@ img {
<body>
  <style>{{ template "css/main.css" }}</style>
  <main>
    <h1>
      <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
      <div><span><a href='/{{ .Item.Slug }}'>{{ .Item.Name }}</a></span></div>
    </h1>
    <header>
      <table> 
        <tr>
          <td valign=bottom width=94 height=79>
            <img src="//e3.evanjon.es/b889bd3e-4404-49b7-6a25-6ce2838868f6.jpg"/>
          </td>
          <td valign=bottom>
            <h1><a href='/{{ .Item.Slug }}'>{{ .Item.Name }}</a></h1>
          </td>
        </tr>
      </table>
    </header>
    <article>{{ .Item.Desc }}</article>
    <hr>
    <nav>
      <a href='/'>Home</a>,
      <a href='/blog'>Blog</a>
    </nav>
    <hr>
    <footer>Last edit {{ .Item.PrettyDate }}</footer>
  </main>
</body>