Use local Open Sans font in development
This commit is contained in:
		
							parent
							
								
									dded4cbafc
								
							
						
					
					
						commit
						6f75795a6e
					
				
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							@ -27,7 +27,7 @@ dist:
 | 
			
		||||
	# Compressing CSS
 | 
			
		||||
	cat app/index.html \
 | 
			
		||||
		| grep stylesheet \
 | 
			
		||||
		| grep -v http \
 | 
			
		||||
		| grep -v opensans \
 | 
			
		||||
		| cut -d '"' -f 4 \
 | 
			
		||||
		| sed -e 's/^/app/' \
 | 
			
		||||
		| xargs cat \
 | 
			
		||||
@ -37,7 +37,7 @@ dist:
 | 
			
		||||
	# Replacing all script tags with a single one
 | 
			
		||||
	cat app/index.html \
 | 
			
		||||
		| perl -pe 's/<link.*>\n/STYLE_TAG/g' \
 | 
			
		||||
		| perl -pe 's/(STYLE_TAG\s*)+/<link rel="stylesheet" href="\/app.css">\n    /g' \
 | 
			
		||||
		| perl -pe 's/(STYLE_TAG\s*)+/<link rel="stylesheet" href="\/app.css">\n        <link rel="stylesheet" href="http:\/\/fonts.googleapis.com\/css?family=Open\+Sans:400,300,600">\n    /g' \
 | 
			
		||||
		| perl -pe 's/<script.*>\n/SCRIPT_TAG/g' \
 | 
			
		||||
		| perl -pe 's/(SCRIPT_TAG\s*)+/<script type="text\/javascript" src="\/app.js"><\/script>\n/g' \
 | 
			
		||||
		> build/index.html
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										21
									
								
								app/css/opensans.css
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								app/css/opensans.css
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@ -13,7 +13,7 @@
 | 
			
		||||
        <link rel="stylesheet" href="/css/menu.css">
 | 
			
		||||
        <link rel="stylesheet" href="/css/app.css">
 | 
			
		||||
        <link rel="stylesheet" href="/css/charts.css">
 | 
			
		||||
        <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Open+Sans:400,300,600">
 | 
			
		||||
        <link rel="stylesheet" href="/css/opensans.css">
 | 
			
		||||
    </head>
 | 
			
		||||
    <body></body>
 | 
			
		||||
    <script src="/bower_components/react/react.js"></script>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user