diff --git a/_includes/footer-minimal.html b/_includes/footer-minimal.html index f3cce3ac8f15..af9d2c111230 100644 --- a/_includes/footer-minimal.html +++ b/_includes/footer-minimal.html @@ -1,7 +1,9 @@ \ No newline at end of file + diff --git a/_includes/footer.html b/_includes/footer.html index 0d34afd87079..4198cba5e954 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -25,8 +25,10 @@ {%- endfor -%}

{{ page.subtitle }}

{% endif %} {% if include.type == "post" %} - Posted on {{ page.date | date: site.date_format }} + Posted on {{ page.date | date: date_format }} {% endif %} @@ -61,7 +63,7 @@

{{ page.subtitle }}

{% endif %} {% if include.type == "post" %} - Posted on {{ page.date | date: site.date_format }} + Posted on {{ page.date | date: date_format }} {% endif %} diff --git a/_includes/nav.html b/_includes/nav.html index c2bdf66822b5..264756e2f219 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -9,7 +9,7 @@ {%- if site.title-img -%} - {%- else -%} + {%- elsif site.title -%} {{ site.title }} {%- endif -%} diff --git a/css/main.css b/css/main.css index 65e7174e6f2a..322ea1188bbd 100644 --- a/css/main.css +++ b/css/main.css @@ -11,7 +11,7 @@ body { font-size: 18px; color: #404040; position: relative; - background-color: {{ site.page-col }}; + background-color: {{ site.page-col | default: "#FFFFFF" }}; {% if site.page-img %} background-image: url({{ site.page-img | relative_url }}); background-attachment: fixed; @@ -26,11 +26,11 @@ h1,h2,h3,h4,h5,h6 { font-weight: 800; } a { - color: {{ site.link-col }}; + color: {{ site.link-col | default: "#008AFF" }}; } a:hover, a:focus { - color: {{ site.hover-col }}; + color: {{ site.hover-col | default: "#0085A1" }}; } blockquote { color: #808080; @@ -68,12 +68,12 @@ hr.small { ::-moz-selection { color: white; text-shadow: none; - background-color: {{ site.hover-col }}; + background-color: {{ site.hover-col | default: "#0085A1" }}; } ::selection { color: white; text-shadow: none; - background-color: {{ site.hover-col }}; + background-color: {{ site.hover-col | default: "#0085A1" }}; } img::selection { color: white; @@ -106,7 +106,7 @@ img { /* --- Navbar --- */ .navbar-custom { - background-color: {{ site.navbar-col }}; + background-color: {{ site.navbar-col | default: "#F5F5F5" }}; border-bottom: 1px solid #EAEAEA; font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; {% if site.navbar-img %} @@ -124,14 +124,14 @@ img { .navbar-custom .navbar-brand, .navbar-custom .nav li a { font-weight: 800; - color: {{ site.navbar-text-col }}; + color: {{ site.navbar-text-col | default: "#404040" }}; } .navbar-custom .navbar-brand:hover, .navbar-custom .navbar-brand:focus , .navbar-custom .nav li a:hover, .navbar-custom .nav li a:focus { - color: {{ site.hover-col }}; + color: {{ site.hover-col | default: "#0085A1" }}; } .navbar-custom .navbar-brand-logo { @@ -231,7 +231,7 @@ img { display: block; padding: 10px; padding-left: 30px; - background-color: {{ site.navbar-children-col }}; + background-color: {{ site.navbar-children-col | default: "#F5F5F5" }}; text-decoration: none !important; border-width: 0 1px 1px 1px; font-weight: normal; @@ -271,7 +271,7 @@ footer { border-top: 1px #EAEAEA solid; margin-top: 50px; font-size: 14px; - background-color: {{ site.footer-col }}; + background-color: {{ site.footer-col | default: "#F5F5F5" }}; {% if site.footer-img %} background-image: url({{ site.footer-img | relative_url }}); background-attachment: fixed; @@ -279,11 +279,11 @@ footer { } footer p.text-muted { - color: {{ site.footer-text-col }}; + color: {{ site.footer-text-col | default: "#777777" }}; } footer a { - color: {{site.footer-link-col}}; + color: {{ site.footer-link-col | default: "#404040" }}; } footer .list-inline { @@ -337,7 +337,7 @@ footer .theme-by { .post-preview a:focus, .post-preview a:hover { text-decoration: none; - color: {{ site.hover-col }}; + color: {{ site.hover-col | default: "#0085A1" }}; } .post-preview .post-title { @@ -401,14 +401,14 @@ footer .theme-by { } .blog-tags a { - color: {{ site.link-col }}; + color: {{ site.link-col | default: "#008AFF" }}; text-decoration: none; padding: 0px 5px; } .blog-tags a:hover { border-radius: 2px; - color: {{ site.hover-col }}; + color: {{ site.hover-col | default: "#0085A1" }}; background-color: #EEE; } @@ -614,8 +614,8 @@ footer .theme-by { .pager li a:hover, .pager li a:focus { color: #FFF; - border: 1px solid {{ site.hover-col }}; - background-color: {{ site.hover-col }}; + border: 1px solid {{ site.hover-col | default: "#0085A1" }}; + background-color: {{ site.hover-col | default: "#0085A1" }}; } .pager { diff --git a/feed.xml b/feed.xml index c5b566416b92..dcb79c6c1717 100644 --- a/feed.xml +++ b/feed.xml @@ -4,8 +4,12 @@ layout: null + {% if site.title %} {{ site.title | xml_escape }} + {% endif %} + {% if site.description %} {{ site.description | xml_escape }} + {% endif %} {{ '' | absolute_url }} {% for post in site.posts limit:20 %} diff --git a/index.html b/index.html index 3c1ccd430133..554133a21473 100644 --- a/index.html +++ b/index.html @@ -19,7 +19,8 @@

@@ -31,9 +32,10 @@

{% endif %}
- {{ post.excerpt | strip_html | xml_escape | truncatewords: site.excerpt_length }} + {% assign excerpt_length = site.excerpt_length | default: 50 %} + {{ post.excerpt | strip_html | xml_escape | truncatewords: excerpt_length }} {% assign excerpt_word_count = post.excerpt | number_of_words %} - {% if post.content != post.excerpt or excerpt_word_count > site.excerpt_length %} + {% if post.content != post.excerpt or excerpt_word_count > excerpt_length %} [Read More] {% endif %}
diff --git a/tags.html b/tags.html index 2c1c94965cae..04c193908ec9 100644 --- a/tags.html +++ b/tags.html @@ -3,6 +3,8 @@ title: 'Tag Index' --- +{% assign date_format = site.date_format | default: "%B %-d, %Y" %} + {%- capture site_tags -%} {%- for tag in site.tags -%} {{- tag | first -}}{%- unless forloop.last -%},{%- endunless -%} @@ -25,7 +27,7 @@

{{- post.title -}}
{%- endfor -%}