mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-31 03:10:07 +00:00 
			
		
		
		
	minor fixes + added Work Sans font... (still experimenting)
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									6da746012d
								
							
						
					
					
						commit
						78d484da8b
					
				| @ -2519,13 +2519,13 @@ module.ImageStateIndicator = core.ImageGridFeatures.Feature({ | |||||||
| 				// make/get indicator containers...
 | 				// make/get indicator containers...
 | ||||||
| 				var image = this.ribbons.viewer.find('.state-indicator-container.image-info') | 				var image = this.ribbons.viewer.find('.state-indicator-container.image-info') | ||||||
| 				if(image.length == 0){ | 				if(image.length == 0){ | ||||||
| 					image = makeStateIndicator('.image-info')  | 					image = makeStateIndicator('image-info')  | ||||||
| 						.appendTo(this.ribbons.viewer) | 						.appendTo(this.ribbons.viewer) | ||||||
| 				} | 				} | ||||||
| 
 | 
 | ||||||
| 				var global = this.ribbons.viewer.find('.state-indicator-container.global-info') | 				var global = this.ribbons.viewer.find('.state-indicator-container.global-info') | ||||||
| 				if(global.length == 0){ | 				if(global.length == 0){ | ||||||
| 					global = makeStateIndicator('.global-info')  | 					global = makeStateIndicator('global-info')  | ||||||
| 						.appendTo(this.ribbons.viewer) | 						.appendTo(this.ribbons.viewer) | ||||||
| 				} | 				} | ||||||
| 
 | 
 | ||||||
|  | |||||||
							
								
								
									
										92
									
								
								ui (gen4)/fonts/Work_Sans/OFL.txt
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										92
									
								
								ui (gen4)/fonts/Work_Sans/OFL.txt
									
									
									
									
									
										Executable file
									
								
							| @ -0,0 +1,92 @@ | |||||||
|  | Copyright (c) 2014-2015 Wei Huang (wweeiihhuuaanngg@gmail.com) | ||||||
|  | This Font Software is licensed under the SIL Open Font License, Version 1.1. | ||||||
|  | This license is copied below, and is also available with a FAQ at: | ||||||
|  | http://scripts.sil.org/OFL | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | ----------------------------------------------------------- | ||||||
|  | SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 | ||||||
|  | ----------------------------------------------------------- | ||||||
|  | 
 | ||||||
|  | PREAMBLE | ||||||
|  | The goals of the Open Font License (OFL) are to stimulate worldwide | ||||||
|  | development of collaborative font projects, to support the font creation | ||||||
|  | efforts of academic and linguistic communities, and to provide a free and | ||||||
|  | open framework in which fonts may be shared and improved in partnership | ||||||
|  | with others. | ||||||
|  | 
 | ||||||
|  | The OFL allows the licensed fonts to be used, studied, modified and | ||||||
|  | redistributed freely as long as they are not sold by themselves. The | ||||||
|  | fonts, including any derivative works, can be bundled, embedded,  | ||||||
|  | redistributed and/or sold with any software provided that any reserved | ||||||
|  | names are not used by derivative works. The fonts and derivatives, | ||||||
|  | however, cannot be released under any other type of license. The | ||||||
|  | requirement for fonts to remain under this license does not apply | ||||||
|  | to any document created using the fonts or their derivatives. | ||||||
|  | 
 | ||||||
|  | DEFINITIONS | ||||||
|  | "Font Software" refers to the set of files released by the Copyright | ||||||
|  | Holder(s) under this license and clearly marked as such. This may | ||||||
|  | include source files, build scripts and documentation. | ||||||
|  | 
 | ||||||
|  | "Reserved Font Name" refers to any names specified as such after the | ||||||
|  | copyright statement(s). | ||||||
|  | 
 | ||||||
|  | "Original Version" refers to the collection of Font Software components as | ||||||
|  | distributed by the Copyright Holder(s). | ||||||
|  | 
 | ||||||
|  | "Modified Version" refers to any derivative made by adding to, deleting, | ||||||
|  | or substituting -- in part or in whole -- any of the components of the | ||||||
|  | Original Version, by changing formats or by porting the Font Software to a | ||||||
|  | new environment. | ||||||
|  | 
 | ||||||
|  | "Author" refers to any designer, engineer, programmer, technical | ||||||
|  | writer or other person who contributed to the Font Software. | ||||||
|  | 
 | ||||||
|  | PERMISSION & CONDITIONS | ||||||
|  | Permission is hereby granted, free of charge, to any person obtaining | ||||||
|  | a copy of the Font Software, to use, study, copy, merge, embed, modify, | ||||||
|  | redistribute, and sell modified and unmodified copies of the Font | ||||||
|  | Software, subject to the following conditions: | ||||||
|  | 
 | ||||||
|  | 1) Neither the Font Software nor any of its individual components, | ||||||
|  | in Original or Modified Versions, may be sold by itself. | ||||||
|  | 
 | ||||||
|  | 2) Original or Modified Versions of the Font Software may be bundled, | ||||||
|  | redistributed and/or sold with any software, provided that each copy | ||||||
|  | contains the above copyright notice and this license. These can be | ||||||
|  | included either as stand-alone text files, human-readable headers or | ||||||
|  | in the appropriate machine-readable metadata fields within text or | ||||||
|  | binary files as long as those fields can be easily viewed by the user. | ||||||
|  | 
 | ||||||
|  | 3) No Modified Version of the Font Software may use the Reserved Font | ||||||
|  | Name(s) unless explicit written permission is granted by the corresponding | ||||||
|  | Copyright Holder. This restriction only applies to the primary font name as | ||||||
|  | presented to the users. | ||||||
|  | 
 | ||||||
|  | 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font | ||||||
|  | Software shall not be used to promote, endorse or advertise any | ||||||
|  | Modified Version, except to acknowledge the contribution(s) of the | ||||||
|  | Copyright Holder(s) and the Author(s) or with their explicit written | ||||||
|  | permission. | ||||||
|  | 
 | ||||||
|  | 5) The Font Software, modified or unmodified, in part or in whole, | ||||||
|  | must be distributed entirely under this license, and must not be | ||||||
|  | distributed under any other license. The requirement for fonts to | ||||||
|  | remain under this license does not apply to any document created | ||||||
|  | using the Font Software. | ||||||
|  | 
 | ||||||
|  | TERMINATION | ||||||
|  | This license becomes null and void if any of the above conditions are | ||||||
|  | not met. | ||||||
|  | 
 | ||||||
|  | DISCLAIMER | ||||||
|  | THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||||||
|  | EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF | ||||||
|  | MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT | ||||||
|  | OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE | ||||||
|  | COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||||||
|  | INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL | ||||||
|  | DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||||||
|  | FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM | ||||||
|  | OTHER DEALINGS IN THE FONT SOFTWARE. | ||||||
							
								
								
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Black.ttf
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Black.ttf
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Bold.ttf
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Bold.ttf
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-ExtraBold.ttf
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-ExtraBold.ttf
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-ExtraLight.ttf
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-ExtraLight.ttf
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Light.ttf
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Light.ttf
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Medium.ttf
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Medium.ttf
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Regular.ttf
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Regular.ttf
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-SemiBold.ttf
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-SemiBold.ttf
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Thin.ttf
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								ui (gen4)/fonts/Work_Sans/WorkSans-Thin.ttf
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -61,6 +61,57 @@ | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | /* Work Sans  | ||||||
|  | *	 | ||||||
|  | */ | ||||||
|  | @font-face { | ||||||
|  | 	font-family: WorkSans; | ||||||
|  | 	src: url(fonts/Work_Sans/WorkSans-Thin.ttf); | ||||||
|  | 	font-weight: 100; | ||||||
|  | } | ||||||
|  | @font-face { | ||||||
|  | 	font-family: WorkSans; | ||||||
|  | 	src: url(fonts/Work_Sans/WorkSans-ExtraLight.ttf); | ||||||
|  | 	font-weight: 200; | ||||||
|  | } | ||||||
|  | @font-face { | ||||||
|  | 	font-family: WorkSans; | ||||||
|  | 	src: url(fonts/Work_Sans/WorkSans-Light.ttf); | ||||||
|  | 	font-weight: 300; | ||||||
|  | } | ||||||
|  | @font-face { | ||||||
|  | 	font-family: WorkSans; | ||||||
|  | 	src: url(fonts/Work_Sans/WorkSans-Regular.ttf); | ||||||
|  | 	font-weight: 400; | ||||||
|  | } | ||||||
|  | @font-face { | ||||||
|  | 	font-family: WorkSans; | ||||||
|  | 	src: url(fonts/Work_Sans/WorkSans-Medium.ttf); | ||||||
|  | 	font-weight: 500; | ||||||
|  | } | ||||||
|  | @font-face { | ||||||
|  | 	font-family: WorkSans; | ||||||
|  | 	src: url(fonts/Work_Sans/WorkSans-SemiBold.ttf); | ||||||
|  | 	font-weight: 600; | ||||||
|  | } | ||||||
|  | @font-face { | ||||||
|  | 	font-family: WorkSans; | ||||||
|  | 	src: url(fonts/Work_Sans/WorkSans-Bold.ttf); | ||||||
|  | 	font-weight: 700; | ||||||
|  | } | ||||||
|  | @font-face { | ||||||
|  | 	font-family: WorkSans; | ||||||
|  | 	src: url(fonts/Work_Sans/WorkSans-ExtraBold.ttf); | ||||||
|  | 	font-weight: 800; | ||||||
|  | } | ||||||
|  | @font-face { | ||||||
|  | 	font-family: WorkSans; | ||||||
|  | 	src: url(fonts/Work_Sans/WorkSans-Black.ttf); | ||||||
|  | 	font-weight: 900; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
| /* Source Sans Pro */ | /* Source Sans Pro */ | ||||||
| /* | /* | ||||||
| @font-face { | @font-face { | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user