change some UI

Author: SuYan

.DS_Store

@@ -11,7 +11,7 @@
 <link rel="icon" href="/public/css/favicon.ico">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <link rel="stylesheet" href="/public/css/bootstrap.css">
-<link rel="stylesheet" href="/public/css/fontawesome.css">
+<link rel="stylesheet" href="/public/css/font-awesome.css">
 <link rel="stylesheet" href="/public/js/prettify/prettify.css">
 <link rel="stylesheet" href="/public/css/base.css">
 <link href="/pages/atom.xml" rel="alternate" title="{{site.title}}" type="application/atom+xml">

_includes/header.html

@@ -10,16 +10,21 @@
     </div>
     <div class="collapse navbar-collapse navbar-ex1-collapse">
       <ul class="nav navbar-nav">
-        <li><a href="/"><i class="icon-home icon-white"></i>首页</a></li> 
-        <li><a href="/pages/categories.html"><i class="icon-th-large icon-white"></i>分类</a></li> 
-        <li><a href="/pages/tags.html"><i class="icon-tags icon-white"></i>标签</a></li> 
-        <li><a href="/pages/archive.html"><i class="icon-file icon-white"></i>归档</a></li> 
-        <li><a href="/pages/atom.xml"><i class="icon-rss icon-white"></i>订阅</a></li> 
-        <li><a href="/pages/about.html"><i class="icon-user icon-white"></i>关于</a></li> 
+        <li><a href="/"><i class="icon-home icon-white"></i> 首页</a></li> 
+        <li><a href="/pages/categories.html"><i class="icon-th-large icon-white"></i> 分类</a></li> 
+        <li><a href="/pages/tags.html"><i class="icon-tags icon-white"></i> 标签</a></li> 
+        <li><a href="/pages/archive.html"><i class="icon-file icon-white"></i> 归档</a></li> 
+        <li><a href="/pages/atom.xml"><i class="icon-rss icon-white"></i> 订阅</a></li> 
+        <li><a href="/pages/about.html"><i class="icon-user icon-white"></i> 关于</a></li> 
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="{{ site.author.link }}">中文</a></li>
-        <li><a href="{{ site.author.enlink }}">English</a></li>
+        <li class="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="icon-exchange"></i> 语言<b class="caret"></b></a>
+          <ul class="dropdown-menu">
+            <li><a href="{{ site.author.link }}">中文</a></li>
+            <li><a href="{{ site.author.enlink }}">English</a></li>
+          </ul>
+        </li>
       </ul>
     </div>  
   </div>

_includes/navbar.html

@@ -6,7 +6,7 @@
     <div class="panel panel-info">
       <div class="panel-heading">
       <h2>{{ page.title }}</h2>
-      <p>由作者 <a href="/pages/about.html">{{ site.author.name }}</a> 发布于 <a href='/pages/archive.html#{{ page.date | date:"%Y-%m"}}'>{{ page.date | date:"%Y年%m月%d日" }}</a> 分类: {% for category in page.category %} <a href="/pages/categories.html#{{ category }}">{{ category }}</a> {% endfor %} | 标签: {% for tag in page.tags %} <a href="/pages/tags.html#{{ tag }}">#{{ tag }}#</a> {% endfor %}</p>
+      <p>由作者 <a href="/pages/about.html">{{ site.author.name }}</a> 发布于 <a href='/pages/archive.html#{{ page.date | date:"%Y-%m"}}'>{{ page.date | date:"%Y年%m月%d日" }}</a> 分类: {% for category in page.category %} <a href="/pages/categories.html#{{ category }}">{{ category }}</a> {% endfor %}  标签: {% for tag in page.tags %} <a href="/pages/tags.html#{{ tag }}">#{{ tag }}#</a> {% endfor %}</p>
       </div>
       <div class="panel-body content" id="content">
         <blockquote>{{ page.description }}</blockquote>

_layouts/post.html

@@ -1,5 +1,8 @@
 # Changelog
 ## TODO
+- 合理展示图片
+
+## Version 2.2
 - 优化阅读体验
 - 想办法实现双语
 

changelog.md

@@ -10,10 +10,11 @@
           <h3 class="panel-title"><a href="{{ site.url }}{{ post.url }}">{{ post.title }}</a></h3>
         </div>
         <div class="panel-body">
-          {{ post.description }} <small><a href="{{ site.url }}{{ post.url }}">继续阅读&raquo;&raquo;</a></small>
+          {{ post.description }} 
+          <br><small><a href="{{ site.url }}{{ post.url }}">继续阅读 <i class="icon-arrow-right"></i></a></small>
         </div>
         <div class="panel-footer">
-          由作者 <a href="/pages/about.html">{{ site.author.name }}</a> 发布于 <a href='/pages/archive.html#{{ post.date | date:"%Y-%m"}}'>{{ post.date | date:"%Y年%m月%d日" }}</a> 分类: {% for category in post.category %} <a href="/pages/categories.html#{{ category }}">{{ category }}</a> {% endfor %} | 标签: {% for tag in post.tags %} <a href="/pages/tags.html#{{ tag }}">#{{ tag }}#</a> {% endfor %}
+          由作者 <a href="/pages/about.html">{{ site.author.name }}</a> 发布于 <a href='/pages/archive.html#{{ post.date | date:"%Y-%m"}}'>{{ post.date | date:"%Y年%m月%d日" }}</a> 分类: {% for category in post.category %} <a href="/pages/categories.html#{{ category }}">{{ category }}</a> {% endfor %}  标签: {% for tag in post.tags %} <a href="/pages/tags.html#{{ tag }}">#{{ tag }}#</a> {% endfor %}
         </div>
       </div>
     </div>

index.html

@@ -3,23 +3,17 @@
 title: 分类
 comments: false
 ---
-<div class="panel-group" id="accordion">
-  {% for category in site.categories %} 
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#{{ category[0] }}">
-          {{ category[0] }}({{ category[1].size }})
-        </a>
-      </div>
-      <div id="{{ category[0] }}" class="panel-collapse collapse">
-        <div class="accordion-inner">
-          <ul>
-            {% for post in category[1] %}
-            <li><a href='{{ post.url }}'>{{post.title}}</a></li>
-          {% endfor %}
-          </ul>
-        </div>
-      </div>
-    </div>
+<p>
+  {% for category in site.categories %}
+    <a href="/pages/categories.html#{{ category | first }}"><h3 style="display:inline;"><span class="label label-primary">{{ category[0] }}({{ category | last | size }})</span></h3></a> 
   {% endfor %}
-</div>
+</p>
+<hr>
+{% for category in site.categories %} 
+  <legend id="{{ category[0] }}">{{ category[0] }}</legend>
+  <ul>
+    {% for post in category[1] %}
+      <li><a href='{{ post.url }}'>{{post.title}}</a></li>
+    {% endfor %}
+  </ul>
+{% endfor %}

pages/categories.html

@@ -11,18 +11,7 @@ body{padding-top: 70px;}
 }
 .body_push{height:100px;}
 .body_footer {height:100px;background-color: #f5f5f5;}
-.body_footer .container{
-  padding-top: 30px;
-  padding-bottom: 30px;
-}
-@media (min-width: 767px) {
-  .body_footer {
-    margin-left: -20px;
-    margin-right: -20px;
-    padding-left: 20px;
-    padding-right: 20px;
-  }
-}
+.body_footer .container{padding-top: 30px;padding-bottom: 30px;}
 @media screen and (min-width: 992px) {
   .affix {top:70px;}
   .aside {width: 226px;}
@@ -42,3 +31,5 @@ body{padding-top: 70px;}
 .content {font-size:18px;line-height:1.8;}
 .content h2,h3{line-height: 2;}
 blockquote p{font-size:20px;}
+.panel-title {font-size:18px;}
+.panel-body {font-size:16px;}