diff --git a/_includes/analytics.html b/_includes/analytics.html index f792fa7..bd289d3 100644 --- a/_includes/analytics.html +++ b/_includes/analytics.html @@ -1,5 +1,4 @@ {% if site.google_analytics_id %} - - {% endif %} diff --git a/_includes/disqus.html b/_includes/disqus.html index c13b777..d2eb891 100644 --- a/_includes/disqus.html +++ b/_includes/disqus.html @@ -1,18 +1,17 @@ diff --git a/_includes/footer.html b/_includes/footer.html index 5ea9271..5e83489 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,4 +1,4 @@ diff --git a/_includes/head.html b/_includes/head.html index 6da047c..6149f51 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,13 +1,11 @@ - - - - - {% if page.title %}{{ page.title }} - {% endif %}{{ site.title }} - - - - - - + + + + {% if page.title %}{{ page.title }} - {% endif %}{{ site.title }} + + + + + diff --git a/_includes/header.html b/_includes/header.html index 235a065..52b39e0 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,12 +1,11 @@
-

{{ site.title}}

- - {% if page.title == 'Home' %} -

{{ site.description }}

- {% endif %} -

- Home{{ site.title}} + {% if page.title == 'Home' %} +

{{ site.description }}

+ {% endif %} +

+ Home Projects AboutRSS -

+

diff --git a/_layouts/content.html b/_layouts/content.html index 4c612d8..14f4a64 100644 --- a/_layouts/content.html +++ b/_layouts/content.html @@ -1,14 +1,13 @@ --- layout: page --- -
-
-

{{ page.title }}

-
-
- {{ content }} -
- +
+

{{ page.title }}

+
+
+ {{ content }} +
+
diff --git a/_layouts/default.html b/_layouts/default.html index adaa011..8ff3aef 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,12 +1,12 @@ - {% include head.html %} - -
- {{ content }} -
+ {% include head.html %} + +
+ {{ content }} +
{% if jekyll.environment == 'production' %} - {% include analytics.html %} + {% include analytics.html %} {% endif %} - + diff --git a/_layouts/page.html b/_layouts/page.html index 248d498..8d495a1 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -2,9 +2,9 @@ layout: default ---
- {% include header.html %} -
+ {% include header.html %} +
{{ content }} -
- {% include footer.html %} +
+ {% include footer.html %}
diff --git a/_layouts/post.html b/_layouts/post.html index b18bd45..b4c2e1e 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,45 +2,41 @@ layout: page ---
-
-

{{ page.title }}

-

-
- - - +
+ {{ content }} +
+ + + + {% if page.comments != false and site.disqus_id %} +
+
+ {% include disqus.html %} +
+ {% endif %}
diff --git a/index.html b/index.html index 3e48165..856a29d 100644 --- a/index.html +++ b/index.html @@ -2,32 +2,30 @@ layout: page title: Home --- -
-{% for post in site.posts %} - {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} - {% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %} - - {% if forloop.first %} -

{{this_year}}

- -

{{next_year}}

- + {% else %} + {% if this_year != next_year %} + +

{{next_year}}

+