Zhicheng Wang 583247f0f9 Merge remote-tracking branch 'origin/master' ... # Conflicts: # public/_data.json # public/_includes/_footer.jade # public/_includes/_hero-home.jade # public/_includes/_main-nav.jade # public/docs/_includes/_side-nav.jade # public/docs/ts/latest/_data.json # public/docs/ts/latest/cookbook/_data.json # public/docs/ts/latest/glossary.jade # public/docs/ts/latest/guide/_data.json # public/docs/ts/latest/guide/architecture.jade # public/docs/ts/latest/guide/displaying-data.jade # public/docs/ts/latest/guide/forms.jade # public/docs/ts/latest/guide/user-input.jade # public/docs/ts/latest/index.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/tutorial/toh-pt2.jade # public/docs/ts/latest/tutorial/toh-pt5.jade # public/features.jade # public/index.jade		2016-05-03 22:33:20 +08:00
..
base	docs(code color fix): restored old color for code in parts that are not the api doc, use the same styling for all links in entire site	2016-04-21 12:03:12 -04:00
layout	feat(images): new frontpage as directed by Alex Wolfe. New images from Fatima Remtullah	2016-05-02 13:03:13 -07:00
module	feat(docs landing): new docs landing	2016-05-02 19:55:59 -07:00
vendor	完成了导航菜单	2016-04-13 08:53:17 +08:00
_angular.scss	converts docs landing template to use layout classnames rather than attribute syntax	2016-05-02 19:55:59 -07:00
_options.scss	adds contrast to code highlighting colors	2015-12-15 01:02:41 -08:00
_print.scss	docs(style-guide): add style-guide - v.3	2016-04-25 22:24:37 -07:00
_state.scss	Updates for mobile list styles and layout	2015-05-17 11:34:24 -07:00
_theme.scss	feat(nav reorg): reorganize footer and top nav	2016-04-28 19:23:13 -07:00
main.scss	feat(docs landing): new docs landing	2016-05-02 19:55:59 -07:00