Merge branch 'release/v1.0.2'

config.codekit

@@ -1,6 +1,6 @@
 {
 "CodeKitInfo": "This is a CodeKit 2.x project configuration file. It is designed to sync project settings across multiple machines. MODIFYING THE CONTENTS OF THIS FILE IS A POOR LIFE DECISION. If you do so, you will likely cause CodeKit to crash. This file is not useful unless accompanied by the project that created it in CodeKit 2. This file is not backwards-compatible with CodeKit 1.x. For more information, see: http:\/\/incident57.com\/codekit",
-"creatorBuild": "19033",
+"creatorBuild": "19076",
 "files": {
 	"\/assets\/app.css": {
 		"fileType": 16,
@@ -22,6 +22,61 @@
 		"outputStyle": 1,
 		"syntaxCheckerStyle": 1
 		},
+	"\/assets\/apple-touch-icon-120.png": {
+		"fileType": 32768,
+		"ignore": 0,
+		"ignoreWasSetByUser": 0,
+		"initialSize": 8056,
+		"inputAbbreviatedPath": "\/assets\/apple-touch-icon-120.png",
+		"outputAbbreviatedPath": "\/assets\/apple-touch-icon-120.png",
+		"outputPathIsOutsideProject": 0,
+		"outputPathIsSetByUser": 0,
+		"processed": 0
+		},
+	"\/assets\/apple-touch-icon-152.png": {
+		"fileType": 32768,
+		"ignore": 0,
+		"ignoreWasSetByUser": 0,
+		"initialSize": 11091,
+		"inputAbbreviatedPath": "\/assets\/apple-touch-icon-152.png",
+		"outputAbbreviatedPath": "\/assets\/apple-touch-icon-152.png",
+		"outputPathIsOutsideProject": 0,
+		"outputPathIsSetByUser": 0,
+		"processed": 0
+		},
+	"\/assets\/apple-touch-icon-180.png": {
+		"fileType": 32768,
+		"ignore": 0,
+		"ignoreWasSetByUser": 0,
+		"initialSize": 12909,
+		"inputAbbreviatedPath": "\/assets\/apple-touch-icon-180.png",
+		"outputAbbreviatedPath": "\/assets\/apple-touch-icon-180.png",
+		"outputPathIsOutsideProject": 0,
+		"outputPathIsSetByUser": 0,
+		"processed": 0
+		},
+	"\/assets\/apple-touch-icon-76.png": {
+		"fileType": 32768,
+		"ignore": 0,
+		"ignoreWasSetByUser": 0,
+		"initialSize": 4834,
+		"inputAbbreviatedPath": "\/assets\/apple-touch-icon-76.png",
+		"outputAbbreviatedPath": "\/assets\/apple-touch-icon-76.png",
+		"outputPathIsOutsideProject": 0,
+		"outputPathIsSetByUser": 0,
+		"processed": 0
+		},
+	"\/assets\/apple-touch-icon.png": {
+		"fileType": 32768,
+		"ignore": 0,
+		"ignoreWasSetByUser": 0,
+		"initialSize": 8056,
+		"inputAbbreviatedPath": "\/assets\/apple-touch-icon.png",
+		"outputAbbreviatedPath": "\/assets\/apple-touch-icon.png",
+		"outputPathIsOutsideProject": 0,
+		"outputPathIsSetByUser": 0,
+		"processed": 0
+		},
 	"\/assets\/avatar-fang-kecheng.jpg": {
 		"fileType": 16384,
 		"ignore": 0,
@@ -1707,7 +1762,7 @@
 		},
 	"\/less\/_define.less": {
 		"allowInsecureImports": 0,
-		"createSourceMap": 1,
+		"createSourceMap": 0,
 		"disableJavascript": 0,
 		"fileType": 1,
 		"ieCompatibility": 1,
@@ -1717,7 +1772,7 @@
 		"outputAbbreviatedPath": "\/assets\/_define.css",
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0,
-		"outputStyle": 0,
+		"outputStyle": 1,
 		"relativeURLS": 0,
 		"shouldRunAutoprefixer": 1,
 		"shouldRunBless": 0,
@@ -1747,7 +1802,7 @@
 		},
 	"\/less\/basis.less": {
 		"allowInsecureImports": 0,
-		"createSourceMap": 1,
+		"createSourceMap": 0,
 		"disableJavascript": 0,
 		"fileType": 1,
 		"ieCompatibility": 1,
@@ -1757,7 +1812,7 @@
 		"outputAbbreviatedPath": "\/assets\/basis.css",
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0,
-		"outputStyle": 0,
+		"outputStyle": 1,
 		"relativeURLS": 0,
 		"shouldRunAutoprefixer": 1,
 		"shouldRunBless": 0,
@@ -1767,7 +1822,7 @@
 		},
 	"\/less\/card-chrome.less": {
 		"allowInsecureImports": 0,
-		"createSourceMap": 1,
+		"createSourceMap": 0,
 		"disableJavascript": 0,
 		"fileType": 1,
 		"ieCompatibility": 1,
@@ -1777,7 +1832,7 @@
 		"outputAbbreviatedPath": "\/assets\/card-chrome.css",
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0,
-		"outputStyle": 0,
+		"outputStyle": 1,
 		"relativeURLS": 0,
 		"shouldRunAutoprefixer": 1,
 		"shouldRunBless": 0,
@@ -1787,7 +1842,7 @@
 		},
 	"\/less\/card-typeset.less": {
 		"allowInsecureImports": 0,
-		"createSourceMap": 1,
+		"createSourceMap": 0,
 		"disableJavascript": 0,
 		"fileType": 1,
 		"ieCompatibility": 1,
@@ -1797,7 +1852,7 @@
 		"outputAbbreviatedPath": "\/assets\/card-typeset.css",
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0,
-		"outputStyle": 0,
+		"outputStyle": 1,
 		"relativeURLS": 0,
 		"shouldRunAutoprefixer": 1,
 		"shouldRunBless": 0,
@@ -1807,7 +1862,7 @@
 		},
 	"\/less\/main.less": {
 		"allowInsecureImports": 0,
-		"createSourceMap": 1,
+		"createSourceMap": 0,
 		"disableJavascript": 0,
 		"fileType": 1,
 		"ieCompatibility": 1,
@@ -1817,7 +1872,7 @@
 		"outputAbbreviatedPath": "\/assets\/main.css",
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0,
-		"outputStyle": 0,
+		"outputStyle": 1,
 		"relativeURLS": 0,
 		"shouldRunAutoprefixer": 1,
 		"shouldRunBless": 0,
@@ -1827,7 +1882,7 @@
 		},
 	"\/less\/vendor\/normalize.less": {
 		"allowInsecureImports": 0,
-		"createSourceMap": 1,
+		"createSourceMap": 0,
 		"disableJavascript": 0,
 		"fileType": 1,
 		"ieCompatibility": 1,
@@ -1837,7 +1892,7 @@
 		"outputAbbreviatedPath": "\/less\/assets\/normalize.css",
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0,
-		"outputStyle": 0,
+		"outputStyle": 1,
 		"relativeURLS": 0,
 		"shouldRunAutoprefixer": 1,
 		"shouldRunBless": 0,
@@ -2065,7 +2120,7 @@
 	"jadeAutoOutputPathReplace1": "",
 	"jadeAutoOutputPathReplace2": "",
 	"jadeAutoOutputPathStyle": 2,
-	"jadeCompileDebug": 1,
+	"jadeCompileDebug": 0,
 	"jadeOutputStyle": 1,
 	"javascriptAutoOutputPathEnabled": 0,
 	"javascriptAutoOutputPathFilenamePattern": "*-min.js",
@@ -2380,10 +2435,6 @@
 			}
 		},
 	"jsLintFlags2": {
-		"ass": {
-			"active": 0,
-			"flagValue": -1
-			},
 		"bitwise": {
 			"active": 0,
 			"flagValue": -1
@@ -2392,91 +2443,35 @@
 			"active": 1,
 			"flagValue": -1
 			},
-		"closure": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"continue": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"debug": {
+		"couch": {
 			"active": 0,
 			"flagValue": -1
 			},
 		"devel": {
 			"active": 0,
 			"flagValue": -1
 			},
-		"eqeq": {
+		"es6": {
 			"active": 0,
 			"flagValue": -1
 			},
-		"evil": {
+		"eval": {
 			"active": 0,
 			"flagValue": -1
 			},
-		"forin": {
+		"for": {
 			"active": 0,
 			"flagValue": -1
 			},
-		"indent": {
-			"active": 0,
-			"flagValue": 4
-			},
 		"maxlen": {
 			"active": 0,
 			"flagValue": 150
 			},
-		"newcap": {
-			"active": 0,
-			"flagValue": -1
-			},
 		"node": {
 			"active": 0,
 			"flagValue": -1
 			},
-		"nomen": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"plusplus": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"properties": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"regexp": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"rhino": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"sloppy": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"stupid": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"sub": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"todo": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"unparam": {
-			"active": 0,
-			"flagValue": -1
-			},
-		"vars": {
+		"this": {
 			"active": 0,
 			"flagValue": -1
 			},
@@ -2506,15 +2501,15 @@
 	"lessAutoOutputPathReplace1": "less",
 	"lessAutoOutputPathReplace2": "css",
 	"lessAutoOutputPathStyle": 2,
-	"lessCreateSourceMap": 1,
+	"lessCreateSourceMap": 0,
 	"lessDisableJavascript": 0,
 	"lessIeCompatibility": 1,
-	"lessOutputStyle": 0,
+	"lessOutputStyle": 1,
 	"lessRelativeURLS": 0,
 	"lessStrictImports": 0,
 	"lessStrictMath": 1,
-	"lessStrictUnits": 0,
-	"markdownAutoOutputPathEnabled": 0,
+	"lessStrictUnits": 1,
+	"markdownAutoOutputPathEnabled": 1,
 	"markdownAutoOutputPathFilenamePattern": "*.html",
 	"markdownAutoOutputPathRelativePath": "",
 	"markdownAutoOutputPathReplace1": "",
@@ -2577,7 +2572,9 @@
 	"typescriptAutoOutputPathStyle": 2,
 	"typescriptCreateDeclarationFile": 0,
 	"typescriptCreateSourceMap": 0,
+	"typescriptJSXMode": 0,
 	"typescriptMinifyOutput": 0,
+	"typescriptModuleResolutionType": 0,
 	"typescriptModuleType": 0,
 	"typescriptNoImplicitAny": 0,
 	"typescriptPreserveConstEnums": 0,

jade/_head.jade

@@ -6,18 +6,25 @@ head
 	meta(name="description", content=pageDisc)
 	meta(name="keywords", content=pageKeyw)
 
-	-var viewport = "width=device-width,"
-	-viewport += "maximum-scale=1.0,"
-	-viewport += "minimum-scale=1.0"
+	-
+		var viewport = "width=device-width," 
+		+ "maximum-scale=1.0,"
+		+ "minimum-scale=1.0"
 	meta(name="viewport", content=viewport)
 	meta(name="apple-mobile-web-app-capable", content="yes")
 	meta(name="apple-mobile-web-app-status-bar-style", content="black")
 	meta(name="format-detection", content="telephone=no")
-	meta(http-equiv="X-UA-Compatible", content="IE=edge")
+	meta(http-equiv="X-UA-Compatible" content="IE=edge,chrome=1")
 
-	link(rel="icon", type="image/x-icon" href="assets/favicon.ico")
-	link(rel="stylesheet", href="assets/app.css")
-	script(type="text/javascript" src="assets/libs.js")
+	link(rel="icon", type="image/x-icon" href="assets/favicon.ico"+version)
+	link(rel="apple-touch-icon" href="assets/apple-touch-icon.png"+version)
+	link(rel="apple-touch-icon" sizes="76x76" href="assets/apple-touch-icon-76.png"+version)
+	link(rel="apple-touch-icon" sizes="120x120" href="assets/apple-touch-icon-120.png"+version)
+	link(rel="apple-touch-icon" sizes="152x152" href="assets/apple-touch-icon-152.png"+version)
+	link(rel="apple-touch-icon" sizes="180x180" href="assets/apple-touch-icon-180.png"+version)
+
+	link(rel="stylesheet", href="assets/app.css"+version)
+	script(type="text/javascript" src="assets/libs.js"+version)
 
 	<!--[if lt IE 9]>
 	<script src="assets/html5shiv.min.js"></script>

jade/index.jade

@@ -1,3 +1,5 @@
+- var version = "?v=1.0.2"
+
 doctype html
 html(lang="en")
 	-var pageTitl = "政见上海系列活动 · 2015 年 6 月"
@@ -45,4 +47,4 @@ html(lang="en")
 						footer
 							p.share-guide 欢迎分享到微信朋友圈
 
-		script(type="text/javascript" src="assets/app.js")
+		script(type="text/javascript" src="assets/app.js"+version)

javascripts/_libs.js

@@ -1,4 +1,4 @@
-/* @preserve
+/* @license
  * jQuery v2.1.4 | (c) 2005, 2015 jQuery Foundation, Inc. | jquery.org/license
  * FastClick | ftlabs-jsv2 | (c) The Financial Times Limited | MIT License
  */

less/_define.less

@@ -3,3 +3,5 @@
 
 @text-main: #333333;
 @text-sub: #b3b3b3;
+
+@font-base: "Avenir Next", "Segoe UI", "Helvetica Neue", Arial, "Hiragino Sans GB", "PingFang SC", "Microsoft YaHei UI" , "Microsoft YaHei", "Source Han Sans", "Noto Sans", sans-serif;

less/app.less

@@ -1,3 +1,7 @@
+@charset "UTF-8";
+
+/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
+
 @import "_define";
 @import "vendor/normalize";
 @import "basis";