Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							89060a39df 
							
						 
					 
					
						
						
							
							fix: 不正常的中英文段落合并  
						
						
						
						
					 
					
						2018-02-28 13:44:53 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c08a3830df 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'en/master' into aio  
						
						... 
						
						
						
						# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/change-log.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/deployment.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/http.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule.md
#	aio/content/guide/pipes.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/security.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/upgrade.md
#	aio/content/marketing/docs.md
#	aio/content/marketing/features.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts 
						
						
					 
					
						2018-02-28 13:13:29 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1531b0610d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'en/master' into aio  
						
						... 
						
						
						
						# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/pipes.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/index.html
#	aio/content/navigation.json
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/src/app/embedded/api/api-list.component.ts
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/footer/footer.component.html
#	aio/src/app/layout/toc/toc.component.html
#	aio/src/app/search/search.service.ts
#	aio/src/styles/1-layouts/_marketing-layout.scss
#	aio/yarn.lock 
						
						
					 
					
						2018-02-28 08:08:59 +08:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							a4f9e8180b 
							
						 
					 
					
						
						
							
							docs: edit styleguide recommendation on components as elements ( #22074 )  
						
						... 
						
						
						
						Change recommendation on using attributes for components since there are use cases including the use of <button mat-button> in MD
Closes  #19401 .
PR Close  #22074  
						
						
					 
					
						2018-02-22 11:20:21 -08:00 
						 
				 
			
				
					
						
							
							
								Fabian Wiles 
							
						 
					 
					
						
						
						
						
							
						
						
							c8a1a14b87 
							
						 
					 
					
						
						
							
							docs: clarify the use of classes and interfaces in style guide ( #20919 )  
						
						... 
						
						
						
						PR Close  #20919  
						
						
					 
					
						2018-01-18 18:22:55 -06:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0247cddf5e 
							
						 
					 
					
						
						
							
							fix: 文字微调  
						
						
						
						
					 
					
						2017-10-19 17:53:27 +08:00 
						 
				 
			
				
					
						
							
							
								Shai Reznik 
							
						 
					 
					
						
						
						
						
							
						
						
							fcfb1544e8 
							
						 
					 
					
						
						
							
							docs(aio): changed confusing term ( #19762 )  
						
						... 
						
						
						
						Controller should be decorator I believe
PR Close  #19762  
						
						
					 
					
						2017-10-18 11:18:26 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d5cc9b4bd5 
							
						 
					 
					
						
						
							
							fix: minor improvement  
						
						
						
						
					 
					
						2017-08-26 17:59:07 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6545c5a21c 
							
						 
					 
					
						
						
							
							fix: minor improvement  
						
						
						
						
					 
					
						2017-08-26 17:55:21 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6d88fa2342 
							
						 
					 
					
						
						
							
							fix: all "back to top" links  
						
						
						
						
					 
					
						2017-07-30 22:18:19 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4a4b009662 
							
						 
					 
					
						
						
							
							fix: typo  
						
						
						
						
					 
					
						2017-07-30 17:13:46 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f2059b445c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'en/master' into aio  
						
						... 
						
						
						
						# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cb-index.md
#	aio/content/guide/change-log.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-quickstart.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/index.md
#	aio/content/guide/learning-angular.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/pipes.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/security.md
#	aio/content/guide/server-communication.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/ts-to-js.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/webpack.md
#	aio/content/navigation.json
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/styles/main.scss
#	aio/transforms/angular.io-package/index.js 
						
						
					 
					
						2017-07-30 00:09:50 +08:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							e110a80caf 
							
						 
					 
					
						
						
							
							docs(aio): change Angular Module to NgModule ( #16964 )  
						
						
						
						
					 
					
						2017-07-11 15:05:20 -07:00 
						 
				 
			
				
					
						
							
							
								Victor Berchet 
							
						 
					 
					
						
						
						
						
							
						
						
							c723d42d0a 
							
						 
					 
					
						
						
							
							refactor: fix typos ( #18000 )  
						
						
						
						
					 
					
						2017-07-07 16:55:17 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							cd5bc64658 
							
						 
					 
					
						
						
							
							docs(aio): update headers for toc ( #16969 )  
						
						
						
						
					 
					
						2017-05-26 13:28:06 -06:00 
						 
				 
			
				
					
						
							
							
								Jesus Rodriguez 
							
						 
					 
					
						
						
						
						
							
						
						
							b016984c04 
							
						 
					 
					
						
						
							
							docs(aio): resize images  
						
						
						
						
					 
					
						2017-05-12 14:28:09 +01:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							954c08e97c 
							
						 
					 
					
						
						
							
							fix(aio): remove unwanted code styling from styleguide doc  
						
						... 
						
						
						
						Closes  #16514  
					
						2017-05-10 07:49:03 +01:00 
						 
				 
			
				
					
						
							
							
								Pete Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							9e661e58d1 
							
						 
					 
					
						
						
							
							docs(aio): image sweep ( #16609 )  
						
						... 
						
						
						
						* fix(aio): allow code blocks to clear floated images
Previously the negative margin on the code headings were causing
floated images to overlay the start of a code block. Now all code block
successfully clear all floated elements.
* feat(aio): add a `.clear` class for clearing floating images
* fix(aio): tidy up image styles
The css rules for `img.right` and `img.left` allow authors easy
access to floating an image on the left or right, respectively.
The `.image-display` rule which was always found on a figure
has been simplified so that all figures have this styling. It is very
unlikely that a figure will be used outside the content area; and
at this time it seems like `figure` is as good an indicator that we
want this kind of styling as anything.
Now that images are all tagged with width and height values, we cannot
assume to modify these dimensions via CSS as it can cause the image to
lose its correct proportions.  Until we find a better solition we must set
`height` to `auto` when the screen width is below 1300px to ensure that
these images maintain their proportions as they get shrunk to fit.
* docs(aio): general tidy up of image HTML in guides
Previously, the guides have a lot of inline image styling and unnecessary
use of the `image-display` css class.
Images over 700px are problematic for guide docs, so those have been given
specific widths and associated heights.
* docs(aio): use correct anchor for "back to the top" link
The `#toc` anchor does not work when the page is
wide enough that the TOC is floating to the side.
* build(aio): add `#top-of-page` to path variants for link checking
Since the `#top-of-page` is outside the rendered docs
the `checkAnchorLinks` processor doesn't find them
as valid targets for links.
Adding them as a `pathVariant` solves this problem
but will still catch links to docs that do not actually exist.
* fix(aio): ensure that headings clear floated images
* fix(aio): do not force live-example embedded image to 100% size
This made them look too big, generally. Leaving them with no size means
that they will look reasonable in large viewports and switch to 100% width
in narrow viewports. 
						
						
					 
					
						2017-05-09 15:53:32 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							03610526e5 
							
						 
					 
					
						
						
							
							docs(aio): remove hardcoded TOC  
						
						
						
						
					 
					
						2017-05-04 15:51:37 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							1cfb263ee3 
							
						 
					 
					
						
						
							
							docs(aio): hide the copy button for code in StyleGuide tables.  
						
						
						
						
					 
					
						2017-05-03 13:38:25 -07:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							5ba8c14893 
							
						 
					 
					
						
						
							
							docs(aio): remove unnecessary anchor links from styleguide  
						
						
						
						
					 
					
						2017-05-03 09:21:18 +01:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							249cd8c2ec 
							
						 
					 
					
						
						
							
							docs(aio): remove _blank target ( #16205 )  
						
						
						
						
					 
					
						2017-04-24 11:23:45 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							93516ea8a1 
							
						 
					 
					
						
						
							
							docs(aio): rename cb- files and a few others  
						
						
						
						
					 
					
						2017-04-24 14:00:51 +01:00