Commit Graph

264 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
Alex Wolfe 5732b07423 Upgrade swiftype to 2.0 library and added a results page for searches 2016-10-12 10:01:19 -07:00
Alex Wolfe 5096dd8e37 Refactor of api filter page to include statues, types, queries 2016-10-07 13:44:39 -07:00
Alex Wolfe b88b25a21c update symbold for type alias 2016-10-07 13:44:39 -07: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 dca47cbb1a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/_examples/quickstart/ts/package.1.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/upgrade.jade
2016-10-02 10:39:25 +08:00
Alex Wolfe c8a6c229cd Merge pull request #2473 from arikrak/master
Change banner height to min-height
2016-09-30 14:51:02 -07:00
John Papa 2b7fb86890 docs(style-guide): remove rc relics and update for ngmodules (#2463) 2016-09-27 00:58:10 -07:00
Ariel 16c05fde74 Change banner height to min-height 2016-09-24 21:51:40 -04:00
rexebin a59b1b60ee Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/testing.jade
2016-09-23 23:22:42 +01:00
rexebin d9af771f8d Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/_includes/_ts-temp.jade
#	public/docs/index.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/pipes.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/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/support.jade
2016-09-23 22:13:02 +01:00
Alex Wolfe 4bb79953be Merge pull request #2075 from jackmu95/fix-styleguide-trigger-positioning
fix(footer): Improve styleguide trigger positioning
2016-09-23 11:09:17 -07:00
Jacob Müller 8d713f1574 Use solid color and transition to red color on hover 2016-09-23 19:44:14 +02:00
Jacob Müller c8b2c39409 Align footer text left on desktop 2016-09-23 08:58:06 +02:00
Alex Wolfe 37cebe9746 Merge pull request #2272 from LayZeeDK/patch-1
fix(footer): Footer logo is overflowing
2016-09-22 21:19:20 -07:00
Eric Jimenez af4dabb413 only apply transparency changes on mobile 2016-09-21 11:56:19 -04:00
Jacob Müller 9a338b659e Some more cleanup 2016-09-21 16:11:12 +02:00
Jacob Müller 8a4a80033e Fix up styles after sync 2016-09-21 15:32:11 +02:00
Eric Jimenez 5a203d6b36 boost transparency of sidenav 2016-09-20 20:54:39 -04:00
Zhicheng Wang ba3152bb88 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/guide/style-guide.jade
2016-09-17 12:01:41 +08:00
Alex Wolfe 7c3c5d0cc4 fixed weird opacity issue 2016-09-16 16:39:22 -07:00
Alex Wolfe 9fc14a95a8 some touches to banner and api docs 2016-09-16 16:28:41 -07:00
Alex Wolfe e2ec60d8dd udpate colors and contrast for accessibility improvements 2016-09-16 15:58:20 -07:00
Alex Wolfe a0dbeee18a banner(scrolling): add scrolling to the banner 2016-09-16 15:58:20 -07:00
Alex Wolfe f4c4aee706 initial commit for rotating announcement banner 2016-09-16 15:58:20 -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 72be55c4d2 chore: more typograhpical fixes (#2352) 2016-09-15 02:35:03 +01:00
Alex Wolfe 802bee8d2f fixed headings in api pages 2016-09-14 18:20:48 -07:00
Alex Wolfe 65db6b9268 design(style): Restyle changes from Alex 2016-09-14 17:18:55 -07:00
Zhicheng Wang 3d40a26655 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/quickstart.jade
2016-09-11 21:20:58 +08:00
Peter Bacon Darwin a2089c5b4f api-builder: render pipes with specialised template 2016-09-09 14:44:46 -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
Lars Gyrup Brink Nielsen 6c2ec829e5 Fixed footer logo overflowing
Footer logo was overflowing at ~960px wide viewport. Added `background-size: contain` (shorthand), and `max-width: 100%` to contain wrapper, and background image within grid.
2016-09-06 21:54:23 +02:00
John Papa 58a787a34d green = do (#2257)
blue = consider
red = avoid
light gray = why
2016-09-02 16:41:08 -07:00
Jesús Rodríguez 5b8df3494a chore: add embedded plunkers functionality (#2194) 2016-08-25 10:44:22 -07:00
Zhicheng Wang 4400deeef8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	gulpfile.js
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/resources/js/controllers/resources-controller.js
2016-07-24 17:27:48 +08:00
Zhicheng Wang c3b68a6c1b 采纳了几个来自社区的意见 2016-07-22 20:51:32 +08:00
Eric Jimenez 8c1bbbf318 chore: alphabetize entries in resources page. Add margin under frontpage banner 2016-07-19 09:52:25 -07:00
Zhicheng Wang 0dd2932a2e Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/news.jade
#	public/resources/_data.json
#	public/resources/index.ejs
#	public/resources/js/controllers/resources-controller.js
2016-07-01 08:38:54 +08:00
Eric Jimenez 868abbe5c7 new style with new schema 2016-06-30 12:36:14 -04:00
Eric Jimenez 4a5f074061 add placeholder text when no description is found 2016-06-30 12:28:39 -04:00
Zhicheng Wang 7202fa6cb4 bugfix: 自动加空格时没有忽略html标签,导致界面混乱 2016-06-19 19:31:02 +08:00
Zhicheng Wang 80a044fa7c 直接加空格方式效果不理想,改用js和css配合来加空格 2016-06-19 16:46:50 +08:00
Zhicheng Wang 20bf6c0085 翻译完了“升级”一章的新增部分
合并了测试索引
解决了移动设备上菜单显示不全的问题
文字微调
2016-05-31 12:35:37 +08:00
Zhicheng Wang 3c666d881e 修改了输入法笔误
解决了移动设备上菜单显示不全的问题
2016-05-31 07:30:15 +08:00
Zhimin YE (Rex) 7ea5c39a47 removed () from english words in display-data.jade.
user-input.jade: review is completed.
_translate.scss: added selector for code within text - to change their font-family for chinese font.
2016-05-27 14:48:06 +01:00
Zhicheng Wang 94243b9b52 更新了字体,适应更多设备 2016-05-27 17:43:49 +08:00
Zhimin YE (Rex) 7c6bf77fa0 Merge branch 'master' of https://github.com/angular/angular-cn 2016-05-27 10:42:03 +01:00
Zhimin YE (Rex) 4f3050aeed more review for displaying-data and appended english font-family. 2016-05-27 10:41:49 +01:00
Zhicheng Wang 88a86ff4a0 开发指南-管道 初译即将完成 2016-05-27 17:40:58 +08:00