diff --git a/alchemy/static/css/style.css b/alchemy/static/css/style.css index 7f38be7..d68954c 100644 --- a/alchemy/static/css/style.css +++ b/alchemy/static/css/style.css @@ -6,19 +6,6 @@ body { background-color: #f5f5f5; - font-family: Merriweather, Georgia, serif; - font-size: 16px; - line-height: 1.5; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - font-family: Montserrat, 'Helvetica Neue', sans-serif; - font-weight: bold; } a { @@ -30,79 +17,55 @@ a:hover { color: #0085a1 } -blockquote { - color: #777; - font-style: italic -} - /* ------------------------------------------------------------------------- */ .container { - max-width: 970px; + max-width: 960px; } .header { - border-bottom: 1px solid #ddd; - padding-bottom: 10px; + border-bottom: 1px solid rgba(0,0,0,.1); + padding-top: 1rem; } .header img { - margin: 20px 0; + margin-bottom: 1rem; } .header .title { - font-size: 3em; + font-size: 3rem; + font-weight: bold; + margin-bottom: 1rem; } -.header p { - margin-top: 20px; -} - -.header hr { - border-color: #ddd; - margin: 15px 0; +.header ul, +.header li { + margin-bottom: .5rem; } .header ul { - font-family: Montserrat, 'Helvetica Neue', sans-serif; - font-size: 1.1em; - margin-bottom: 0; + font-size: 1.25rem; + font-weight: 300; text-transform: lowercase; } -.header li { - margin-bottom: 10px; -} - .main { background-color: #fff; - padding: 20px 0; + padding: 2rem 0; } .footer { - border-top: 1px solid #ddd; - padding: 20px 0; -} - -.footer ul { - margin-bottom: 0; -} - -.page-header { - margin-top: 0; -} - -.page-header h1 { - line-height: 1.3; -} - -.pagination > li > a, -.pagination > li > span { - color: #333; + border-top: 1px solid rgba(0,0,0,.1); + padding-top: 1rem; } .highlight pre { - border: 1px solid #ddd; + border: 1px solid rgba(0,0,0,.1); + padding: 1rem; +} + +.pagination .page-link { + color: #333; } .teaser header ul { @@ -111,42 +74,37 @@ blockquote { } .teaser header li { - margin-bottom: 10px; -} - -.teaser .title { - margin-top: 0; - line-height: 1.3; + margin-bottom: .5rem; } .teaser .content p { margin-bottom: 0; } -.article header ul { - margin-bottom: 0; -} - +.article header ul, .article header li { - margin-bottom: 10px; + margin-bottom: .5rem; } .article .content p { - margin: 25px 0; + margin: 1.5rem 0; } .article .content a { text-decoration: underline } -@media (max-width: 768px) { - .teaser header ul { - margin-left: -5px; +@media (max-width: 576px) { + .header, + .footer { + text-align: center; } .teaser header li { display: inline-block; - padding-right: 5px; - padding-left: 5px; + } + + .teaser header li:not(:last-child) { + margin-right: 5px; } } diff --git a/alchemy/templates/archives.html b/alchemy/templates/archives.html index 5fe6dee..61b9669 100644 --- a/alchemy/templates/archives.html +++ b/alchemy/templates/archives.html @@ -9,10 +9,10 @@ Archives {% endblock %} {% block content %} -
+
{% for article in dates %} -
{{ article.locale_date }}
-
{{ article.title }}
+
{{ article.locale_date }}
+
{{ article.title }}
{% endfor %}
{% endblock %} diff --git a/alchemy/templates/article.html b/alchemy/templates/article.html index 0b833f6..dcea611 100644 --- a/alchemy/templates/article.html +++ b/alchemy/templates/article.html @@ -17,16 +17,18 @@
    -
  • +
  • {{ article.locale_date }}
  • -
  • +
  • ·
  • +
  • {{ article.category }}
  • {% if article.tags %} -
  • +
  • ·
  • +
  • {% for tag in article.tags %} #{{ tag }}{% if not loop.last %}, {% endif %} @@ -34,7 +36,8 @@
  • {% endif %} {% if not HIDE_AUTHORS and article.authors %} -
  • +
  • ·
  • +
  • {% for author in article.authors %} {{ author }}{% if not loop.last %}, {% endif %} diff --git a/alchemy/templates/base.html b/alchemy/templates/base.html index 3d7ccfe..214b081 100644 --- a/alchemy/templates/base.html +++ b/alchemy/templates/base.html @@ -4,7 +4,7 @@ - + {% block title %}| {{ SITENAME }}{% endblock %} @@ -47,14 +47,6 @@ {% block head %}{% endblock %} - - - - - {% include 'include/analytics.html' %} @@ -64,7 +56,9 @@
    {% if SITEIMAGE %}
    - {{ SITENAME }} + + {{ SITENAME }} +
    {% endif %}
    @@ -76,21 +70,21 @@
      {% for title, link in LINKS %} -
    • {{ title }}
    • +
    • {{ title }}
    • {% endfor %} {% if DISPLAY_PAGES_ON_MENU %} {% for page in PAGES %} {% if LINKS and loop.first %} -
    • |
    • +
    • |
    • {% endif %} -
    • {{ page.title }}
    • +
    • {{ page.title }}
    • {% endfor %} {% endif %} {% for icon, link in ICONS %} {% if (LINKS or (DISPLAY_PAGES_ON_MENU and PAGES)) and loop.first %} -
    • |
    • +
    • |
    • {% endif %} -
    • +
    • {% endfor %}
    {% endif %} @@ -101,9 +95,8 @@
    - +

    {% block page_header %}{% endblock %}

    +
    {% block content %}{% endblock %}
    @@ -113,17 +106,17 @@
    - +

    diff --git a/alchemy/templates/include/pagination.html b/alchemy/templates/include/pagination.html index 167969b..28b78b5 100644 --- a/alchemy/templates/include/pagination.html +++ b/alchemy/templates/include/pagination.html @@ -2,11 +2,23 @@
      {% if articles_page.has_previous() %} -
    • «
    • +
    • + + + Previous + +
    • {% endif %} -
    • {{ articles_page.number }} of {{ articles_paginator.num_pages }}
    • +
    • + {{ articles_page.number }} of {{ articles_paginator.num_pages }} +
    • {% if articles_page.has_next() %} -
    • »
    • +
    • + + + Next + +
    • {% endif %}
    {% endif %} diff --git a/alchemy/templates/index.html b/alchemy/templates/index.html index f17627e..3ae4510 100644 --- a/alchemy/templates/index.html +++ b/alchemy/templates/index.html @@ -24,11 +24,13 @@ All Articles {{ article.locale_date }}
  • +
  • ·
  • {{ article.category }}
  • {% if not HIDE_AUTHORS and article.authors %} +
  • ·
  • {% for author in article.authors %} diff --git a/alchemy/templates/sitemap.html b/alchemy/templates/sitemap.html index 947c5a2..c6b4736 100644 --- a/alchemy/templates/sitemap.html +++ b/alchemy/templates/sitemap.html @@ -1,32 +1,27 @@ - -{% for article in articles %} - - {{ SITEURL }}/{{ article.url }} - 0.8 - - -{% for translation in article.translations %} - - {{ SITEURL }}/{{ translation.url }} - 0.8 - -{% endfor %} -{% endfor %} - -{% for page in pages %} - - {{ SITEURL }}/{{ page.url }} - 1.0 - - -{% for translation in page.translations %} - - {{ SITEURL }}/{{ translation.url }} - 1.0 - -{% endfor %} -{% endfor %} - + {% for article in articles %} + + {{ SITEURL }}/{{ article.url }} + 0.8 + + {% for translation in article.translations %} + + {{ SITEURL }}/{{ translation.url }} + 0.8 + + {% endfor %} + {% endfor %} + {% for page in pages %} + + {{ SITEURL }}/{{ page.url }} + 1.0 + + {% for translation in page.translations %} + + {{ SITEURL }}/{{ translation.url }} + 1.0 + + {% endfor %} + {% endfor %}