still work on js error

huan-qiu · Jan 23, 2018 · 3cf64a4 · 3cf64a4
1 parent 56d852a
commit 3cf64a4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/layout/includes/header.pug b/layout/includes/header.pug
@@ -1,5 +1,6 @@
 header#page-header
-	include nav.pug
+	//- include nav.pug
+	| !{partial('includes/nav', null, {cache: true})}
 	//- banner-wrapper来放背景图片
 	#banner-wrapper
 		//- banner-pagetype-dependent-info 垂直居中，水平左40%显示

diff --git a/layout/includes/layout.pug b/layout/includes/layout.pug
@@ -1,21 +1,17 @@
 doctype html
-//- include head
-| !{partial('includes/head', null, {cache: true})}
+include head
 
 body
 	//- 这个wrapper是用在post页面类型，为了toc而存在的
 	#body-inner-wrapper
-		//- include header
-		| !{partial('includes/header', null, {cache: true})}
+		include header
 		if is_post()
 			block TOC		
 			block mainContent			
 		else		
 			block mainContent		
 
-		//- include pagination.pug
-		| !{partial('includes/pagination', null, {cache: true})}
-		//- include footer
-		| !{partial('includes/footer', null, {cache: true})}
+		include pagination.pug
+		include footer
 		//- include after-footer.pug
 		| !{partial('includes/after-footer', null, {cache: true})}
diff --git a/source/compass/imgs/HangingClothes.png → source/compass/imgs/fHangingClothes.png b/source/compass/imgs/HangingClothes.png → source/compass/imgs/fHangingClothes.png
diff --git a/source/compass/js/blog.js b/source/compass/js/blog.js
@@ -106,8 +106,9 @@ if (!headings || headings.length <=2 ) {
 		mainContentColumn.style.width = '80%';
 		// 是水平居中表示
 		mainContentColumn.style.margin = 'auto';
+		tocColumn.style.display = 'none';
 	}	
-	tocColumn.style.display = 'none';
+
 	toggleOff.style.display = 'none';
 	toggleOn.style.display = 'none';