diff --git a/_includes/disqus.html b/_includes/disqus.html index 6f4da19bb..50d263235 100644 --- a/_includes/disqus.html +++ b/_includes/disqus.html @@ -1,5 +1,5 @@
diff --git a/_includes/footer.html b/_includes/footer.html index 2d060542e..6869c831a 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,11 +1,11 @@ -
-
-
+
diff --git a/_includes/header_title.html b/_includes/header_title.html new file mode 100644 index 000000000..9eb40bf35 --- /dev/null +++ b/_includes/header_title.html @@ -0,0 +1,16 @@ + +{{ page.titlename }} | {{ site.title }} + +{% if page.keywords %} + +{% endif %} +{% if page.description %} + +{% endif %} + + + + + + + \ No newline at end of file diff --git a/_includes/navside.html b/_includes/navside.html index 12b9282b0..0e709ee66 100644 --- a/_includes/navside.html +++ b/_includes/navside.html @@ -8,9 +8,12 @@ {% for category in site.categories %}
  • {{ category[0] }}
    • {% endfor %} -
  • {{ site.locals.tags }}
    • +
    • +
    • +
    • +
    @@ -23,7 +26,7 @@
    -
    +
    {% for category in site.categories %}
    @@ -33,7 +36,7 @@

    {{ category[0] }}

    {% endfor %}
    - {% endfor %} + {% endfor %}

    {{ site.locals.tags }}

    diff --git a/_layouts/base_title.html b/_layouts/base_title.html new file mode 100644 index 000000000..6772e0cf9 --- /dev/null +++ b/_layouts/base_title.html @@ -0,0 +1,22 @@ + + + + {% include header_title.html %} + + +
    +
    + {% include navside.html %} +
    +
    +
    + {{ content }} +
    +
    +
    +
    +
    + {% include footer.html %} + {% include googleanalytics.html %} + + \ No newline at end of file diff --git a/_layouts/page_title.html b/_layouts/page_title.html new file mode 100644 index 000000000..5e1554f24 --- /dev/null +++ b/_layouts/page_title.html @@ -0,0 +1,16 @@ +--- +layout: base_title +--- +
    +
    +
    +

    {{ page.title }}

    +
    +
    +
    + {{ content }} +
    +
    + {% include disqus.html %} +
    +
    diff --git a/index.html b/index.html index 44dade23b..21170062f 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,7 @@ --- -layout: page -title: 首页 +layout: page_title +title: +titlename: 首页 ---
    diff --git a/pages/about.html b/pages/about.html index 5f5412042..7085342dd 100644 --- a/pages/about.html +++ b/pages/about.html @@ -1,6 +1,7 @@ --- -layout: page -title: 关于 +layout: page_title +title: +titlename: 关于 ---

    关于博客

    PainterLin.com博客名字直译过来是：画家林。在我看来，画家客和黑客是相似的：他们都是创造者，就好像作曲家，建筑师，以及作家一样，他们的目的是创造某种美好的事物。选域名时想到这个也许代表了我的某种愿望。博客内容不一定与技术相关，技术只是世界上的一个小目录。

    @@ -11,22 +12,22 @@

    关于作者

    - + - + - + - + - + - +
    {% include disqus.html %} diff --git a/pages/archive.html b/pages/archive.html index 6692a0dcf..dbe0e23e1 100644 --- a/pages/archive.html +++ b/pages/archive.html @@ -1,6 +1,7 @@ --- -layout: page -title: 归档 +layout: page_title +title: +titlename: 归档 comments: false --- diff --git a/public/css/base.css b/public/css/base.css index e31eb9f66..ef1f2ae0a 100644 --- a/public/css/base.css +++ b/public/css/base.css @@ -31,8 +31,8 @@ body, html { border-radius: 0px; } .avatar { - width: 98px; - height: 98px; + width: 90px; + height: 90px; } .aside1_bottom { width: 100%;