Zhicheng Wang 969da7d321 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	README.md
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/homepage-hello-world/ts/index.1.html
#	public/docs/_examples/homepage-tabs/ts/index.1.html
#	public/docs/_examples/homepage-todo/ts/index.1.html
#	public/docs/_examples/systemjs.config.plunker.build.js
#	public/docs/_examples/systemjs.config.plunker.js
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	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/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/features.jade
#	public/resources/js/directives/live-example.js
#	tools/plunker-builder/indexHtmlTranslator.js

2016-09-08 17:20:01 +08:00

..

_alert.scss

updated styles

2015-04-23 08:22:43 -07:00

_api.scss

feat(badging): Enum only matches enums, as opposed to Const and Enums. Const matches const, var, and let

2016-05-16 22:41:43 -04:00

_article-card.scss

chore(news): update posts and add twitter feed

2016-02-29 22:51:57 -08:00

_banner.scss

feat(images): new frontpage as directed by Alex Wolfe. New images from Fatima Remtullah

2016-05-02 13:03:13 -07:00

_bio-card.scss

previous changes from other branch

2015-03-11 17:56:08 -07:00

_buttons.scss

code switchers

2015-04-22 06:59:02 -07:00

_callout.scss

callouts added

2015-04-07 20:38:52 -07:00

_card.scss

#119

2015-05-19 23:17:03 -07:00

_cheatsheet.scss

api-web-app: convert to using dynamically generated cheatsheet data

2015-11-10 11:37:05 +00:00

_code-box.scss

change class and directive template.

2016-04-16 03:17:47 -07:00

_code.scss

docs(_code.scss): ensure code wraps correctly

2016-01-22 10:46:55 +00:00

_copy.scss

fix(copy btn): remove overflow from button. Refactor styles out of inlines within directive

2016-05-12 17:49:33 -07:00

_cta-bar.scss

more mobile styles

2015-03-04 21:39:57 -08:00

_docs-landing.scss

fix(docs landing): make docs landing responsive

2016-05-09 23:17:57 -07:00

_dropdown.scss

Fixed shifting content on page load

2016-04-22 15:49:10 -07:00

_embedded-plunker.scss

chore: add embedded plunkers functionality (#2194)

2016-08-25 10:44:22 -07:00

_example-title.scss

docs(style-guide): add style-guide - v.3

2016-04-25 22:24:37 -07:00

_features.scss

feat(features: update features section)

2016-05-02 15:41:21 -07:00

_filetree.scss

fixes filetree styles to support directories as the last item

2015-12-15 11:47:31 -08:00

_footer.scss

feat(images): new frontpage as directed by Alex Wolfe. New images from Fatima Remtullah

2016-05-02 13:03:13 -07:00

_heading-code.scss

heading-code-scss: fix background color

2015-11-04 11:20:47 +00:00

_hero.scss

docs: align badges vertically within their container, remove shadow from content area

2016-05-26 09:22:25 -07:00

_home-promos.scss

chore: alphabetize entries in resources page. Add margin under frontpage banner

2016-07-19 09:52:25 -07:00

_hover-card.scss

guide and api homepage update

2015-04-21 23:09:13 -07:00

_images.scss

chore: fix image width problem on mobile (iPhone) devices w/ CSS - img {max-width:100%}

2016-03-19 12:08:09 -07:00

_jump-nav.scss

initial styleguide files

2015-04-06 06:41:08 -07:00

_main-nav.scss

feat(nav reorg): reorganize footer and top nav

2016-04-28 19:23:13 -07:00

_modal.scss

previous changes from other branch

2015-03-11 17:56:08 -07:00

_overlay.scss

dropdown

2015-03-03 14:22:30 -08:00

_press-kit.scss

feat(press kit): press kit with logos

2016-04-28 19:22:36 -07:00

_resources.scss

new style with new schema

2016-06-30 12:36:14 -04:00

_shadow.scss

initial styleguide files

2015-04-06 06:41:08 -07:00

_showcase.scss

feat(shorter lines): encapsulate all doc guides within a 10 sized column, including banners. Use showcase. Adjust for mobile

2016-05-16 15:40:32 -04:00

_side-nav.scss

翻译完了“升级”一章的新增部分

2016-05-31 12:35:37 +08:00

_statement.scss

Statement clean up.

2015-04-22 05:55:25 -07:00

_sticker.scss

icon update

2015-02-28 12:10:58 -08:00

_style-guide.scss

green = do (#2257)

2016-09-02 16:41:08 -07:00

_support.scss

Added content to Support page

2016-01-13 11:02:34 -08:00

_table.scss

Updated Events Page

2016-05-13 08:48:27 -07:00