Merge branch 'master' of https://git.loafle.net/overflow_scanner/app
This commit is contained in:
sunny
commit
660995fef5
|
|
@ -2,6 +2,11 @@ import { Zone } from './Zone';
|
|||
import { Port } from './Port';
|
||||
import { MetaIPType } from '../meta';
|
||||
|
||||
export const defaultOsType = 'UNKNOWN';
|
||||
export const defaultHostType = 'HOST';
|
||||
export const defaultHostVendor = 'UNKNOWN';
|
||||
export const defaultHostModel = 'UNKNOWN';
|
||||
|
||||
export interface Host {
|
||||
metaIPType?: MetaIPType;
|
||||
name?: string;
|
||||
|
|
@ -10,9 +15,9 @@ export interface Host {
|
|||
|
||||
osType?: string;
|
||||
|
||||
deviceType?: string;
|
||||
deviceVendor?: string;
|
||||
deviceModel?: string;
|
||||
hostType?: string;
|
||||
hostVendor?: string;
|
||||
hostModel?: string;
|
||||
|
||||
meta?: Map<string, Map<string, string>>;
|
||||
discoveredBy?: string[];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,20 @@
|
|||
import { Port } from './Port';
|
||||
import { MetaCryptoType } from '../meta';
|
||||
|
||||
export const defaultServiceType = 'ETC';
|
||||
export const defaultServiceVendor = 'UNKNOWN';
|
||||
export const defaultServiceVersion = 'UNKNOWN';
|
||||
|
||||
export interface Service {
|
||||
metaCryptoType?: MetaCryptoType;
|
||||
key?: string;
|
||||
name?: string;
|
||||
description?: string;
|
||||
|
||||
serviceType?: string;
|
||||
serviceVendor?: string;
|
||||
serviceVersion?: string;
|
||||
|
||||
meta?: Map<string, Map<string, string>>;
|
||||
discoveredBy?: string[];
|
||||
discoveredDate?: Date;
|
||||
|
|
|
|||
|
|
@ -41,10 +41,6 @@ export class HomePageComponent implements OnInit, OnDestroy {
|
|||
showIntro = true;
|
||||
selectedNode = null;
|
||||
|
||||
// private visNetwork: any;
|
||||
// private nodeSet: any;
|
||||
// private edgeSet: any;
|
||||
|
||||
private nodes: Node[];
|
||||
private links: Link[];
|
||||
public simulation: d3.Simulation<Node, Link> | undefined;
|
||||
|
|
@ -286,7 +282,7 @@ export class HomePageComponent implements OnInit, OnDestroy {
|
|||
}
|
||||
|
||||
/**
|
||||
* DiscoverHost
|
||||
* DiscoveredHost
|
||||
*/
|
||||
@RPCSubscriber({ method: 'DiscoveryService.DiscoveredHost' })
|
||||
public DiscoveredHost(host: Host) {
|
||||
|
|
@ -313,7 +309,7 @@ export class HomePageComponent implements OnInit, OnDestroy {
|
|||
}
|
||||
|
||||
/**
|
||||
* DiscoverHost
|
||||
* DiscoveredPort
|
||||
*/
|
||||
@RPCSubscriber({ method: 'DiscoveryService.DiscoveredPort' })
|
||||
public DiscoveredPort(port: Port) {
|
||||
|
|
@ -321,7 +317,7 @@ export class HomePageComponent implements OnInit, OnDestroy {
|
|||
}
|
||||
|
||||
/**
|
||||
* DiscoverHost
|
||||
* DiscoveredService
|
||||
*/
|
||||
@RPCSubscriber({ method: 'DiscoveryService.DiscoveredService' })
|
||||
public DiscoveredService(service: Service) {
|
||||
|
|
@ -348,17 +344,6 @@ export class HomePageComponent implements OnInit, OnDestroy {
|
|||
this.simulationRestart();
|
||||
}
|
||||
|
||||
// private checkNode(id: string, target: any): Node {
|
||||
// let node = this.getNode(id);
|
||||
// if (null === node) {
|
||||
// node = new Node(id);
|
||||
// node.target = target;
|
||||
// } else {
|
||||
// node.target = target;
|
||||
// }
|
||||
// return node;
|
||||
// }
|
||||
|
||||
private getNode(id: string): Node | null {
|
||||
let _n: Node = null;
|
||||
this.nodes.some((node): boolean => {
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
|
@ -3,51 +3,46 @@
|
|||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 66 56" style="enable-background:new 0 0 66 56;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#E3E3E2;}
|
||||
.st1{fill:#81A6AF;}
|
||||
.st2{fill:#FFFFFF;}
|
||||
.st0{fill:#81A6AF;}
|
||||
.st1{fill:#FFFFFF;}
|
||||
</style>
|
||||
<g>
|
||||
<path class="st0" d="M44.9,52.5H21.2l-11.9-9l11.9-9h23.7l11.9,9L44.9,52.5z M66,43.5L49.6,30.9h-33L0.1,43.5L16.6,56h33L66,43.5z"
|
||||
/>
|
||||
</g>
|
||||
<g>
|
||||
<g>
|
||||
<path class="st1" d="M15.9,45v-4.5h14.9V38c-1-0.7-1.6-1.8-1.6-3H18.4c-1.5,0-2.7-1.2-2.7-2.7v-7.6c0-1.5,1.2-2.7,2.7-2.7h0.2
|
||||
<path class="st0" d="M15.9,45v-4.5h14.9V38c-1-0.7-1.6-1.8-1.6-3H18.4c-1.5,0-2.7-1.2-2.7-2.7v-7.6c0-1.5,1.2-2.7,2.7-2.7h0.2
|
||||
v-9.6c0-1.6,1.3-3,3-3s3,1.3,3,3V22h23.2c1.5,0,2.7,1.2,2.7,2.7v7.6c0,1.5-1.2,2.7-2.7,2.7H36.9c0,1.2-0.6,2.3-1.6,3v2.5h14.9V45
|
||||
H15.9z M42.9,27.4c-0.6,0-1.1,0.5-1.1,1.1c0,0.6,0.5,1.1,1.1,1.1s1.1-0.5,1.1-1.1C44,27.9,43.5,27.4,42.9,27.4z M36.3,27.4
|
||||
c-0.6,0-1.1,0.5-1.1,1.1c0,0.6,0.5,1.1,1.1,1.1s1.1-0.5,1.1-1.1C37.5,27.9,37,27.4,36.3,27.4z M29.8,27.4c-0.6,0-1.1,0.5-1.1,1.1
|
||||
c0,0.6,0.5,1.1,1.1,1.1c0.6,0,1.1-0.5,1.1-1.1C31,27.9,30.4,27.4,29.8,27.4z M23.3,27.4c-0.6,0-1.1,0.5-1.1,1.1
|
||||
c0,0.6,0.5,1.1,1.1,1.1c0.6,0,1.1-0.5,1.1-1.1C24.4,27.9,23.9,27.4,23.3,27.4z"/>
|
||||
<path class="st2" d="M21.6,10.4c1.1,0,2,0.9,2,2V23h24.2c1,0,1.7,0.8,1.7,1.7v7.6c0,1-0.8,1.7-1.7,1.7H35.9c0,0.4,0,0.8,0,0.9
|
||||
H15.9z M42.9,27.4c-0.6,0-1.1,0.5-1.1,1.1s0.5,1.1,1.1,1.1s1.1-0.5,1.1-1.1S43.5,27.4,42.9,27.4z M36.3,27.4
|
||||
c-0.6,0-1.1,0.5-1.1,1.1s0.5,1.1,1.1,1.1s1.1-0.5,1.1-1.1C37.5,27.9,37,27.4,36.3,27.4z M29.8,27.4c-0.6,0-1.1,0.5-1.1,1.1
|
||||
s0.5,1.1,1.1,1.1s1.1-0.5,1.1-1.1C31,27.9,30.4,27.4,29.8,27.4z M23.3,27.4c-0.6,0-1.1,0.5-1.1,1.1s0.5,1.1,1.1,1.1
|
||||
s1.1-0.5,1.1-1.1S23.9,27.4,23.3,27.4z"/>
|
||||
<path class="st1" d="M21.6,10.4c1.1,0,2,0.9,2,2V23h24.2c1,0,1.7,0.8,1.7,1.7v7.6c0,1-0.8,1.7-1.7,1.7H35.9c0,0.4,0,0.8,0,0.9
|
||||
c0,1.1-0.7,2.1-1.6,2.6v4.1h14.9V44H16.9v-2.5h14.9v-4.1c-1-0.5-1.6-1.4-1.6-2.6c0,0,0-0.4,0-0.9H18.4c-1,0-1.7-0.8-1.7-1.7v-7.6
|
||||
c0-1,0.8-1.7,1.7-1.7h1.2V12.4C19.6,11.3,20.5,10.4,21.6,10.4 M42.9,30.7c1.2,0,2.1-1,2.1-2.1s-1-2.1-2.1-2.1
|
||||
c-1.2,0-2.1,1-2.1,2.1S41.7,30.7,42.9,30.7 M36.3,30.7c1.2,0,2.1-1,2.1-2.1s-1-2.1-2.1-2.1c-1.2,0-2.1,1-2.1,2.1
|
||||
S35.2,30.7,36.3,30.7 M29.8,30.7c1.2,0,2.1-1,2.1-2.1s-1-2.1-2.1-2.1c-1.2,0-2.1,1-2.1,2.1S28.6,30.7,29.8,30.7 M23.3,30.7
|
||||
c1.2,0,2.1-1,2.1-2.1s-1-2.1-2.1-2.1c-1.2,0-2.1,1-2.1,2.1S22.1,30.7,23.3,30.7 M21.6,8.4c-2.2,0-4,1.8-4,4v8.7
|
||||
c-1.7,0.4-2.9,1.9-2.9,3.7v7.6c0,2.1,1.7,3.7,3.7,3.7h10c0.2,1,0.7,1.8,1.5,2.5v1H16.9h-2v2V44v2h2h32.3h2v-2v-2.5v-2h-2H36.3v-1
|
||||
c-1.7,0.4-2.9,1.9-2.9,3.7v7.6c0,2.1,1.7,3.7,3.7,3.7h10c0.2,1,0.7,1.8,1.5,2.5v1h-13h-2v2V44v2h2h32.3h2v-2v-2.5v-2h-2H36.3v-1
|
||||
c0.7-0.6,1.2-1.5,1.5-2.5h10c2.1,0,3.7-1.7,3.7-3.7v-7.6c0-2.1-1.7-3.7-3.7-3.7H25.6v-8.6C25.6,10.2,23.8,8.4,21.6,8.4L21.6,8.4z
|
||||
M42.9,28.7c-0.1,0-0.1-0.1-0.1-0.1s0.1-0.1,0.1-0.1c0.1,0,0.1,0.1,0.1,0.1S43,28.7,42.9,28.7L42.9,28.7z M36.3,28.7
|
||||
c-0.1,0-0.1-0.1-0.1-0.1s0.1-0.1,0.1-0.1c0.1,0,0.1,0.1,0.1,0.1S36.4,28.7,36.3,28.7L36.3,28.7z M29.8,28.7
|
||||
c-0.1,0-0.1-0.1-0.1-0.1s0.1-0.1,0.1-0.1s0.1,0.1,0.1,0.1S29.9,28.7,29.8,28.7L29.8,28.7z M23.3,28.7c-0.1,0-0.1-0.1-0.1-0.1
|
||||
s0.1-0.1,0.1-0.1s0.1,0.1,0.1,0.1S23.4,28.7,23.3,28.7L23.3,28.7z"/>
|
||||
M42.9,28.7c-0.1,0-0.1-0.1-0.1-0.1l0.1-0.1c0.1,0,0.1,0.1,0.1,0.1S43,28.7,42.9,28.7L42.9,28.7z M36.3,28.7
|
||||
c-0.1,0-0.1-0.1-0.1-0.1l0.1-0.1c0.1,0,0.1,0.1,0.1,0.1S36.4,28.7,36.3,28.7L36.3,28.7z M29.8,28.7c-0.1,0-0.1-0.1-0.1-0.1
|
||||
l0.1-0.1l0.1,0.1C29.9,28.6,29.9,28.7,29.8,28.7L29.8,28.7z M23.3,28.7c-0.1,0-0.1-0.1-0.1-0.1l0.1-0.1l0.1,0.1
|
||||
C23.4,28.6,23.4,28.7,23.3,28.7L23.3,28.7z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st1" d="M33.4,23c-0.6,0-1.1-0.2-1.6-0.5c-0.6-0.4-1-1.1-1.2-1.8c-0.1-0.7,0-1.5,0.5-2.1c1.3-1.9,2-4.2,2-6.5
|
||||
c0-2.3-0.7-4.5-2-6.4c-0.9-1.3-0.5-3.1,0.8-3.9c0.5-0.3,1-0.5,1.6-0.5c0.9,0,1.8,0.5,2.4,1.2c1.9,2.8,2.9,6.2,2.9,9.6
|
||||
<path class="st0" d="M33.4,23c-0.6,0-1.1-0.2-1.6-0.5c-0.6-0.4-1-1.1-1.2-1.8c-0.1-0.7,0-1.5,0.5-2.1c1.3-1.9,2-4.2,2-6.5
|
||||
s-0.7-4.5-2-6.4c-0.9-1.3-0.5-3.1,0.8-3.9c0.5-0.3,1-0.5,1.6-0.5c0.9,0,1.8,0.5,2.4,1.2c1.9,2.8,2.9,6.2,2.9,9.6
|
||||
c0,3.5-1,6.8-3,9.7C35.2,22.5,34.3,23,33.4,23z"/>
|
||||
<path class="st2" d="M33.4,2.2C34,2.2,34.6,2.5,35,3c1.8,2.7,2.8,5.8,2.8,9c0,3.3-1,6.4-2.8,9.1C34.5,21.7,34,22,33.4,22
|
||||
<path class="st1" d="M33.4,2.2C34,2.2,34.6,2.5,35,3c1.8,2.7,2.8,5.8,2.8,9c0,3.3-1,6.4-2.8,9.1c-0.5,0.6-1,0.9-1.6,0.9
|
||||
c-0.4,0-0.7-0.1-1-0.3c-0.8-0.6-1-1.7-0.5-2.6c1.4-2.1,2.2-4.5,2.2-7.1c0-2.5-0.7-4.9-2.1-7c-0.6-0.8-0.3-2,0.5-2.6
|
||||
C32.7,2.3,33.1,2.2,33.4,2.2 M33.4,0.2c-0.8,0-1.5,0.2-2.1,0.7c-1.8,1.2-2.2,3.6-1,5.3C31.4,7.9,32,10,32,12.1
|
||||
c0,2.1-0.6,4.2-1.8,5.9c-0.6,0.8-0.8,1.9-0.6,2.9c0.2,1,0.8,1.9,1.6,2.5c0.6,0.4,1.4,0.7,2.2,0.7c1.3,0,2.4-0.6,3.2-1.7
|
||||
c2.1-3,3.2-6.6,3.2-10.3c0-3.6-1.1-7.2-3.1-10.2C35.9,0.8,34.7,0.2,33.4,0.2L33.4,0.2z"/>
|
||||
C32.7,2.3,33.1,2.2,33.4,2.2 M33.4,0.2c-0.8,0-1.5,0.2-2.1,0.7c-1.8,1.2-2.2,3.6-1,5.3C31.4,7.9,32,10,32,12.1s-0.6,4.2-1.8,5.9
|
||||
c-0.6,0.8-0.8,1.9-0.6,2.9c0.2,1,0.8,1.9,1.6,2.5c0.6,0.4,1.4,0.7,2.2,0.7c1.3,0,2.4-0.6,3.2-1.7c2.1-3,3.2-6.6,3.2-10.3
|
||||
c0-3.6-1.1-7.2-3.1-10.2C35.9,0.8,34.7,0.2,33.4,0.2L33.4,0.2z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st1" d="M28.4,19.5c-0.6,0-1.1-0.2-1.6-0.5c-1.3-0.9-1.6-2.6-0.8-3.9c0.6-0.9,0.9-1.9,0.9-3c0-1.1-0.3-2.1-0.9-3
|
||||
c-0.4-0.6-0.6-1.4-0.4-2.1c0.2-0.7,0.6-1.4,1.2-1.8c0.5-0.3,1-0.5,1.6-0.5c1,0,1.8,0.5,2.4,1.3c1.2,1.8,1.8,3.9,1.8,6.1
|
||||
c0,2.2-0.7,4.4-1.9,6.2C30.2,19.1,29.4,19.5,28.4,19.5z"/>
|
||||
<path class="st2" d="M28.5,5.7c0.6,0,1.2,0.3,1.5,0.8c1.1,1.7,1.7,3.6,1.7,5.5c0,2-0.6,4-1.7,5.7c-0.4,0.5-0.9,0.8-1.5,0.8
|
||||
c-0.4,0-0.7-0.1-1-0.3c-0.8-0.6-1.1-1.7-0.5-2.6c0.7-1.1,1.1-2.3,1.1-3.6c0-1.3-0.4-2.5-1.1-3.5c-0.6-0.8-0.3-2,0.5-2.5
|
||||
<path class="st0" d="M28.4,19.5c-0.6,0-1.1-0.2-1.6-0.5c-1.3-0.9-1.6-2.6-0.8-3.9c0.6-0.9,0.9-1.9,0.9-3s-0.3-2.1-0.9-3
|
||||
c-0.4-0.6-0.6-1.4-0.4-2.1s0.6-1.4,1.2-1.8c0.5-0.3,1-0.5,1.6-0.5c1,0,1.8,0.5,2.4,1.3c1.2,1.8,1.8,3.9,1.8,6.1s-0.7,4.4-1.9,6.2
|
||||
C30.2,19.1,29.4,19.5,28.4,19.5z"/>
|
||||
<path class="st1" d="M28.5,5.7c0.6,0,1.2,0.3,1.5,0.8c1.1,1.7,1.7,3.6,1.7,5.5c0,2-0.6,4-1.7,5.7c-0.4,0.5-0.9,0.8-1.5,0.8
|
||||
c-0.4,0-0.7-0.1-1-0.3c-0.8-0.6-1.1-1.7-0.5-2.6c0.7-1.1,1.1-2.3,1.1-3.6S27.7,9.5,27,8.5c-0.6-0.8-0.3-2,0.5-2.5
|
||||
C27.8,5.8,28.1,5.7,28.5,5.7 M28.5,3.7c-0.7,0-1.5,0.2-2.1,0.6c-1.8,1.2-2.3,3.5-1.1,5.3c0.5,0.7,0.7,1.6,0.7,2.4
|
||||
c0,0.9-0.3,1.7-0.8,2.5c-1.2,1.8-0.7,4.1,1,5.3c0.6,0.4,1.4,0.7,2.1,0.7c1.3,0,2.5-0.6,3.2-1.7c1.4-2,2.1-4.3,2.1-6.8
|
||||
c0-2.4-0.7-4.7-2-6.6C31,4.3,29.8,3.7,28.5,3.7L28.5,3.7z"/>
|
||||
|
|
@ -55,22 +50,20 @@
|
|||
</g>
|
||||
<g>
|
||||
<g>
|
||||
<path class="st1" d="M35.9,34.9c0,0,0-0.4,0-0.9h11.9c1,0,1.7-0.8,1.7-1.7v-7.6c0-1-0.8-1.7-1.7-1.7H23.6V12.4c0-1.1-0.9-2-2-2
|
||||
s-2,0.9-2,2V23h-1.2c-1,0-1.7,0.8-1.7,1.7v7.6c0,1,0.8,1.7,1.7,1.7h11.9c0,0.4,0,0.8,0,0.9c0,1.1,0.7,2.1,1.6,2.6v4.1H16.9V44
|
||||
h32.3v-2.5H34.3v-4.1C35.3,37,35.9,36,35.9,34.9z M42.9,26.4c1.2,0,2.1,1,2.1,2.1c0,1.2-1,2.1-2.1,2.1c-1.2,0-2.1-1-2.1-2.1
|
||||
<path class="st0" d="M35.9,34.9c0,0,0-0.4,0-0.9h11.9c1,0,1.7-0.8,1.7-1.7v-7.6c0-1-0.8-1.7-1.7-1.7H23.6V12.4c0-1.1-0.9-2-2-2
|
||||
s-2,0.9-2,2V23h-1.2c-1,0-1.7,0.8-1.7,1.7v7.6c0,1,0.8,1.7,1.7,1.7h11.9c0,0.4,0,0.8,0,0.9c0,1.1,0.7,2.1,1.6,2.6v4.1h-15V44h32.3
|
||||
v-2.5H34.3v-4.1C35.3,37,35.9,36,35.9,34.9z M42.9,26.4c1.2,0,2.1,1,2.1,2.1c0,1.2-1,2.1-2.1,2.1c-1.2,0-2.1-1-2.1-2.1
|
||||
C40.7,27.3,41.7,26.4,42.9,26.4z M36.3,26.4c1.2,0,2.1,1,2.1,2.1c0,1.2-1,2.1-2.1,2.1c-1.2,0-2.1-1-2.1-2.1
|
||||
C34.2,27.3,35.2,26.4,36.3,26.4z M23.3,30.7c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1
|
||||
C25.4,29.7,24.5,30.7,23.3,30.7z M27.7,28.5c0-1.2,1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1c0,1.2-1,2.1-2.1,2.1
|
||||
C28.6,30.7,27.7,29.7,27.7,28.5z"/>
|
||||
C34.2,27.3,35.2,26.4,36.3,26.4z M23.3,30.7c-1.2,0-2.1-1-2.1-2.1c0-1.2,1-2.1,2.1-2.1s2.1,1,2.1,2.1S24.5,30.7,23.3,30.7z
|
||||
M27.7,28.5c0-1.2,1-2.1,2.1-2.1c1.2,0,2.1,1,2.1,2.1c0,1.2-1,2.1-2.1,2.1C28.6,30.7,27.7,29.7,27.7,28.5z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st1" d="M34,12.1c0,2.5-0.8,5-2.2,7.1c-0.6,0.8-0.4,2,0.5,2.6c0.3,0.2,0.7,0.3,1,0.3c0.6,0,1.2-0.3,1.5-0.8
|
||||
c1.9-2.7,2.8-5.9,2.8-9.1c0-3.2-1-6.4-2.8-9c-0.6-0.8-1.7-1.1-2.6-0.5c-0.8,0.6-1.1,1.7-0.5,2.6C33.3,7.1,34,9.6,34,12.1z"/>
|
||||
<path class="st0" d="M34,12.1c0,2.5-0.8,5-2.2,7.1c-0.6,0.8-0.4,2,0.5,2.6c0.3,0.2,0.7,0.3,1,0.3c0.6,0,1.2-0.3,1.5-0.8
|
||||
c1.9-2.7,2.8-5.9,2.8-9.1s-1-6.4-2.8-9c-0.6-0.8-1.7-1.1-2.6-0.5c-0.8,0.6-1.1,1.7-0.5,2.6C33.3,7.1,34,9.6,34,12.1z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st1" d="M27.4,18.2c0.3,0.2,0.7,0.3,1,0.3c0.6,0,1.2-0.3,1.5-0.8c1.1-1.7,1.7-3.6,1.7-5.7c0-2-0.6-3.9-1.7-5.5
|
||||
c-0.6-0.8-1.7-1.1-2.5-0.5c-0.8,0.6-1.1,1.7-0.5,2.5c0.7,1.1,1.1,2.3,1.1,3.5c0,1.3-0.4,2.5-1.1,3.6
|
||||
C26.3,16.5,26.5,17.6,27.4,18.2z"/>
|
||||
<path class="st0" d="M27.4,18.2c0.3,0.2,0.7,0.3,1,0.3c0.6,0,1.2-0.3,1.5-0.8c1.1-1.7,1.7-3.6,1.7-5.7c0-2-0.6-3.9-1.7-5.5
|
||||
c-0.6-0.8-1.7-1.1-2.5-0.5s-1.1,1.7-0.5,2.5C27.6,9.6,28,10.8,28,12c0,1.3-0.4,2.5-1.1,3.6C26.3,16.5,26.5,17.6,27.4,18.2z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 5.6 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
|
@ -1,114 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
version="1.1"
|
||||
id="svg3104"
|
||||
height="79.839996"
|
||||
width="300">
|
||||
<defs
|
||||
id="defs3106" />
|
||||
<metadata
|
||||
id="metadata3109">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
transform="translate(-311.04693,-470.39655)"
|
||||
id="layer1">
|
||||
<g
|
||||
id="g3051"
|
||||
transform="matrix(2.9861316,0,0,-2.9861316,195.28107,2130.6265)">
|
||||
<g
|
||||
id="g12"
|
||||
transform="translate(39.4376,541.665)">
|
||||
<path
|
||||
d="m 0,0 3.45,0.323 c 0.213,-1.158 0.635,-2.012 1.27,-2.558 0.638,-0.542 1.5,-0.812 2.583,-0.812 1.144,0 2.008,0.245 2.595,0.726 0.58,0.492 0.867,1.053 0.867,1.695 0,0.417 -0.123,0.78 -0.364,1.072 C 10.156,0.733 9.73,0.993 9.124,1.199 8.705,1.359 7.757,1.614 6.28,1.989 4.375,2.458 3.037,3.045 2.276,3.734 1.196,4.714 0.654,5.908 0.654,7.306 c 0,0.9 0.249,1.751 0.765,2.527 0.506,0.788 1.244,1.387 2.205,1.803 0.958,0.4 2.105,0.609 3.472,0.609 2.209,0 3.872,-0.489 4.994,-1.461 1.119,-0.99 1.702,-2.289 1.757,-3.919 L 10.275,6.745 C 10.117,7.635 9.801,8.291 9.295,8.693 8.799,9.092 8.048,9.292 7.054,9.292 6.023,9.292 5.213,9.08 4.633,8.648 4.253,8.37 4.066,8.013 4.066,7.557 4.066,7.132 4.24,6.782 4.594,6.483 5.039,6.097 6.132,5.704 7.86,5.3 9.592,4.888 10.868,4.462 11.694,4.021 12.522,3.58 13.173,2.979 13.641,2.212 c 0.464,-0.748 0.706,-1.704 0.706,-2.827 0,-1.012 -0.284,-1.97 -0.845,-2.851 -0.561,-0.881 -1.357,-1.547 -2.382,-1.98 -1.029,-0.421 -2.308,-0.646 -3.84,-0.646 -2.231,0 -3.949,0.521 -5.143,1.564 C 0.945,-3.491 0.232,-1.98 0,0"
|
||||
style="fill:#a7a5a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path14" />
|
||||
</g>
|
||||
<g
|
||||
id="g16"
|
||||
transform="translate(53.3329,548.733)">
|
||||
<path
|
||||
d="M 0,0 3.582,0 6.642,-9.109 9.624,0 13.115,0 8.628,-12.336 7.806,-14.587 c -0.297,-0.751 -0.577,-1.32 -0.845,-1.714 -0.268,-0.402 -0.577,-0.726 -0.925,-0.967 -0.355,-0.239 -0.784,-0.432 -1.284,-0.569 -0.512,-0.139 -1.086,-0.216 -1.728,-0.216 -0.647,0 -1.286,0.077 -1.915,0.216 l -0.28,2.665 c 0.525,-0.111 1.002,-0.166 1.425,-0.166 0.78,0 1.361,0.23 1.734,0.689 0.377,0.472 0.665,1.068 0.864,1.782 L 0,0 z"
|
||||
style="fill:#a7a5a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path18" />
|
||||
</g>
|
||||
<g
|
||||
id="g20"
|
||||
transform="translate(78.1938,535.901)">
|
||||
<path
|
||||
d="m 0,0 -3.373,0 0,6.532 c 0,1.376 -0.07,2.263 -0.219,2.673 -0.148,0.405 -0.377,0.721 -0.709,0.947 -0.326,0.223 -0.726,0.336 -1.183,0.336 -0.593,0 -1.119,-0.164 -1.593,-0.487 C -7.551,9.682 -7.87,9.259 -8.044,8.737 -8.215,8.201 -8.305,7.228 -8.305,5.791 l 0,-5.791 -3.366,0 0,12.832 3.118,0 0,-1.879 c 1.122,1.421 2.53,2.123 4.229,2.123 0.755,0 1.438,-0.138 2.061,-0.396 0.622,-0.278 1.096,-0.612 1.408,-1.035 0.317,-0.419 0.539,-0.893 0.665,-1.418 C -0.065,9.704 0,8.936 0,7.951 L 0,0 z"
|
||||
style="fill:#a7a5a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path22" />
|
||||
</g>
|
||||
<g
|
||||
id="g24"
|
||||
transform="translate(81.6659,542.281)">
|
||||
<path
|
||||
d="M 0,0 C 0,-1.281 0.3,-2.26 0.909,-2.924 1.516,-3.609 2.26,-3.95 3.15,-3.95 c 0.89,0 1.635,0.341 2.241,1.026 0.596,0.664 0.896,1.654 0.896,2.94 0,1.268 -0.3,2.237 -0.896,2.908 C 4.785,3.595 4.04,3.943 3.15,3.943 2.26,3.943 1.516,3.595 0.909,2.924 0.3,2.253 0,1.273 0,0 m -3.453,0.171 c 0,1.138 0.281,2.218 0.835,3.279 0.554,1.051 1.341,1.857 2.36,2.417 1.019,0.557 2.157,0.828 3.411,0.828 1.944,0 3.531,-0.628 4.768,-1.888 1.241,-1.261 1.864,-2.854 1.864,-4.775 0,-1.941 -0.628,-3.543 -1.88,-4.822 -1.25,-1.272 -2.83,-1.919 -4.729,-1.919 -1.174,0 -2.293,0.271 -3.363,0.802 -1.067,0.532 -1.877,1.31 -2.431,2.341 -0.554,1.02 -0.835,2.267 -0.835,3.737"
|
||||
style="fill:#a7a5a6;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path26" />
|
||||
</g>
|
||||
<g
|
||||
id="g28"
|
||||
transform="translate(95.59,555.312)">
|
||||
<path
|
||||
d="m 0,0 0,-16.567 c 0,-0.79 0.058,-1.313 0.169,-1.563 0.116,-0.262 0.289,-0.455 0.524,-0.586 0.239,-0.131 0.681,-0.199 1.319,-0.199 l 0,-0.496 -6.122,0 0,0.496 c 0.574,0 0.964,0.059 1.184,0.184 0.202,0.123 0.366,0.31 0.485,0.587 0.12,0.271 0.175,0.796 0.175,1.577 l 0,11.305 c 0,1.423 -0.029,2.293 -0.09,2.622 -0.058,0.326 -0.162,0.544 -0.297,0.66 -0.139,0.123 -0.312,0.191 -0.523,0.191 -0.228,0 -0.522,-0.084 -0.873,-0.223 L -4.282,-1.527 -0.605,0 0,0 z"
|
||||
style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path30" />
|
||||
</g>
|
||||
<g
|
||||
id="g32"
|
||||
transform="translate(103.261,547.855)">
|
||||
<path
|
||||
d="m 0,0 c -0.484,0 -0.967,-0.125 -1.454,-0.419 -0.487,-0.289 -0.883,-0.783 -1.184,-1.493 -0.299,-0.724 -0.45,-1.64 -0.45,-2.764 0,-1.817 0.367,-3.366 1.085,-4.693 0.726,-1.304 1.677,-1.969 2.857,-1.969 0.89,0 1.615,0.372 2.183,1.09 0.577,0.724 0.865,1.969 0.865,3.742 0,2.216 -0.478,3.947 -1.433,5.22 C 1.822,-0.421 0.999,0 0,0 m 0.419,0.919 c 1.899,0 3.418,-0.719 4.568,-2.157 0.974,-1.225 1.461,-2.633 1.461,-4.223 0,-1.122 -0.264,-2.254 -0.803,-3.394 -0.539,-1.144 -1.277,-2.009 -2.225,-2.589 -0.944,-0.583 -1.989,-0.874 -3.146,-0.874 -1.892,0 -3.392,0.751 -4.501,2.246 -0.938,1.26 -1.409,2.68 -1.409,4.257 0,1.148 0.284,2.279 0.851,3.405 0.575,1.14 1.322,1.969 2.254,2.524 0.929,0.532 1.912,0.805 2.95,0.805"
|
||||
style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path34" />
|
||||
</g>
|
||||
<g
|
||||
id="g36"
|
||||
transform="translate(114.826,548.085)">
|
||||
<path
|
||||
d="m 0,0 c -0.671,0 -1.225,-0.28 -1.681,-0.813 -0.45,-0.532 -0.673,-1.331 -0.673,-2.437 0,-1.424 0.306,-2.528 0.919,-3.318 0.473,-0.594 1.064,-0.891 1.783,-0.891 0.686,0 1.254,0.263 1.692,0.777 0.442,0.515 0.661,1.317 0.661,2.413 0,1.442 -0.306,2.56 -0.928,3.37 C 1.305,-0.31 0.718,0 0,0 m -2.489,-12.184 c -0.416,-0.45 -0.726,-0.883 -0.942,-1.29 -0.216,-0.38 -0.316,-0.753 -0.316,-1.078 0,-0.447 0.258,-0.82 0.784,-1.146 0.909,-0.555 2.221,-0.844 3.934,-0.844 1.63,0 2.829,0.289 3.61,0.863 0.78,0.568 1.164,1.176 1.164,1.825 0,0.461 -0.232,0.796 -0.697,0.996 -0.474,0.201 -1.408,0.317 -2.815,0.346 -2.046,0.061 -3.624,0.18 -4.722,0.328 m 0.112,4.581 c -0.76,0.387 -1.338,0.896 -1.75,1.563 -0.403,0.675 -0.607,1.407 -0.607,2.21 0,1.238 0.459,2.306 1.387,3.182 0.932,0.889 2.125,1.338 3.576,1.338 1.185,0 2.214,-0.28 3.084,-0.864 l 2.642,0 c 0.393,0 0.618,-0.013 0.686,-0.035 C 6.7,-0.239 6.74,-0.28 6.773,-0.325 6.825,-0.41 6.856,-0.555 6.856,-0.761 6.856,-0.999 6.831,-1.174 6.786,-1.257 6.758,-1.303 6.712,-1.345 6.641,-1.363 6.573,-1.39 6.348,-1.402 5.951,-1.402 l -1.628,0 c 0.516,-0.657 0.771,-1.497 0.771,-2.519 0,-1.16 -0.451,-2.162 -1.336,-2.985 -0.89,-0.829 -2.082,-1.248 -3.571,-1.248 -0.619,0 -1.249,0.091 -1.896,0.294 -0.38,-0.358 -0.639,-0.656 -0.767,-0.915 -0.139,-0.266 -0.207,-0.482 -0.207,-0.657 0,-0.167 0.074,-0.31 0.229,-0.463 0.145,-0.141 0.442,-0.248 0.877,-0.307 0.248,-0.047 0.89,-0.082 1.902,-0.111 1.866,-0.059 3.079,-0.13 3.627,-0.223 0.845,-0.117 1.522,-0.435 2.025,-0.936 0.503,-0.505 0.754,-1.122 0.754,-1.859 0,-1.013 -0.483,-1.978 -1.443,-2.87 -1.407,-1.313 -3.251,-1.971 -5.524,-1.971 -1.747,0 -3.224,0.385 -4.429,1.175 -0.681,0.455 -1.016,0.922 -1.016,1.416 0,0.209 0.049,0.432 0.142,0.65 0.151,0.342 0.464,0.79 0.934,1.391 0.062,0.086 0.52,0.573 1.361,1.465 -0.468,0.294 -0.802,0.542 -0.992,0.772 -0.195,0.223 -0.294,0.48 -0.294,0.759 0,0.324 0.125,0.695 0.38,1.12 0.258,0.435 0.851,1.047 1.773,1.821"
|
||||
style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path38" />
|
||||
</g>
|
||||
<g
|
||||
id="g40"
|
||||
transform="translate(122.069,548.41)">
|
||||
<path
|
||||
d="m 0,0 5.845,0 0,-0.5 -0.283,0 c -0.413,0 -0.719,-0.096 -0.925,-0.265 -0.204,-0.183 -0.303,-0.403 -0.303,-0.66 0,-0.362 0.145,-0.849 0.451,-1.474 l 3.047,-6.322 2.789,6.907 c 0.154,0.38 0.232,0.744 0.232,1.121 0,0.162 -0.039,0.281 -0.096,0.361 -0.075,0.097 -0.188,0.183 -0.343,0.236 C 10.262,-0.535 9.986,-0.5 9.599,-0.5 l 0,0.5 4.043,0 0,-0.5 c -0.336,-0.035 -0.596,-0.112 -0.777,-0.219 -0.185,-0.113 -0.384,-0.312 -0.6,-0.605 -0.084,-0.132 -0.246,-0.475 -0.468,-1.049 l -5.064,-12.46 c -0.494,-1.215 -1.139,-2.123 -1.941,-2.742 -0.8,-0.624 -1.571,-0.922 -2.312,-0.922 -0.539,0 -0.98,0.144 -1.332,0.462 -0.345,0.305 -0.518,0.658 -0.518,1.063 0,0.378 0.124,0.673 0.376,0.91 0.251,0.241 0.603,0.348 1.039,0.348 0.303,0 0.719,-0.098 1.238,-0.291 0.364,-0.125 0.596,-0.205 0.69,-0.205 0.274,0 0.567,0.148 0.896,0.428 0.322,0.278 0.648,0.822 0.974,1.623 l 0.883,2.176 -4.498,9.4 C 2.091,-2.298 1.871,-1.95 1.574,-1.528 1.345,-1.213 1.158,-0.997 1.013,-0.88 0.803,-0.744 0.464,-0.612 0,-0.5 L 0,0 z"
|
||||
style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path42" />
|
||||
</g>
|
||||
<g
|
||||
id="g44"
|
||||
transform="translate(136.017,550.631)">
|
||||
<path
|
||||
d="M 0,0 0.705,0 C 0.854,0 0.974,0.009 1.057,0.052 1.144,0.07 1.206,0.132 1.25,0.197 1.299,0.269 1.319,0.346 1.319,0.426 1.319,0.539 1.277,0.635 1.189,0.713 1.106,0.788 0.97,0.826 0.79,0.826 L 0,0.826 0,0 z m -0.329,-1.393 0,2.502 1.099,0 c 0.223,0 0.39,-0.028 0.51,-0.08 C 1.4,0.988 1.482,0.91 1.554,0.803 1.625,0.681 1.656,0.555 1.656,0.426 1.656,0.242 1.602,0.093 1.482,-0.023 1.373,-0.148 1.196,-0.229 0.957,-0.261 1.048,-0.303 1.112,-0.348 1.154,-0.384 1.25,-0.471 1.341,-0.58 1.425,-0.709 l 0.435,-0.684 -0.41,0 -0.332,0.517 C 1.022,-0.735 0.941,-0.612 0.879,-0.535 0.812,-0.45 0.764,-0.4 0.712,-0.357 0.666,-0.328 0.616,-0.316 0.564,-0.3 0.526,-0.289 0.461,-0.283 0.376,-0.283 l -0.376,0 0,-1.11 -0.329,0 z"
|
||||
style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path46" />
|
||||
</g>
|
||||
<g
|
||||
id="g48"
|
||||
transform="translate(138.473,550.583)">
|
||||
<path
|
||||
d="m 0,0 c 0,-0.999 -0.813,-1.821 -1.809,-1.821 -1.003,0 -1.815,0.822 -1.815,1.821 0,1.006 0.812,1.812 1.815,1.812 C -0.813,1.812 0,1.006 0,0 z"
|
||||
style="fill:none;stroke:#231f20;stroke-width:0.17900001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="path50" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 10 KiB |
Loading…
Reference in New Issue
Block a user