[TASK] Replace Roboto font with Assistant font
This commit is contained in:
		
							parent
							
								
									3fd4abbda6
								
							
						
					
					
						commit
						83f457fb75
					
				
							
								
								
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Bold.ttf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Bold.ttf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Bold.woff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Bold.woff
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Bold.woff2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Bold.woff2
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Light.ttf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Light.ttf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Light.woff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Light.woff
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Light.woff2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								assets/fonts/Assistant-Light.woff2
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -14,11 +14,9 @@ | ||||
|     "moment": "~2.13.0", | ||||
|     "requirejs": "~2.2.0", | ||||
|     "tablesort": "https://github.com/tristen/tablesort.git#v4.0.1", | ||||
|     "roboto-slab-fontface-kit": "*", | ||||
|     "es6-shim": "~0.35.1", | ||||
|     "almond": "~0.3.2", | ||||
|     "d3": "~3.5.17", | ||||
|     "roboto-fontface": "~0.5.0", | ||||
|     "virtual-dom": "~2.1.1", | ||||
|     "rbush": "https://github.com/mourner/rbush.git#~1.4.3" | ||||
|   }, | ||||
|  | ||||
| @ -696,12 +696,12 @@ define(["d3", "helper"], function (d3, helper) { | ||||
|         var buffer = document.createElement("canvas"); | ||||
|         var r = window.devicePixelRatio; | ||||
|         var bctx = buffer.getContext("2d"); | ||||
|         bctx.font = "11px Roboto, sans-serif"; | ||||
|         bctx.font = "11px Assistant, sans-serif"; | ||||
|         var width = bctx.measureText(name).width; | ||||
|         var scale = zoomBehavior.scaleExtent()[1] * r; | ||||
|         buffer.width = (width + 2 * lineWidth) * scale; | ||||
|         buffer.height = (16 + 2 * lineWidth) * scale; | ||||
|         bctx.font = "11px Roboto, sans-serif"; | ||||
|         bctx.font = "11px Assistant, sans-serif"; | ||||
|         bctx.scale(scale, scale); | ||||
|         bctx.textBaseline = "middle"; | ||||
|         bctx.textAlign = "center"; | ||||
|  | ||||
| @ -11,7 +11,7 @@ define(["leaflet", "rbush"], | ||||
|       ["center", "ideographic", 2 / 8], | ||||
|       ["right", "ideographic", 3 / 8]]; | ||||
| 
 | ||||
|     var fontFamily = "Roboto, sans-serif"; | ||||
|     var fontFamily = "Assistant, sans-serif"; | ||||
|     var nodeRadius = 4; | ||||
| 
 | ||||
|     var ctx = document.createElement("canvas").getContext("2d"); | ||||
|  | ||||
| @ -8,7 +8,6 @@ | ||||
|   background: transparentize($color-black, .98); | ||||
|   display: flex; | ||||
|   display: -webkit-flex; | ||||
|   font-family: $font-family-secondary; | ||||
|   list-style: none; | ||||
|   margin: 0; | ||||
|   padding: 0; | ||||
|  | ||||
| @ -11,8 +11,7 @@ $color-online: #1566a9 !default; | ||||
| $color-offline: #cf3e2a !default; | ||||
| $color-unseen: #d89100 !default; | ||||
| 
 | ||||
| $font-family: 'Roboto Slab', serif !default; | ||||
| $font-family-secondary: Roboto, sans-serif !default; | ||||
| $font-family: Assistant, sans-serif !default; | ||||
| $font-family-icons: ionicons !default; | ||||
| $font-family-monospace: monospace !default; | ||||
| $font-size: 15px !default; | ||||
|  | ||||
| @ -1,7 +1,6 @@ | ||||
| $font-path: 'fonts'; | ||||
| 
 | ||||
| @if $use-included-font == 1 { | ||||
|   @include load-font('Roboto', 'Regular', 400, normal); | ||||
|   @include load-font('RobotoSlab', 'Regular', 400, normal, 'Roboto Slab'); | ||||
|   @include load-font('RobotoSlab', 'Bold', 700, normal, 'Roboto Slab'); | ||||
|   @include load-font('Assistant', 'Light', 300, normal); | ||||
|   @include load-font('Assistant', 'Bold', 700, normal); | ||||
| } | ||||
|  | ||||
| @ -23,28 +23,17 @@ module.exports = function (grunt) { | ||||
|         cwd: ".", | ||||
|         dest: "build/" | ||||
|       }, | ||||
|       robotoSlab: { | ||||
|         src: ["**/*-Regular.*", | ||||
|           "**/*-Bold.*" | ||||
|         ], | ||||
|         expand: true, | ||||
|         dest: "build/fonts/", | ||||
|         filter: "isFile", | ||||
|         flatten: true, | ||||
|         cwd: "bower_components/roboto-slab-fontface-kit/fonts" | ||||
|       }, | ||||
|       roboto: { | ||||
|         src: ["fonts/*-Regular.*" | ||||
|         ], | ||||
|         expand: true, | ||||
|         dest: "build/", | ||||
|         cwd: "bower_components/roboto-fontface" | ||||
|       }, | ||||
|       ionicons: { | ||||
|         src: ["fonts/*"], | ||||
|         expand: true, | ||||
|         dest: "build/", | ||||
|         cwd: "assets/icons/" | ||||
|       }, | ||||
|       assistantFont: { | ||||
|         src: ["fonts/*"], | ||||
|         expand: true, | ||||
|         dest: "build/", | ||||
|         cwd: "assets/" | ||||
|       } | ||||
|     }, | ||||
|     sass: { | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user