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

# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_hero.jade
#	public/_includes/_main-nav.jade
#	public/_includes/_util-fns.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/_data.json
#	public/docs/ts/latest/testing/application-under-test.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/index.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/index.jade
#	public/resources/css/main.scss
#	public/resources/css/module/_side-nav.scss

2016-09-15 15:23:48 +08:00

..

_alert.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_announcement-bar.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_api.scss

chore: more typograhpical fixes (#2352)

2016-09-15 02:35:03 +01:00

_article-card.scss

chore(news): update posts and add twitter feed

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

_badge.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_banner.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_bio-card.scss

previous changes from other branch

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

_buttons.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_callout.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_card.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -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

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_code-shell.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_code.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -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

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_embedded-plunker.scss

chore: add embedded plunkers functionality (#2194)

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

_features.scss

feat(features: update features section)

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

_filetree.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_footer.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_form.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_heading-code.scss

heading-code-scss: fix background color

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

_hero.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -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

_lists.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_main-nav.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -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

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -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

Merge remote-tracking branch 'origin/master'

2016-09-15 15:23:48 +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

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_support.scss

Added content to Support page

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

_symbol.scss

design(style): Restyle changes from Alex

2016-09-14 17:18:55 -07:00

_table.scss

Updated Events Page

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