Merge branch 'modzeleg' into developer
# Conflicts: # src/main/resources/static/css/font/fontello.eot # src/main/resources/static/css/font/fontello.svg # src/main/resources/static/css/font/fontello.ttf # src/main/resources/static/css/font/fontello.woff # src/main/resources/static/css/font/fontello.woff2 # src/main/resources/static/css/fontello.css # src/main/resources/static/html/mock.html # target/classes/static/css/font/fontello.eot # target/classes/static/css/font/fontello.svg # target/classes/static/css/font/fontello.ttf # target/classes/static/css/font/fontello.woff # target/classes/static/css/font/fontello.woff2 # target/classes/static/css/fontello.css # target/classes/static/html/mock.html
This commit is contained in:
		
							
								
								
									
										
											BIN
										
									
								
								src/main/resources/static/css/font/fontello.eot
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/main/resources/static/css/font/fontello.eot
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										14
									
								
								src/main/resources/static/css/font/fontello.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								src/main/resources/static/css/font/fontello.svg
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | |||||||
|  | <?xml version="1.0" standalone="no"?> | ||||||
|  | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | ||||||
|  | <svg xmlns="http://www.w3.org/2000/svg"> | ||||||
|  | <metadata>Copyright (C) 2021 by original authors @ fontello.com</metadata> | ||||||
|  | <defs> | ||||||
|  | <font id="fontello" horiz-adv-x="1000" > | ||||||
|  | <font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" /> | ||||||
|  | <missing-glyph horiz-adv-x="1000" /> | ||||||
|  | <glyph glyph-name="plus" unicode="" d="M786 439v-107q0-22-16-38t-38-15h-232v-233q0-22-16-37t-38-16h-107q-22 0-38 16t-15 37v233h-232q-23 0-38 15t-16 38v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q23 0 38-16t16-38z" horiz-adv-x="785.7" /> | ||||||
|  |  | ||||||
|  | <glyph glyph-name="cancel" unicode="" d="M724 112q0-22-15-38l-76-76q-16-15-38-15t-38 15l-164 165-164-165q-16-15-38-15t-38 15l-76 76q-16 16-16 38t16 38l164 164-164 164q-16 16-16 38t16 38l76 76q16 16 38 16t38-16l164-164 164 164q16 16 38 16t38-16l76-76q15-15 15-38t-15-38l-164-164 164-164q15-15 15-38z" horiz-adv-x="785.7" /> | ||||||
|  | </font> | ||||||
|  | </defs> | ||||||
|  | </svg> | ||||||
| After Width: | Height: | Size: 1.1 KiB | 
							
								
								
									
										
											BIN
										
									
								
								src/main/resources/static/css/font/fontello.ttf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/main/resources/static/css/font/fontello.ttf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								src/main/resources/static/css/font/fontello.woff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/main/resources/static/css/font/fontello.woff
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								src/main/resources/static/css/font/fontello.woff2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/main/resources/static/css/font/fontello.woff2
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										59
									
								
								src/main/resources/static/css/fontello.css
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										59
									
								
								src/main/resources/static/css/fontello.css
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,59 @@ | |||||||
|  | @font-face { | ||||||
|  |     font-family: 'fontello'; | ||||||
|  |     src: url('font/fontello.eot?49304387'); | ||||||
|  |     src: url('font/fontello.eot?49304387#iefix') format('embedded-opentype'), | ||||||
|  |          url('font/fontello.woff2?49304387') format('woff2'), | ||||||
|  |          url('font/fontello.woff?49304387') format('woff'), | ||||||
|  |          url('font/fontello.ttf?49304387') format('truetype'), | ||||||
|  |          url('font/fontello.svg?49304387#fontello') format('svg'); | ||||||
|  |     font-weight: normal; | ||||||
|  |     font-style: normal; | ||||||
|  |   } | ||||||
|  |   /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ | ||||||
|  |   /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ | ||||||
|  |   /* | ||||||
|  |   @media screen and (-webkit-min-device-pixel-ratio:0) { | ||||||
|  |     @font-face { | ||||||
|  |       font-family: 'fontello'; | ||||||
|  |       src: url('../font/fontello.svg?49304387#fontello') format('svg'); | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  |   */ | ||||||
|  |     | ||||||
|  |    [class^="icon-"]:before, [class*=" icon-"]:before { | ||||||
|  |     font-family: "fontello"; | ||||||
|  |     font-style: normal; | ||||||
|  |     font-weight: normal; | ||||||
|  |     speak: never; | ||||||
|  |     | ||||||
|  |     display: inline-block; | ||||||
|  |     text-decoration: inherit; | ||||||
|  |     width: 1em; | ||||||
|  |     margin-right: .2em; | ||||||
|  |     text-align: center; | ||||||
|  |     /* opacity: .8; */ | ||||||
|  |     | ||||||
|  |     /* For safety - reset parent styles, that can break glyph codes*/ | ||||||
|  |     font-variant: normal; | ||||||
|  |     text-transform: none; | ||||||
|  |     | ||||||
|  |     /* fix buttons height, for twitter bootstrap */ | ||||||
|  |     line-height: 1em; | ||||||
|  |     | ||||||
|  |     /* Animation center compensation - margins should be symmetric */ | ||||||
|  |     /* remove if not needed */ | ||||||
|  |     margin-left: .2em; | ||||||
|  |     | ||||||
|  |     /* you can be more comfortable with increased icons size */ | ||||||
|  |     /* font-size: 120%; */ | ||||||
|  |     | ||||||
|  |     /* Font smoothing. That was taken from TWBS */ | ||||||
|  |     -webkit-font-smoothing: antialiased; | ||||||
|  |     -moz-osx-font-smoothing: grayscale; | ||||||
|  |     | ||||||
|  |     /* Uncomment for 3D effect */ | ||||||
|  |     /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ | ||||||
|  |   } | ||||||
|  |     | ||||||
|  |   .icon-plus:before { content: '\e801'; } /* '' */ | ||||||
|  |   .icon-cancel:before { content: '\e802'; } /* '' */ | ||||||
| @@ -3,6 +3,7 @@ | |||||||
| <head> | <head> | ||||||
|     <title>R11 MockedServices</title> |     <title>R11 MockedServices</title> | ||||||
|     <meta charset="utf-8"> |     <meta charset="utf-8"> | ||||||
|  |     <link rel="stylesheet" href="css/fontello.css" type="text/css"> | ||||||
|     <link rel="stylesheet" href="http://gordon.zipper.release11.com:8085/common.css" type="text/css"> |     <link rel="stylesheet" href="http://gordon.zipper.release11.com:8085/common.css" type="text/css"> | ||||||
|     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> |     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> | ||||||
| </head> | </head> | ||||||
|   | |||||||
							
								
								
									
										
											BIN
										
									
								
								target/classes/static/css/font/fontello.eot
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								target/classes/static/css/font/fontello.eot
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										14
									
								
								target/classes/static/css/font/fontello.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								target/classes/static/css/font/fontello.svg
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | |||||||
|  | <?xml version="1.0" standalone="no"?> | ||||||
|  | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> | ||||||
|  | <svg xmlns="http://www.w3.org/2000/svg"> | ||||||
|  | <metadata>Copyright (C) 2021 by original authors @ fontello.com</metadata> | ||||||
|  | <defs> | ||||||
|  | <font id="fontello" horiz-adv-x="1000" > | ||||||
|  | <font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" /> | ||||||
|  | <missing-glyph horiz-adv-x="1000" /> | ||||||
|  | <glyph glyph-name="plus" unicode="" d="M786 439v-107q0-22-16-38t-38-15h-232v-233q0-22-16-37t-38-16h-107q-22 0-38 16t-15 37v233h-232q-23 0-38 15t-16 38v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q23 0 38-16t16-38z" horiz-adv-x="785.7" /> | ||||||
|  |  | ||||||
|  | <glyph glyph-name="cancel" unicode="" d="M724 112q0-22-15-38l-76-76q-16-15-38-15t-38 15l-164 165-164-165q-16-15-38-15t-38 15l-76 76q-16 16-16 38t16 38l164 164-164 164q-16 16-16 38t16 38l76 76q16 16 38 16t38-16l164-164 164 164q16 16 38 16t38-16l76-76q15-15 15-38t-15-38l-164-164 164-164q15-15 15-38z" horiz-adv-x="785.7" /> | ||||||
|  | </font> | ||||||
|  | </defs> | ||||||
|  | </svg> | ||||||
| After Width: | Height: | Size: 1.1 KiB | 
							
								
								
									
										
											BIN
										
									
								
								target/classes/static/css/font/fontello.ttf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								target/classes/static/css/font/fontello.ttf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								target/classes/static/css/font/fontello.woff
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								target/classes/static/css/font/fontello.woff
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								target/classes/static/css/font/fontello.woff2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								target/classes/static/css/font/fontello.woff2
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										59
									
								
								target/classes/static/css/fontello.css
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										59
									
								
								target/classes/static/css/fontello.css
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @@ -0,0 +1,59 @@ | |||||||
|  | @font-face { | ||||||
|  |     font-family: 'fontello'; | ||||||
|  |     src: url('font/fontello.eot?49304387'); | ||||||
|  |     src: url('font/fontello.eot?49304387#iefix') format('embedded-opentype'), | ||||||
|  |          url('font/fontello.woff2?49304387') format('woff2'), | ||||||
|  |          url('font/fontello.woff?49304387') format('woff'), | ||||||
|  |          url('font/fontello.ttf?49304387') format('truetype'), | ||||||
|  |          url('font/fontello.svg?49304387#fontello') format('svg'); | ||||||
|  |     font-weight: normal; | ||||||
|  |     font-style: normal; | ||||||
|  |   } | ||||||
|  |   /* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */ | ||||||
|  |   /* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */ | ||||||
|  |   /* | ||||||
|  |   @media screen and (-webkit-min-device-pixel-ratio:0) { | ||||||
|  |     @font-face { | ||||||
|  |       font-family: 'fontello'; | ||||||
|  |       src: url('../font/fontello.svg?49304387#fontello') format('svg'); | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  |   */ | ||||||
|  |     | ||||||
|  |    [class^="icon-"]:before, [class*=" icon-"]:before { | ||||||
|  |     font-family: "fontello"; | ||||||
|  |     font-style: normal; | ||||||
|  |     font-weight: normal; | ||||||
|  |     speak: never; | ||||||
|  |     | ||||||
|  |     display: inline-block; | ||||||
|  |     text-decoration: inherit; | ||||||
|  |     width: 1em; | ||||||
|  |     margin-right: .2em; | ||||||
|  |     text-align: center; | ||||||
|  |     /* opacity: .8; */ | ||||||
|  |     | ||||||
|  |     /* For safety - reset parent styles, that can break glyph codes*/ | ||||||
|  |     font-variant: normal; | ||||||
|  |     text-transform: none; | ||||||
|  |     | ||||||
|  |     /* fix buttons height, for twitter bootstrap */ | ||||||
|  |     line-height: 1em; | ||||||
|  |     | ||||||
|  |     /* Animation center compensation - margins should be symmetric */ | ||||||
|  |     /* remove if not needed */ | ||||||
|  |     margin-left: .2em; | ||||||
|  |     | ||||||
|  |     /* you can be more comfortable with increased icons size */ | ||||||
|  |     /* font-size: 120%; */ | ||||||
|  |     | ||||||
|  |     /* Font smoothing. That was taken from TWBS */ | ||||||
|  |     -webkit-font-smoothing: antialiased; | ||||||
|  |     -moz-osx-font-smoothing: grayscale; | ||||||
|  |     | ||||||
|  |     /* Uncomment for 3D effect */ | ||||||
|  |     /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */ | ||||||
|  |   } | ||||||
|  |     | ||||||
|  |   .icon-plus:before { content: '\e801'; } /* '' */ | ||||||
|  |   .icon-cancel:before { content: '\e802'; } /* '' */ | ||||||
| @@ -3,6 +3,7 @@ | |||||||
| <head> | <head> | ||||||
|     <title>R11 MockedServices</title> |     <title>R11 MockedServices</title> | ||||||
|     <meta charset="utf-8"> |     <meta charset="utf-8"> | ||||||
|  |     <link rel="stylesheet" href="css/fontello.css" type="text/css"> | ||||||
|     <link rel="stylesheet" href="http://gordon.zipper.release11.com:8085/common.css" type="text/css"> |     <link rel="stylesheet" href="http://gordon.zipper.release11.com:8085/common.css" type="text/css"> | ||||||
|     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> |     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> | ||||||
| </head> | </head> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user