new icons

JimmyLv · Aug 30, 2014 · f6332cb · f6332cb
1 parent 2864e5c
commit f6332cb
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 24 deletions.
diff --git a/_includes/disqus.html b/_includes/disqus.html
@@ -1,5 +1,5 @@
 <div id="disqus_thread">
   <button type="button" name="{{ site.disqus.shortname }}" class="btn btn-default show-commend">	
-  	<i class="fa fa-comments fa-2x" style="color: #428bca;"></i>     <!-- 修改显示评论按钮图标-->
+  	<i class="fa fa-comments fa-lg" style="color: #428bca;"></i>     <!-- 修改显示评论按钮图标-->
   </button>
 </div>
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,11 +1,11 @@
-<div style="position:fixed;right:20px;top:60px;">
-  <button id="content_btn" class="btn btn-primary" style="height:43px;width:50px;">
-    <i class="fa fa-2x fa-plus"></i>
+<div style="position:fixed;right:15px;top:62px;">
+  <button id="content_btn" class="btn btn-primary" style="width:43px; height:34px;">
+    <i class="fa fa-lg fa-plus"></i>
   </button>
 </div>
-<div style="position:fixed;right:20px;top:10px;">
+<div style="position:fixed;right:15px;top:20px;">
   <button id="nav_btn" class="btn btn-primary">
-    <i class="fa fa-2x fa-reorder"></i>
+    <i class="fa fa-lg fa-navicon"></i>
   </button>
 </div>
 <script type="text/javascript" src="/public/js/jquery.js"></script>

diff --git a/_includes/header_title.html b/_includes/header_title.html
@@ -0,0 +1,16 @@
+<meta charset="utf-8">
+<title>{{ page.titlename }} | {{ site.title }}</title>
+<meta name="author" content="{{ site.author.name }}">
+{% if page.keywords %}
+  <meta name="keywords" content="{{ page.keywords }}">
+{% endif %}
+{% if page.description  %}
+  <meta name="description " content="{{ page.description  }}">
+{% endif %}
+<link rel="shortcut icon" href="{{ site.favicon }}" />
+<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/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">
diff --git a/_includes/navside.html b/_includes/navside.html
@@ -8,9 +8,12 @@
         {% for category in site.categories %}
           <li><a href="#{{ category | first }}" data-toggle="tab">{{ category[0] }}</a></li>
         {% endfor %}
-        <li><a href="#tags" data-toggle="tab">{{ site.locals.tags }}</a></li>
+        <li><a href="#tags" data-toggle="tab"><i class="fa fa-tags fa-lg"></i></a></li>
+        <li><a class="pjaxlink" href="/pages/archive.html"><i class="fa fa-archive fa-lg"></i></a></li>
+        <li><a class="pjaxlink" href="/pages/about.html"><i class="fa fa-user fa-lg"></i></a></li>
+        <!-- <li><a href="#tags" data-toggle="tab">{{ site.locals.tags }}</a></li>  
         <li><a class="pjaxlink" href="/pages/archive.html">{{ site.locals.archive }}</a></li>
-        <li><a class="pjaxlink" href="/pages/about.html">{{ site.locals.about }}</a></li>
+        <li><a class="pjaxlink" href="/pages/about.html">{{ site.locals.about }}</a></li>  这是原来现实汉字的代码，我改为了图标 -->
       </ul>
       <div class="aside1_bottom">
         <table class="table table-condensed">
@@ -23,7 +26,7 @@
     </div>
     <div class="col-md-9 col-xs-9 aside2">
       <div class="row">
-        <div class="tab-content">
+        <div class="tab-content"> 
           {% for category in site.categories %} 
             <div class="tab-pane" id="{{ category[0] }}">
               <div class="list-group">
@@ -33,7 +36,7 @@ <h2 class="center">{{ category[0] }}</h2>
                 {% endfor %}
               </div>
             </div>
-          {% endfor %}
+          {% endfor %}      
           <div class="tab-pane" id="tags">
             <div class="panel-group" id="accordion">
               <h2 class="center">{{ site.locals.tags }}</h2>

diff --git a/_layouts/base_title.html b/_layouts/base_title.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html>
+<head>
+  {% include header_title.html %}
+</head>
+<body>
+  <div class="container">
+    <div class="row">
+      {% include navside.html %}
+      <div class="col-md-8 col-lg-8 col-sm-12 col-xs-12 aside3">
+        <div id="container">
+          <div id="pjax">
+            {{ content }}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  {% include footer.html %}
+  {% include googleanalytics.html %}
+</body>
+</html>
diff --git a/_layouts/page_title.html b/_layouts/page_title.html
@@ -0,0 +1,16 @@
+---
+layout: base_title
+---
+<div class="row">
+  <div class="col-md-12 aside3-title">
+    <br>
+    <h2 id="#identifier">{{ page.title }}</h2>
+  </div>
+  <div class="col-md-12 aside3-content">
+    <div id="page-content">
+      {{ content }}
+    </div>
+    <hr>
+    {% include disqus.html %}
+  </div>
+</div>
diff --git a/index.html b/index.html
@@ -1,6 +1,7 @@
 ---
-layout: page
-title: 首页<!--<a href=""><i class="fa fa-weibo fa-2x"></i></a>-->
+layout: page_title
+title: <i class="fa fa-home fa-lg"></i>
+titlename: 首页
 ---
 
 <br>

diff --git a/pages/about.html b/pages/about.html
@@ -1,6 +1,7 @@
 ---
-layout: page
-title: 关于
+layout: page_title
+title: <i class="fa fa-user fa-lg"></i>
+titlename: 关于
 ---
 <h3>关于博客</h3>
 <p style=font-size:18px><B>PainterLin.com</B>博客名字直译过来是：画家林。在我看来，画家客和黑客是相似的：他们都是创造者，就好像作曲家，建筑师，以及作家一样，他们的目的是创造某种美好的事物。选域名时想到这个也许代表了我的某种愿望。博客内容不一定与技术相关，技术只是世界上的一个小目录。</p>
@@ -11,22 +12,22 @@ <h3>关于作者</h3>
 
 <hr>
 <a href="{{ site.author.linkedin }}">
-  <i class="fa fa-linkedin fa-2x"></i>
+  <i class="fa fa-linkedin fa-lg"></i>
 </a>
 <a href="{{ site.author.weibo }}" target="_blank">
-  <i class="fa fa-weibo fa-2x"></i>
+  <i class="fa fa-weibo fa-lg"></i>
 </a>
 <a href="{{ site.author.github }}" target="_blank">
-  <i class="fa fa-github fa-2x"></i>
+  <i class="fa fa-github fa-lg"></i>
 </a>
 <a href="/pages/atom.xml" target="_blank">
-  <i class="fa fa-rss fa-2x"></i>
+  <i class="fa fa-rss fa-lg"></i>
 </a>
 <a href="mailto:{{ site.author.email }}">
-  <i class="fa fa-envelope-o fa-2x"></i>
+  <i class="fa fa-envelope-o fa-lg"></i>
 </a>
 <a href="{{ site.author.music }}">
-  <i class="fa fa-music fa-2x"></i>
+  <i class="fa fa-music fa-lg"></i>
 </a>
 <hr>
 {% include disqus.html %}

diff --git a/pages/archive.html b/pages/archive.html
@@ -1,6 +1,7 @@
 ---
-layout: page
-title: 归档
+layout: page_title
+title: <i class="fa fa-archive fa-lg"></i>
+titlename: 归档
 comments: false
 ---
 

diff --git 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%;