diff --git a/archive.html b/archive.html index 3b90e77..254020a 100644 --- a/archive.html +++ b/archive.html @@ -1,15 +1,17 @@ {% include 'block_header_open.html' %} {%- if taxonomy.name -%} -{%- set title = taxonomy.name ~ ' | ' ~ site.name -%} +{%- set title = taxonomy.name ~ ' | ' ~ site.domain -%} {%- else -%} -{%- set title = site.name -%} +{%- set title = site.title -%} {%- endif -%} + {%- if ( taxonomy.paged > 1 ) -%} {%- set turl = site.url ~ taxonomy.url ~ taxonomy.paged ~ '/' -%} {%- else -%} {%- set turl = site.url ~ taxonomy.url -%} {%- endif -%} + {{ title }} @@ -20,14 +22,14 @@ - + {% if site.author.twitter %}{% endif %} {% if site.author.twitter %}{% endif %} - + @@ -79,15 +81,15 @@ {% set hentry = 'status' %} {% endif %} -
+
{% if post.reactions %} -

{% include 'block_reaction.html' %}

+ {% include 'block_reaction.html' %} {% elif post.title|length %}

- + {{ post.title }} @@ -106,13 +108,7 @@

{% if hentry == "article" %} -
- +
{{ post.sumhtml }} @@ -120,15 +116,13 @@
{% else %} -
+
+ {% if ( post.photo ) %} + {% include 'block_photo.html' %} + {% endif %} {{ post.html }} - {% if ( post.exif ) %} - {% include 'block_exif.html' %} - {% endif %} - -
{% endif %} diff --git a/block_comments.html b/block_comments.html index c749bb1..1ee4110 100644 --- a/block_comments.html +++ b/block_comments.html @@ -6,7 +6,7 @@
  • -
    +

    {% if reply.author.url %} {{ reply.author.name }} @@ -14,19 +14,19 @@ {% else %} {{ reply.author.name }} {% endif %} -

    +

    +

    + {% if reply.source|length > 0 %} + {{ reply.source }} + {% endif %} +

    {{ reply.html }}
    - {% endfor %} diff --git a/block_footer.html b/block_footer.html index 5f91f73..9d3c386 100644 --- a/block_footer.html +++ b/block_footer.html @@ -42,7 +42,15 @@ - +
    • diff --git a/block_header_close.html b/block_header_close.html index b570909..3ec4d5a 100644 --- a/block_header_close.html +++ b/block_header_close.html @@ -1,3 +1,6 @@ + @@ -13,39 +16,39 @@
  • - + photos
  • - + journal
  • - + IT
  • - + notes
    • {#
  • - + re:
    • #}
  • - + bookmarks @@ -55,8 +58,9 @@
    diff --git a/block_header_open.html b/block_header_open.html index f246fcf..cf2a15d 100644 --- a/block_header_open.html +++ b/block_header_open.html @@ -4,12 +4,9 @@ - + - - + diff --git a/block_photo.html b/block_photo.html new file mode 100644 index 0000000..45f35b9 --- /dev/null +++ b/block_photo.html @@ -0,0 +1,54 @@ +
    +

    + + {{ post.photo.alt }} + +

    + + +
    diff --git a/block_reaction.html b/block_reaction.html index 47fb1cd..f827017 100644 --- a/block_reaction.html +++ b/block_reaction.html @@ -1,38 +1,44 @@ {% if post.reactions.bookmark %} {% for reaction in post.reactions.bookmark %} {% if post.title|length %} - {{ post.title }}
    +

    {{ post.title }}

    +

    {{ reaction }} +

    {% else %} - +

    {{ reaction }} - +

    {% endif %} {% endfor %} {% endif %} {% if post.reactions.reply %} {% for reaction in post.reactions.reply %} - +

    {{ reaction }} - +

    {% endfor %} {% endif %} {% if post.reactions.repost %} {% for reaction in post.reactions.repost %} {% if post.title|length %} - {{ post.title }}
    +

    {{ post.title }}

    +

    {{ reaction }} +

    {% else %} +

    {{ reaction }} +

    {% endif %} {% endfor %} {% endif %} @@ -40,14 +46,18 @@ {% if post.reactions.fav %} {% for reaction in post.reactions.fav %} {% if post.title|length %} - {{ post.title }}
    +

    {{ post.title }}

    +

    {{ reaction }} +

    {% else %} +

    {{ reaction }} +

    {% endif %} {% endfor %} {% endif %} diff --git a/singular.html b/singular.html index 2bd7b7c..e8f85b0 100644 --- a/singular.html +++ b/singular.html @@ -8,7 +8,7 @@ {% if post.title %} {{ post.title }} | {{ site.domain }} {% else %} - {{ post.name }} | {{ site.domain }} + {{ post.slug }} | {{ site.domain }} {% endif %} @@ -40,18 +40,18 @@ {% include 'block_header_close.html' %}
    -
    +
    +

    {% if post.reactions %}

    {% include 'block_reaction.html' %}

    {% elif post.title|length %}

    - {{ post.title }} + {{ post.title }}

    {% endif %} - {% if 'IT' in post.tags %} {% if post.updated %} {% set py = post.updated|date('%Y')|int %} @@ -66,20 +66,21 @@
    {% if post.summary %} -
    +
    {{ post.sumhtml }}
    {% endif %} -
    +
    - {{ post.html }} -{% if ( post.exif ) %} - {% include 'block_exif.html' %} +{% if ( post.photo ) %} + {% include 'block_photo.html' %} {% endif %} + {{ post.html }} + {% if ( post.syndicate ) %} {% include 'block_syndicate.html' %} {% endif %} @@ -87,12 +88,11 @@
    +{% if ( post.comments ) %} +{% include 'block_comments.html' %} +{% endif %}
    - -

    - {{ site.url }}/{{ post.shortslug }} -

    {% endif %} {% if post.tags %} - +

    {% endif %} -
    +

    + {{ site.url }}/{{ post.shortslug }} +

    -{% if ( post.comments ) %} -{% include 'block_comments.html' %} -{% endif %} +
    diff --git a/style.css b/style.css index 3f16658..291af1a 100644 --- a/style.css +++ b/style.css @@ -1,4 +1,5 @@ -* { + + * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box; @@ -33,7 +34,7 @@ html, body { min-height: 100%; font-size:19px; line-height: 1.2rem; - font-family:"Liberation Sans", "Helvetica Neue", "Roboto", sans-serif; + font-family: "Liberation Sans", "Helvetica Neue", "Roboto", "Arial", sans-serif; font-weight: normal; color: #333336; text-shadow: 1px 1px 1px rgba(0,0,0,0.004); @@ -46,13 +47,11 @@ html { a { color: #333; - border-bottom: 1px solid #999; text-decoration:none; } a:hover { color: #000; - border-bottom-color: #000; } b, strong { @@ -72,7 +71,7 @@ li { } ul li { - line-height: 1.6rem; + line-height: 1.6rem; } li p { @@ -80,11 +79,12 @@ li p { padding: 0; } -blockquote, q { +blockquote { margin: 0.3rem; padding-left: 0.6rem; font-style: italic; border-left: 2px solid #999; + color: #666; } table { @@ -97,7 +97,7 @@ hr { height: 1px; border: none; border-top: 1px solid #999; - margin: 0.3rem 0 1rem 0; + margin: 1.3rem 0 1rem 0; clear:both; } @@ -109,85 +109,96 @@ hr { .h-entry { padding: 0 0.6rem; - font-size: 0.9rem; + font-size: 0.86rem; } -h1, h2, h3, h4, h5, h6, -dt { +h1, h2, h3, h4, h5, h6, dt { font-weight:bold; clear:both; - margin: 1rem 0; - font-size: 1.1rem; + font-size: 1rem; +} + +h1, h2, h3, h4, h5, h6 { + margin: 1.3rem 0 0.3rem 0; + padding: 0 0 0.3rem 0; } h1 { - font-size: 1.3rem; - margin: 0; -} - -h1 a, -h2 a { - border: none; + font-size: 1.2rem; + margin-top: 0; } h2 { + font-size: 1.1rem; border-bottom: 2px solid #999; } +h3 { + font-size: 1rem; +} + .h-feed .h-entry h2 { border: none; - margin:0 0 0.3rem 0; + font-size: 1rem; + margin: 0; + padding: 0; } .h-feed .h-entry { margin: 2rem 0 0 0; } -.h-entry.singular .e-summary { - margin-top: 1rem; +.h-entry footer { + opacity: 0.8; } -h3 { - border-bottom: 1px dotted #999; +.published, .updated { + display: inline; } -aside p { - padding:0; +.shorturl, +.tags { + padding: 0.3rem 0; } -svg { - transform: rotate(0.01deg); +.e-content a { + color:#115394; +} + +.e-content a:hover { + color:#004283; } .icon { + transform: rotate(0.01deg); width: 19px; height: 19px; - display: inline-block; + display: inline; fill: currentColor; vertical-align:middle; overflow: visible; } -code.sourceCode span.al { color: white; } -code.sourceCode span.at { color: white; } -code.sourceCode span.bn { color: white; } -code.sourceCode span.bu { color: white; } -code.sourceCode span.cf { color: white; } -code.sourceCode span.ch { color: white; } +code.sourceCode span.al { color: black; } +code.sourceCode span.at { color: black; } +code.sourceCode span.bn { color: black; } +code.sourceCode span.bu { color: black; } +code.sourceCode span.cf { color: black; } +code.sourceCode span.ch { color: black; } code.sourceCode span.co { color: darkgray; } -code.sourceCode span.dt { color: white; } -code.sourceCode span.dv { color: white; } -code.sourceCode span.er { color: white; } +code.sourceCode span.dt { color: black; } +code.sourceCode span.dv { color: black; } +code.sourceCode span.er { color: black; } code.sourceCode span.ex { color: darkorange; } -code.sourceCode span.fl { color: white; } +code.sourceCode span.fl { color: black; } code.sourceCode span.fu { color: darkorange; } -code.sourceCode span.im { color: white; } +code.sourceCode span.im { color: black; } code.sourceCode span.kw { color: darkcyan; } -code.sourceCode span.op { color: white; } -code.sourceCode span.ot { color: white; } -code.sourceCode span.pp { color: white; } -code.sourceCode span.sc { color: white; } -code.sourceCode span.ss { color: white; } +code.sourceCode span.op { color: black; } +code.sourceCode span.ot { color: black; } +code.sourceCode span.pp { color: black; } +code.sourceCode span.sc { color: black; } +code.sourceCode span.ss { color: black; } code.sourceCode span.st { color: magenta; } code.sourceCode span.va { color: darkturquoise; } @@ -195,8 +206,7 @@ code, pre { font-family: "Inconsolata", monospace; font-size: 0.8rem; - background-color: #222; - color: lightgreen; + color: darkslategrey; direction: ltr; text-align: left; white-space: pre; @@ -204,6 +214,8 @@ pre { word-break: normal; tab-size: 2; hyphens: none; + border: 1px solid #ccc; + background-color: whitesmoke; } pre { @@ -215,7 +227,7 @@ pre { code { display: inline-block; padding: 0 0.3rem; - line-height: 1.2rem; + line-height: 1.1rem; } pre code { @@ -228,37 +240,21 @@ pre code { margin: 2rem 0; } -.tags { - list-style-type: none; -} - -.tags, -.tags li { - display: inline-block; -} - -.tags li { - margin:0 0.3rem 0 0; -} - -.tags li:before { - content: '#'; - color: #999; -} - - .footnoteRef, .footnoteRef:hover { border: 0; white-space: nowrap; } +.footnoteRef a { + border: none; +} + .footnoteRef sup { vertical-align: baseline; position: relative; top: -0.3rem; font-size: 0.8rem; - color: #33c; margin-right: 0.1rem; } @@ -267,26 +263,8 @@ pre code { color: #33c; } -.footnoteRef sup:before { - content: "["; -} - -.footnoteRef sup:after { - content: "]"; -} - -.footnoteRef sup:hover, -.footnoteRef sup:hover:after, -.footnoteRef sup:hover:before { - text-shadow: 1px 0 0 #33c; -} - -.footnotes ol { - font-size: 0.8rem; -} - .footnotes ol li { - margin-bottom: 0.6rem; + margin-bottom: 0.3rem; } .comments ol .u-repost-of, @@ -296,14 +274,9 @@ pre code { white-space: nowrap; text-overflow: ellipsis; vertical-align: top; - border-bottom: 1px solid #ccc; -} - -.footnotes ol li a { max-width: 80%; } - .footnotes ol li a[href^="#"] { margin: 0 0 0 0.6rem; max-width: 20%; @@ -384,6 +357,15 @@ pre code { border-bottom: none; } +.footer-notes figure { + display: inline-block; + margin-right: 1rem; +} + +.footer-notes figure img { + width:7rem; +} + input { vertical-align:middle; border: none; @@ -396,7 +378,7 @@ input { } input[type=submit] { - + width: 2.2rem; cursor: pointer; } @@ -429,7 +411,7 @@ input[type=submit]:hover { .content-navigation ul li a { display:block; - padding:0.2rem; + padding:0 0.2rem; font-weight: bold; border-bottom: 3px solid transparent; text-align: center; @@ -514,7 +496,7 @@ input[type=submit]:hover { .more { display:block; - font-weight:bold; + font-weight:bold; } .more a:before { @@ -537,12 +519,8 @@ input[type=submit]:hover { } time { - font-family: "Inconsolata", monospace; font-size: 0.8rem; } -.pubdate a { - border: none; -} .exif { font-size: 0.8rem; @@ -574,22 +552,23 @@ time { margin-bottom: 1.3rem; } -.comments ol .u-repost-of { - border: none; -} - -.comments ol .u-repost-of { - opacity: 0.7; - font-size: 0.7rem; - max-width: 99%; -} .comments ol .p-name { font-weight: bold; display: block; } -/* reactions */ +.comments ol time, +.comments ol .u-repost-of { + font-size: 0.8rem; + margin: 0; +} + +.comments ol .u-repost-of:before { + content: '•'; + margin: 0 0.3rem; +} + .comments dt, .comments dd, .comments dl ul, @@ -604,7 +583,7 @@ time { .comments dl a.u-repost-of { margin-left: 0.3rem; - + } .content-note { @@ -656,7 +635,7 @@ time { } .u-favorite-of { - font-size: 0.9rem; + font-size: 0.9rem; font-weight: initial; } @@ -690,7 +669,7 @@ time { @media print { * { - background-color: #fff; + background-color: #fff !important; } html, body { @@ -745,7 +724,7 @@ time { max-height:45vh; } - .content-note, .content-header, .content-footer, + .content-note, .content-header, .content-footer, video, audio, .footnotes ol li a[href^="#"], .footnotes ol li a[href^="#"]:after { @@ -761,7 +740,7 @@ time { } code.sourceCode span { color: #000; } - + pre.sourceCode, code, pre { color: #222; word-break: break-all; @@ -770,3 +749,4 @@ time { line-height: 1rem; } } + \ No newline at end of file diff --git a/symbols.svg b/symbols.svg index 0a76583..95152fd 100644 --- a/symbols.svg +++ b/symbols.svg @@ -83,4 +83,14 @@ + + + + + + + + + +