mirror of
				https://github.com/richard-loafle/fuse-angular.git
				synced 2025-10-31 20:03:35 +00:00 
			
		
		
		
	Merge branch 'master' into skeleton
This commit is contained in:
		
						commit
						5f127e4721
					
				
							
								
								
									
										66
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										66
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @ -138,9 +138,9 @@ | ||||
|       } | ||||
|     }, | ||||
|     "@angular/animations": { | ||||
|       "version": "6.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.4.tgz", | ||||
|       "integrity": "sha512-R+akCyIneyqJ5wAf9VaymvxbxM4Iw3YsUdylO9rrr9wAUhzmzWhCSGK9bncwL4+d5rbd0n1u+8A8Gm0dZe1P1A==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.6.tgz", | ||||
|       "integrity": "sha512-fK7onQeVsPgUx/sFcBvcGisuIuxvodzATpoKV9SnsQc6xWE5qsvJRZijrzZIN+Hxy/DgsLaVWRCPn1hG75/D2Q==", | ||||
|       "requires": { | ||||
|         "tslib": "^1.9.0" | ||||
|       } | ||||
| @ -189,25 +189,25 @@ | ||||
|       } | ||||
|     }, | ||||
|     "@angular/common": { | ||||
|       "version": "6.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.1.4.tgz", | ||||
|       "integrity": "sha512-vpedSD5Rbuj9kLq9W/aeQBVugplimTJPPeuW/zUXHWVOOOk4Y7KBw5g4JdYw2ocSoY3z+dRl/6fR0JTi9+muaA==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.1.6.tgz", | ||||
|       "integrity": "sha512-aFQcfCB2vFfNqR6/e6R34JjFpIFmF3zqr6Ubti1PJOsRuhITZHG/qRYIYA7mh1KVkkf0VXC56B+8QzYbdGcKOQ==", | ||||
|       "requires": { | ||||
|         "tslib": "^1.9.0" | ||||
|       } | ||||
|     }, | ||||
|     "@angular/compiler": { | ||||
|       "version": "6.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.1.4.tgz", | ||||
|       "integrity": "sha512-HjSK9Jjx6f1jpXy2TALKp2ByAXycZKKD39M9K2g+feTTrpUtd3iDEDLG4S/yok9qs4e1k3L8fxr/qBngQuv23A==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.1.6.tgz", | ||||
|       "integrity": "sha512-Z9Og0DVH5krG/xMhfcRJMr5GF2HzqnG3f6Hr+e6d6FB8oehnCX/w9b34zZfVGUWAydAYj32SpXJLE6fQm/ljzA==", | ||||
|       "requires": { | ||||
|         "tslib": "^1.9.0" | ||||
|       } | ||||
|     }, | ||||
|     "@angular/compiler-cli": { | ||||
|       "version": "6.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.1.4.tgz", | ||||
|       "integrity": "sha512-ueTe5THcPIKjXOb1+LvqEqh35QPihEGObvJIpudMTqkJHguOr2WXKbbgxzF8QWuIBhOHR9fjtaSgNY5Kk2mfTg==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.1.6.tgz", | ||||
|       "integrity": "sha512-CvgQXuuUJDfmCwnuhZec41aMAiY7nJMSMJxvZWNbFLRiwq+05LiHc7EJYDc6uVQmddWmSqGwfyghjVaiaKJGMg==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "chokidar": "^1.4.2", | ||||
| @ -350,9 +350,9 @@ | ||||
|       } | ||||
|     }, | ||||
|     "@angular/core": { | ||||
|       "version": "6.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.1.4.tgz", | ||||
|       "integrity": "sha512-8r2LpD4MR0hAYjWkElD/I6iXcugMK/HrpdtopDlRcxW2f6XuMN4mu8eS3g2fu72PwdGhtMcqDDFlbeJ8k599lw==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.1.6.tgz", | ||||
|       "integrity": "sha512-RFkxNDq8iIfO1SaOuUYqOGD/pujMqifJ9FeVg8M2v7ucW01coXAG0IwqUEMMShQj3GGJGHj+F9BNswN7aD2uvw==", | ||||
|       "requires": { | ||||
|         "tslib": "^1.9.0" | ||||
|       } | ||||
| @ -366,25 +366,25 @@ | ||||
|       } | ||||
|     }, | ||||
|     "@angular/forms": { | ||||
|       "version": "6.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.1.4.tgz", | ||||
|       "integrity": "sha512-O/rYF36zM15fbXPv4Tj7NlYiCazko6+Eb4o9Ls0nJXMOxt8pRwdYjgGMaOtYprtbH89YlnmJU/gav5Z58JG7sw==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.1.6.tgz", | ||||
|       "integrity": "sha512-6ddk8bhsEtSONctj9PUrEJnTTRL1xHCULaxo2N4GQh5XyV8ScRM0ewOTLcpoL0IU4lgtQmU0VsLWdQvKr3g3Ng==", | ||||
|       "requires": { | ||||
|         "tslib": "^1.9.0" | ||||
|       } | ||||
|     }, | ||||
|     "@angular/http": { | ||||
|       "version": "6.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.1.4.tgz", | ||||
|       "integrity": "sha512-HD3+ouMAqsgA6hFUS8AQDVlZTbkuNuyomGY1I85IpqXmO7GneszN6y5xIf8XO5ke4UYgvk5UhRrKJ9UG9VtUOw==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.1.6.tgz", | ||||
|       "integrity": "sha512-V4qF68tUSsc3cKvQERJmpfXgZSKgxhb67I2jAfmwU9mEH66wh9FNfZ0b0GPV9hXoCulw3POz4ZUwZZ1E6mLy4A==", | ||||
|       "requires": { | ||||
|         "tslib": "^1.9.0" | ||||
|       } | ||||
|     }, | ||||
|     "@angular/language-service": { | ||||
|       "version": "6.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.1.4.tgz", | ||||
|       "integrity": "sha512-kvnAphJ7VrKJpm1gN3sFjGp/5gQxu/FAw03yD1f1z+C+aHrNKoxaS9pp9NdOIT/DWlxR/BcEDF4gzMNMTJ9/wA==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.1.6.tgz", | ||||
|       "integrity": "sha512-EEtM6mJtiEgmmm3VjzJxv5BavvonaBFtBrPUcevIW851DtIqn4CS8yDcLcGFiSvSLtAYxRX8dkacPv9vvM1Khg==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "@angular/material": { | ||||
| @ -405,25 +405,25 @@ | ||||
|       } | ||||
|     }, | ||||
|     "@angular/platform-browser": { | ||||
|       "version": "6.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.1.4.tgz", | ||||
|       "integrity": "sha512-46UPtC360+3E4eeOQk45qp+r+d0Qnsujyot+XtVKQmTSHTInDlwfIGA9TBTw8GyAs3O65i80LRkDHFz9BM2pmw==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.1.6.tgz", | ||||
|       "integrity": "sha512-fwI/w+MhdolVJEfdoCSZFarQo+SctG1pNa+V3PxMkXhxnAbv7oWPQdxzdCrhTWdxJTJ5enSfumMmlJEZtg1bag==", | ||||
|       "requires": { | ||||
|         "tslib": "^1.9.0" | ||||
|       } | ||||
|     }, | ||||
|     "@angular/platform-browser-dynamic": { | ||||
|       "version": "6.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.4.tgz", | ||||
|       "integrity": "sha512-a/WVCsAa0qdtLNuK6h8q+nwtXmJqOlc+dJrBK3vz1umhc80nFZeaUPMTnkRwphk6WVE8xHvjb41PZsI8jF9CBQ==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.6.tgz", | ||||
|       "integrity": "sha512-Ep4vq2ssb1r8XOAw7dJW530vzFKKVY5fj0CYp7VMPfDkwYolEG4TBKQ/ouJkF8n/jdDVFP73+MzU1TLa9/lMQQ==", | ||||
|       "requires": { | ||||
|         "tslib": "^1.9.0" | ||||
|       } | ||||
|     }, | ||||
|     "@angular/router": { | ||||
|       "version": "6.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.1.4.tgz", | ||||
|       "integrity": "sha512-ANdJmpPkr4BMW3/ixJ/qSbsQk4CwR3BPDJp3Iua/xLy7i+9h0bcs11Lpdyo5U3esPYpcpc6TE3ofptyD6xpyGg==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.1.6.tgz", | ||||
|       "integrity": "sha512-fOFeOe3uBrSRUYhXdWxHjDPf80eq3ZNCeWfujzfBADtcmiezlO7cxc1v5Eu81t577frU/3z+w8JvmF257p4RZg==", | ||||
|       "requires": { | ||||
|         "tslib": "^1.9.0" | ||||
|       } | ||||
|  | ||||
							
								
								
									
										22
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										22
									
								
								package.json
									
									
									
									
									
								
							| @ -19,19 +19,19 @@ | ||||
|   "private": true, | ||||
|   "dependencies": { | ||||
|     "@agm/core": "1.0.0-beta.3", | ||||
|     "@angular/animations": "6.1.4", | ||||
|     "@angular/animations": "6.1.6", | ||||
|     "@angular/cdk": "6.4.6", | ||||
|     "@angular/common": "6.1.4", | ||||
|     "@angular/compiler": "6.1.4", | ||||
|     "@angular/core": "6.1.4", | ||||
|     "@angular/common": "6.1.6", | ||||
|     "@angular/compiler": "6.1.6", | ||||
|     "@angular/core": "6.1.6", | ||||
|     "@angular/flex-layout": "6.0.0-beta.16", | ||||
|     "@angular/forms": "6.1.4", | ||||
|     "@angular/http": "6.1.4", | ||||
|     "@angular/forms": "6.1.6", | ||||
|     "@angular/http": "6.1.6", | ||||
|     "@angular/material": "6.4.6", | ||||
|     "@angular/material-moment-adapter": "6.4.6", | ||||
|     "@angular/platform-browser": "6.1.4", | ||||
|     "@angular/platform-browser-dynamic": "6.1.4", | ||||
|     "@angular/router": "6.1.4", | ||||
|     "@angular/platform-browser": "6.1.6", | ||||
|     "@angular/platform-browser-dynamic": "6.1.6", | ||||
|     "@angular/router": "6.1.6", | ||||
|     "@ngrx/effects": "6.1.0", | ||||
|     "@ngrx/router-store": "6.1.0", | ||||
|     "@ngrx/store": "6.1.0", | ||||
| @ -64,8 +64,8 @@ | ||||
|   }, | ||||
|   "devDependencies": { | ||||
|     "@angular/cli": "6.1.5", | ||||
|     "@angular/compiler-cli": "6.1.4", | ||||
|     "@angular/language-service": "6.1.4", | ||||
|     "@angular/compiler-cli": "6.1.6", | ||||
|     "@angular/language-service": "6.1.6", | ||||
|     "@angular-devkit/build-angular": "0.7.5", | ||||
|     "@angularclass/hmr": "2.1.3", | ||||
|     "@types/jasmine": "2.8.8", | ||||
|  | ||||
| @ -12,8 +12,8 @@ toolbar { | ||||
| 
 | ||||
|     .mat-toolbar { | ||||
|         position: relative; | ||||
|         background: inherit; | ||||
|         color: inherit; | ||||
|         background: inherit !important; | ||||
|         color: inherit !important; | ||||
|     } | ||||
| 
 | ||||
|     .logo { | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user