From 27f06bb0346c2905426e9ae2c560cc70e9b97043 Mon Sep 17 00:00:00 2001
From: hi-caicai <hi@cai-cai.me>
Date: Fri, 19 Feb 2016 22:28:08 +0800
Subject: [PATCH] update tags for pages | fix bugs

---
 .DS_Store            | Bin 6148 -> 0 bytes
 .gitignore           |   2 ++
 404.jade             |   2 +-
 about.jade           |  16 +++---------
 base.jade            |  12 ++++-----
 index+tags.jade      |   7 +++++
 mixins.jade          |   4 +++
 style/.DS_Store      | Bin 6148 -> 0 bytes
 style/css/.DS_Store  | Bin 6148 -> 0 bytes
 style/css/style.scss |  59 +++++++++++++++++++++++--------------------
 10 files changed, 56 insertions(+), 46 deletions(-)
 delete mode 100644 .DS_Store
 create mode 100644 .gitignore
 create mode 100755 index+tags.jade
 delete mode 100644 style/.DS_Store
 delete mode 100644 style/css/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 487b53a48b926f540a49812f9b1142f54727d76f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKO>fgM7=GP#kama_38cX(H;^`=c4LAYRVhe_%S6z2;A13BXai|nC26~<s?-Dj
zfUogK;K~o+!fhu`960e8;IZSftRp*4fc!@GWBYv{zs@7Yj){mh`fiP=LPQ3Nz+xHI
zA58c~IbsDhvIt~yj^|{POWxgpw~j>X0j+>m;BQkve7go+qbkZ(%6z|0z#aI+#&8Ga
z%1>!%5tZ?kJH)9^NiOH}4Cf3u5w)m8J`Kpr<FWfQyb?0m6d%LbpJ9}dAr!k1?c`-C
zJelE~m7D~eh@K%|OXZ94mZ8|q4%8@oo8c}{7wjE5L!6gUYPgrtaEW@DJBEVG;0tYD
zV9lI{So<=3Hnp*a{P~2w+4<(>T)PycyYInzrJ^~J&M@w&$nQ=s@Z+Rf-Dicl;{2)8
zMyV{G#nNM|!-rO4C;hl#M-OGscRfe7H|(S{Z9m{V_}#XhP2U@CSI*z!VPgBC7iFlA
zw*1iL!v^n%ZoFN&un~C!L~q!kx9P{e;|G4SYm~&ZUAZ(G)vD{)SIpJ*)$xjn&RT87
zys^GE9vjBR%WF69ZH1#(uiw0VxA*=7bb&FPN7BwIoWe&mGFk=gn$_ano^&&A9rkv4
zv+4E|oMm5re0?cnGTbhAkMZ_8*_l5Ha)vvwqA=iL8>7>eiindnmDyN0*|a*FRzNH8
z4=5n^2NOkLUEw4}xpknDR{&rU!_v?ezYKz7Dy%D<qzDg;rBq-_W$KE-QaZ*>6<1d{
zNin4pQ<o2>GBb5UVKO`BH)S}ndWyQ%3TOomD=?RKE8_gWoqzv7Owv8AfL7qYQh*hk
zR<nUuQfKRtmlJ2LiSiUhn24LCC@HAaaV#6+C|*L52A?S!z`DXoiWq_E9|0+YuCxLt
Gs=zO#!26y6

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..65d2992
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+.DS_Store
diff --git a/404.jade b/404.jade
index 4a891f0..c30cd6b 100755
--- a/404.jade
+++ b/404.jade
@@ -3,4 +3,4 @@ html
 		title Not Found
 		+load('/template/style/css/style.scss')
 	.page_404
-		p 404 Not Foundvar assert = require("assert")
+		p 404 Not Found
\ No newline at end of file
diff --git a/about.jade b/about.jade
index ace9684..8d7b680 100644
--- a/about.jade
+++ b/about.jade
@@ -3,7 +3,7 @@ block content
 	.autopagerize_page_element:.content
 		.about.animated.fadeInDown
 			h3 是我
-			p 生活的花匠，互联网的裁缝，理想的士兵
+			p 对，你现在看到的这个家伙，就是我，设计湿，当得了视觉，撸的起交互，还能偷偷改几行代码～
 			h3 自嘲
 			p 
 			| 经常嬉笑自嘲，假装不靠谱.
@@ -14,11 +14,8 @@ block content
 			| 热爱我的职业是这辈子最幸福的事情，虽挖过的坑比填的坑还多，但乐此不疲.
 			h3 玩儿
 			p 
-			| 玩，什么都玩，拼命的玩！喜欢接触新鲜玩意
-			h3 直白
-			p 
-			| 不会拐弯抹角，不会阿谀奉承！
-			h3 硬广
+			| 玩，什么都玩，拼命的玩，新鲜每一天，人称“app疯子”，手机内多达300多app来回摆弄～，拍的照片不怎么样，却老喜欢强迫别人拿去当壁纸！
+			h3 硬广	
 			p	
 			| 如果需要老博客主题，请访问:http://old.cai-cai.me
 			p
@@ -29,9 +26,4 @@ block content
 			a(href="http://anatole.cai-cai.me") 点我点我～
 			h3 联系
 			p
-			| 任何问题，欢迎给我发邮件（hi#cai-cai.me #=@），或者twitter上@我～～
-			br
-			p 
-			| 也可以用 
-			a(href="https://telegram.me/hicaicai") Telegram 
-			| 联系我
+			| 任何问题，欢迎给我发邮件（hi#cai-cai.me #=@），或者@我～～
diff --git a/base.jade b/base.jade
index 17bda56..6323d1d 100755
--- a/base.jade
+++ b/base.jade
@@ -20,17 +20,17 @@ html
 		+get_resource("blog_basic.css")
 		+load('/template/style/css/style.scss')
 	body
-		.sidebar
+		.sidebar.animated.fadeInDown
 			.logo-title
-				.title.animated.fadeInDown
+				.title
 					img(src="/template/style/images/logo@2x.png",style="width:127px;")
 					h3(title="")
-						a(href="https://www.caicai.me") {{ site.title }}
+						a(href="/") {{ site.title }}
 					if site.raw_content
-						.description.animated.fadeInDown
+						.description
 							p= '%s' % site.raw_content[:100]
 
-			ul.social-links.animated.fadeInDown
+			ul.social-links
 				if site.configs.twitter
 				    li
 						a(href="https://twitter.com/{{site.configs.twitter}}")
@@ -41,7 +41,7 @@ html
 							i.fa.fa-instagram
 				if site.configs.dribbble
 					li
-						a(href="https://dribbble.com/{{site.configs.dribbble}}")
+						a(href="https://dribbbble.com/{{site.configs.dribbble}}")
 							i.fa.fa-dribbble
 				if site.configs.weibo
 					li
diff --git a/index+tags.jade b/index+tags.jade
new file mode 100755
index 0000000..b8161ce
--- /dev/null
+++ b/index+tags.jade
@@ -0,0 +1,7 @@
+from mixins import make_post, make_pager
+extends base.jade
+block content
+	.autopagerize_page_element:.content
+		for post in posts
+			+make_post(post, is_detail=False)
+		+make_pager('Newer Posts', 'Older Posts')
diff --git a/mixins.jade b/mixins.jade
index ad11d71..d561ca3 100755
--- a/mixins.jade
+++ b/mixins.jade
@@ -17,6 +17,10 @@ mixin make_post(post, is_detail=False)
 				if site.configs.disqus
 					i.fa.fa-comment-o
 					a(href="{{post.url}}#disqus_thread") Comments
+				if post.tags
+					i.fa.fa-tag
+					for tag in post.tags
+						a.tag(href='/tags/{{tag}}') &nbsp;{{tag}}
 mixin make_pager(pre_text, next_text)
 	.pagination
 		ul.clearfix
diff --git a/style/.DS_Store b/style/.DS_Store
deleted file mode 100644
index 4c205def5efa94bc395ab84305710feeb053fbd0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!EO^V5FICJ*}$QT1QKxC8$INZG>YKHDwIlyOGHq602FqcRqJY5SJ_P?6h+#9
zXbbd5%1`hCd;)(F-q>zM8aNiI$g>*1@pxt}KPUDM5sB`2*dp?Y$b&Lg>S+ETJkGi#
z73*063Vw&$jZ+n)$FFm86ByvVtI{szl)p?D_HPR#>rgSD>xI~;c#<F5UH%y#rZO*@
z%^#vtt*xxy^6IzwS*ySA@2g3_h>CIEjYe;EPY#pV+P$dQzp&pZm0sFWye*T-z`yrg
zWkn>jWb|9=yB(Pg)ugM&*)SjY_j{w{2+_SLOSWY$W0}h0lUL_w;6Iv9Tg}dsMzGP@
zm^A`)+O0<Lw9}r=Jn!M-_On+z+4T72^z)amXXko-B=8&7a@XPoe1l<Ef7Bmksmk`?
z;pkP8^pPUkqhyJ{?-*a7Yk`Ho7ad%U5wEYr=s?#v1{?#9foo^Lo_F4zYoEzY;23ZW
z+%yLGd<dY7p~cdmK046o5&&3(TMKOc@ed5x0Sqmc2H}ASlL|Dc!j>4q)(*m?V?4C+
zr9qQULeGr%*qMc`P=qZ#M4-b-ga%#f7;p?MGEg;LpYQ({f3N=+lU&a+;28L?7!bA1
z{$>|TvUls!;`pu&pdX+t99J5=Oo5@VV#M-Q`~a#2{(uc&Xt6X155#>4Xc}DO82G0Q
F`~pBGcl!VU

diff --git a/style/css/.DS_Store b/style/css/.DS_Store
deleted file mode 100644
index 83cbc58f33ea23707c4b02eb7b71d6f831fb08ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKF-`+P474Fd1WiiHEvb<B!756SsQCa&pgSo=prE^ock#1i#<mdAL4!nt#?p9p
zz4mQxigRpczI=VUHCve393a~}-PCwaOzf;84hHayXS=bzZGrtH`}+WEFOdCWZ#I0b
zzaMtn&9K|xoImakxCZ=ifR{-DDIf);fE17dzg2*}7dF34mX`ujKni>+!0$r?$h~+>
zj!y?%i~!&n!eLm)ECFr|fP3+nj0nuL6r81ABZg-=;;r&}@tB<D=5aHgQ#X4}C?2;X
z-Xh(+C(BC#DR8R5d2Sc%|7+lf`Tw*?J1HOq{*?kgTRp6nc%|yClb2(!ZNMYIoDYD8
pb(FwGI|fHP#)j?qDv~m<agFm{JSImu;!zIPp8@J3lLCLOz!4r}7o`9I

diff --git a/style/css/style.scss b/style/css/style.scss
index f8ba173..32bcda6 100755
--- a/style/css/style.scss
+++ b/style/css/style.scss
@@ -6,7 +6,7 @@ html {
 
 body {
 	color: rgba(0, 0, 0, 0.5);
-	font-family: "Helvetica Neue",Helvetica,"Hiragino Sans GB","STHeitiSC-Light","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+	font-family: 'PingHei', 'PingFang SC', Helvetica Neue, 'Work Sans', 'Hiragino Sans GB', 'Microsoft YaHei', SimSun, sans-serif;
 	font-size: 15px;
 	width: 100%;
 	margin: 0 auto 30px auto;
@@ -35,7 +35,7 @@ a:link, a:visited {
 }
 
 a:hover, a:active {
-	color: #555;
+	color: #4786D6;
 
 }
 
@@ -157,7 +157,7 @@ a:hover, a:active {
 			color:#5A5A5A;
 		}
 		a:hover{
-			color:#464545;
+			color:#4786D6;
 		}
 		a.current{
 			color:#5A5A5A;
@@ -259,6 +259,9 @@ a:hover, a:active {
 		a {
 			color: #565654;
 		}
+		a:hover{
+			color: #4786D6;
+		}
 	}
 }
 
@@ -299,7 +302,9 @@ a:hover, a:active {
 			text-decoration: none;
 			letter-spacing: 1px;
 			color: #5f5f5f;
-			font-family: Open Sans;
+			&:hover{
+				text-decoration: underline;
+			}
 
 		}
 	}
@@ -310,22 +315,17 @@ a:hover, a:active {
 			letter-spacing: 1px;
 			color: #4786D6;
 		}
+		a:hover{
+			color: #2F69B3;
+		}
 		h3{
 			color: #5F5F5F;
 			font-size:22px;
 			font-weight:600;
-			font-family: Open Sans;
-
 		}
 		h4 {
 			color: #5F5F5F;
 			font-size:16px;
-			font-family: Open Sans;
-
-
-		}
-		img {
-			min-width: 100%;
 		}
 	}
 
@@ -343,16 +343,20 @@ a:hover, a:active {
 				float: left;
 				font-size: 12px;
 				.date{
-					margin-right: 5px;
+					margin-right: 10px;
 				}
 			}
 
 			a {
 				text-decoration: none;
 				color: #bbbbbb;
+				padding-right: 10px;
+				&:hover{
+					color: #4786D6;
+				}
 			}
 			i{
-				margin-right: 3px;
+				margin-right: 6px;
 			}
 		}
 
@@ -469,6 +473,9 @@ a:hover, a:active {
 	a {
 		color: #A6A6A6;
 	}
+	a:hover{
+		color: #4786D6;
+	}
 	span{
 	}
 	.by_farbox{
@@ -511,7 +518,7 @@ a:hover, a:active {
 				color: #8F8F8F;
 
 				 &:hover{
-					 color: #464545;
+					 color: #4786D6;
 				 }
 			}
 
@@ -520,11 +527,8 @@ a:hover, a:active {
 }
 /* share */
 .share{
-	padding-left: 30px;
-	display: flex;
-	width: 100%;
-	height: 60px;
-	display: -webkit-box;
+	margin: 0px 30px;
+	display: inline-flex;
 }
 .evernote{
 	width: 32px;
@@ -722,13 +726,13 @@ a.btn {
 }
 
 
-@media screen and (max-width: 414px) {
+@media screen and (max-width: 960px) {
 	.sidebar {
 		width: 100%;
 		position:absolute;
 		border-right:none;
 			.logo-title{
-				padding-top: 100px;
+				padding-top: 120px;
 			
 				.title{
 
@@ -742,19 +746,20 @@ a.btn {
 			}
 		}
 	.page-top{
-		display: none;
+		width: 100%
+	}
+	.post-title h3{
+		line-height: 1.6;
 	}
 	.content{
-		margin-top: 360px;
+		margin-top: 420px;
 		width: 100%;
-		overflow: hidden;
 	}
 	.footer{
 		display: none;
 	}
 	.share{
-		display: flex;
-		display: -webkit-box;
+		display: grid;
 	}
 	
 }