Commit Graph

22 Commits

Author SHA1 Message Date
rexebin ce3930b2c0 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	harp.json
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/quickstart/js/package.1.json
#	public/docs/_includes/_side-nav.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/api/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/rc4-to-rc5.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-10-17 22:48:18 +01:00
Patrice Chalin db6625eb30 Fix dartdoc styles and prep layout for ng2 pages (#2530)
- Use custom bootstrap grid system styles
- Cache a copy of the dartdoc static-assets styles.css w/ footer styles
disabled.
- Alternate page layout controlled by jade2ng harp global
2016-10-03 14:58:50 -07:00
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
Alex Wolfe 65db6b9268 design(style): Restyle changes from Alex 2016-09-14 17:18:55 -07:00
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
Patrice Chalin 0a45a47c73 docs(api): fix cross-language dropdown menu (#2187)
- Re-enable dropdown on main API page.
- Remove Dart choice from TS & JS API entry pages dropdown.
2016-08-24 14:48:23 -07:00
Zhicheng Wang e140256358 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
2016-07-17 20:40:12 +08:00
Patrice Chalin 1bef20abc4 docs(api/dart): add support for generation and display (#1888)
Fixes #1880.
Supersedes #1593.
2016-07-15 14:10:12 -07:00
Zhicheng Wang fb22c0556c 内容微调 2016-06-29 13:11:23 +08:00
Eric Jimenez 21272435a3 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
Eric Jimenez b5d2973163 feat(security badge): add a security badge to api docs. Only appears if @security is present in angular2 2016-05-12 17:48:54 -07:00
Eric Jimenez fbeef5b8ee fix(badge align): fix alignment of badges on all screens. Simplify logic to achieve this 2016-04-26 10:53:53 -07:00
alexwolfe 165f6933a6 Fixed shifting content on page load
Fixed shifting content when going from page to page in docs.
2016-04-22 15:49:10 -07:00
Eric Jimenez 3dd114d0df docs(class overview): list instance and static members with in-page hyperlinks. Also link constructor when present. Focus member on click. Badges look better in viewports of 600px or less 2016-04-20 13:14:18 -07:00
Eric Jimenez c934fb704f docs(badges): add badges in hero to identify doc type to viewer, and stability. Stylize var.template for new api style docs. Add stable, experimental, docsNotRequired tagdef in dgeni 2016-04-19 20:49:48 -07:00
Naomi Black 27d5a3b0a8 chore(social): remove social icons from site 2015-12-08 17:08:06 -08:00
Brian Ford b155ddfa2c List type info for var and const exports 2015-09-01 14:06:17 -07:00
Naomi Black 9169409c21 harp(update): var changes to allow use with harp 0.17.0 2015-07-28 00:14:34 -07:00
Alex Wolfe c11737ff73 Standard case for API pages 2015-05-01 06:04:23 -07:00
Alex Wolfe bf1a05881d docs dropdown logice 2015-03-01 06:42:36 -08:00
Alex Wolfe 1c4697053f more updates 2015-02-26 06:45:32 -08:00
Alex Wolfe e798b67e6e Logo, hero, nav, social , layout, etc. 2015-02-25 07:15:46 -08:00