Resolve conflicts
This commit is contained in:
lostinlight
parent
2bd7fecfe8
commit
6b92f2438c
|
|
@ -39,7 +39,7 @@
|
|||
},
|
||||
{
|
||||
"title": "Plume",
|
||||
"source": "https://git.joinplu.me/Plume/Plume",
|
||||
"source": "https://github.com/Plume-org/Plume",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://joinplu.me",
|
||||
"logo": "/img/misc/plume.svg",
|
||||
|
|
@ -203,7 +203,7 @@
|
|||
"title": "brutalinks",
|
||||
"source": "https://github.com/mariusor/go-littr",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://brutalinks.tech/~admin/",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "https://the-federation.info/brutalinks",
|
||||
"description": "Link aggregator inspired by Reddit.",
|
||||
|
|
@ -329,21 +329,13 @@
|
|||
"title": "Ktistec",
|
||||
"source": "https://github.com/toddsundsted/ktistec",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://epiktistes.com/",
|
||||
"site": "",
|
||||
"logo": "/img/misc/ktistec.png",
|
||||
"servers": "https://the-federation.info/ktistec",
|
||||
"description": "An ActivityPub server with minimal dependencies, optimized for single-user application.",
|
||||
"codeLanguage": "Crystal",
|
||||
"techStack": "",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"license": "GNU Affero General Public License",
|
||||
=======
|
||||
"license": "AGPL-3.0",
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
"license": "AGPL-3.0",
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"FediAccount": "@toddsundsted@mastodon.social",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
|
|
@ -352,52 +344,12 @@
|
|||
"categories": ["SN-mi"]
|
||||
},
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"title": "OLKi",
|
||||
"source": "https://framagit.org/synalp/olki/olki",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://olki.loria.fr/platform",
|
||||
"logo": "/img/misc/olki.svg",
|
||||
"servers": "",
|
||||
"description": "A self-hosted linguistic corpora exchange platform that aims to be a simple gateway to the Fediverse for scientific interaction.",
|
||||
"codeLanguage": "Python",
|
||||
"techStack": "Django, Vue, Nuxt, Spectre.css, Zutre",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "@cerisara@mastodon.etalab.gouv.fr",
|
||||
=======
|
||||
"title": "pubgate",
|
||||
"source": "https://github.com/autogestion/pubgate",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "https://the-federation.info/pubgate",
|
||||
"description": "Lightweight ActivityPub CMS. Implements both client-to-server (C2S) and server-to-server(S2S) APIs. Compatible with Mastodon, Pixelfed, Pleroma and microblog.pub.",
|
||||
"codeLanguage": "Python",
|
||||
"techStack": "",
|
||||
"license": "BSD-3-clause",
|
||||
"FediAccount": "",
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
<<<<<<< HEAD
|
||||
"categories": ["OpenData", "SN-mi"]
|
||||
},
|
||||
=======
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
"categories": ["SN-mi"]
|
||||
},
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
{
|
||||
"title": "castling.club",
|
||||
"source": "https://github.com/stephank/castling.club",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://castling.club",
|
||||
"logo": "",
|
||||
"servers": "https://fedidb.org/software/castling.club",
|
||||
"servers": "",
|
||||
"description": "Challenge someone to a game of chess using toots! An ActivityPub server with a single hardcoded King service actor that acts as a chess arbiter.",
|
||||
"codeLanguage": "TypeScript",
|
||||
"techStack": "Node.js",
|
||||
|
|
@ -521,9 +473,9 @@
|
|||
"title": "OCamlot",
|
||||
"source": "https://github.com/gopiandcode/ocamlot",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "ocamlot.xyz",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "ocamlot.xyz",
|
||||
"servers": "https://ocamlot.fediverse.observer/list",
|
||||
"description": "An ActivityPub-speaking server in OCaml (Pleroma and Mastodon compatible).",
|
||||
"codeLanguage": "OCaml",
|
||||
"techStack": "",
|
||||
|
|
@ -572,27 +524,6 @@
|
|||
"categories": ["Ev-Meet"]
|
||||
},
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"title": "Rustodon",
|
||||
"source": "https://github.com/rustodon/rustodon",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "Mastodon-compatible social microblogging server.",
|
||||
"codeLanguage": "Rust",
|
||||
"techStack": "Diesel, SASS",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["SN-mi"]
|
||||
},
|
||||
{
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"title": "Aardwolf",
|
||||
"source": "https://github.com/Aardwolf-Social/aardwolf",
|
||||
"protocols": "ActivityPub",
|
||||
|
|
@ -1028,7 +959,7 @@
|
|||
"title": "Ocelot Social",
|
||||
"source": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://ocelot.social/",
|
||||
"site": "",
|
||||
"logo": "/img/misc/ocelot.svg",
|
||||
"servers": "",
|
||||
"description": "Social, action and knowledge network for active citizenship.",
|
||||
|
|
@ -1260,27 +1191,12 @@
|
|||
},
|
||||
{
|
||||
"title": "Firefish",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"source": "https://gitlab.prometheus.systems/firefish/firefish",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://firefish.social/",
|
||||
=======
|
||||
"source": "https://git.joinfirefish.org/firefish/firefish",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://joinfirefish.org",
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
"logo": "/img/misc/firefish.svg",
|
||||
"servers": "https://firefish.fediverse.observer/list",
|
||||
"description": "A fun, new, open way to experience social media. Foremerly known as Calckey, originally a Misskey fork",
|
||||
=======
|
||||
"source": "https://git.joinfirefish.org/firefish/firefish",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://joinfirefish.org",
|
||||
"logo": "/img/misc/firefish.svg",
|
||||
"servers": "https://firefish.fediverse.observer/list",
|
||||
"description": "A fun, new, open way to experience social media. A fork of Misskey, formerly known as Calckey.",
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"codeLanguage": "TypeScript",
|
||||
"techStack": "Node.js, Vue",
|
||||
"license": "AGPL-3.0",
|
||||
|
|
@ -1331,26 +1247,14 @@
|
|||
"title": "Takahe",
|
||||
"source": "https://github.com/andrewgodwin/takahe",
|
||||
"protocols": "ActivityPub",
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
"site": "https://jointakahe.org/takahesocial/",
|
||||
=======
|
||||
"site": "https://jointakahe.org",
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
"site": "https://jointakahe.org",
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"logo": "/img/misc/takahe.svg",
|
||||
"servers": "",
|
||||
"description": "A very experimental Fediverse server for microblogging.",
|
||||
"codeLanguage": "Python",
|
||||
"techStack": "Django",
|
||||
"license": "BSD-3-clause",
|
||||
<<<<<<< HEAD
|
||||
"FediAccount": "@takahe@jointakahe.org",
|
||||
=======
|
||||
"FediAccount": "@takahe@jointakahe.takahe.social",
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
|
|
@ -1465,6 +1369,114 @@
|
|||
"OStatusClass": false,
|
||||
"categories": ["Extension"]
|
||||
},
|
||||
{
|
||||
"title": "Decodon",
|
||||
"source": "https://github.com/jesseplusplus/decodon",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "A fork of Mastodon focusing on followers-only posting of media. Configurable circles to post to.",
|
||||
"codeLanguage": "Ruby",
|
||||
"techStack": "React, SASS, Node.js",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "@jesseplusplus@mastodon.social",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["SN-mi"]
|
||||
},
|
||||
{
|
||||
"title": "Emissary",
|
||||
"source": "https://github.com/EmissarySocial/emissary",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://emissary.social",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "A customizable, private space in the Fediverse where people can create, share, and collaborate.",
|
||||
"codeLanguage": "Go",
|
||||
"techStack": "MongoDB, HTMX, Hyperscript",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "https://mastodon.social/@benpate",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["SN-mi"]
|
||||
},
|
||||
{
|
||||
"title": "Pinnetta",
|
||||
"source": "https://codeberg.org/pinetta/proto-pinetta",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "A FOSS, federated, ActivityPub-enabled pinboard thingy, in the style of Pinterest",
|
||||
"codeLanguage": "Python",
|
||||
"techStack": "",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "@Pinetta@Fedi.Software",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["Forums","Other"]
|
||||
},
|
||||
{
|
||||
"title": "Yarn",
|
||||
"source": "https://git.mills.io/yarnsocial/yarn",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://yarn.social",
|
||||
"logo": "/img/misc/yarn.svg",
|
||||
"servers": "",
|
||||
"description": "Decentralised self-hosted social media based on the Twtxt format (with Extensions) that has a privacy-first focus",
|
||||
"codeLanguage": "Go",
|
||||
"techStack": "",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "@prologic@twtxt.net",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["Forums","Other"]
|
||||
},
|
||||
{
|
||||
"title": "Transit FediAlerts",
|
||||
"source": "https://github.com/kona314/transit-fedilerts",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://transit.alerts.social",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "ActivityPub-compliant (Mastodon-compatible) transit alerts generated from GTFS-realtime Service Alerts",
|
||||
"codeLanguage": "Typescript",
|
||||
"techStack": "",
|
||||
"license": "",
|
||||
"FediAccount": "@prologic@twtxt.net",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["Other"]
|
||||
},
|
||||
{
|
||||
"title": "Vocata",
|
||||
"source": "https://codeberg.org/Vocata/vocata",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://docs.vocata.one/",
|
||||
"logo": "/img/misc/vocata.png",
|
||||
"servers": "",
|
||||
"description": "Vocabulary-agnostic ActivityPub server. Vocata does not limit what types of content can be handled by it, and how it is presented to users.",
|
||||
"codeLanguage": "Python",
|
||||
"techStack": "",
|
||||
"license": "LGPL-3.0",
|
||||
"FediAccount": "",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["Other","Extension"]
|
||||
},
|
||||
{
|
||||
"title": "diaspora*",
|
||||
"source": "https://github.com/diaspora/diaspora",
|
||||
|
|
@ -1644,114 +1656,6 @@
|
|||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["SN-mi"]
|
||||
},
|
||||
{
|
||||
"title": "Decodon",
|
||||
"source": "https://github.com/jesseplusplus/decodon",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "A fork of Mastodon focusing on followers-only posting of media. Configurable circles to post to.",
|
||||
"codeLanguage": "Ruby",
|
||||
"techStack": "React, SASS, Node.js",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "@jesseplusplus@mastodon.social",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["SN-mi"]
|
||||
},
|
||||
{
|
||||
"title": "Emissary",
|
||||
"source": "https://github.com/EmissarySocial/emissary",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://emissary.social/",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "A customizable, private space in the Fediverse where people can create, share, and collaborate.",
|
||||
"codeLanguage": "Go",
|
||||
"techStack": "MongoDB, HTMX, Hyperscript",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "https://mastodon.social/@benpate",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["SN-mi"]
|
||||
},
|
||||
{
|
||||
"title": "Pinnetta",
|
||||
"source": "https://codeberg.org/pinetta/proto-pinetta",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "A FOSS, federated, ActivityPub-enabled pinboard thingy, in the style of Pinterest",
|
||||
"codeLanguage": "Python",
|
||||
"techStack": "",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "@Pinetta@Fedi.Software",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["Forums","Other"]
|
||||
},
|
||||
{
|
||||
"title": "Yarn",
|
||||
"source": "https://git.mills.io/yarnsocial/yarn",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://yarn.social/",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "Yarn.social is a decentralised self-hosted social media based on the Twtxt format (with Extensions) that has a privacy-first focus",
|
||||
"codeLanguage": "Go",
|
||||
"techStack": "",
|
||||
"license": "AGPL-3.0",
|
||||
"FediAccount": "@prologic@twtxt.net",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["Forums","Other"]
|
||||
},
|
||||
{
|
||||
"title": "Transit FediAlerts",
|
||||
"source": "https://github.com/kona314/transit-fedilerts",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://transit.alerts.social/",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "ActivityPub-compliant (Mastodon-compatible) transit alerts generated from GTFS-realtime Service Alerts",
|
||||
"codeLanguage": "Typescript",
|
||||
"techStack": "",
|
||||
"license": "",
|
||||
"FediAccount": "@prologic@twtxt.net",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["Other"]
|
||||
},
|
||||
{
|
||||
"title": "Vocata",
|
||||
"source": "https://codeberg.org/Vocata/vocata",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://docs.vocata.one/",
|
||||
"logo": "/img/misc/vocata.png",
|
||||
"servers": "",
|
||||
"description": "Vocabulary-Agnostic Transport Agent",
|
||||
"codeLanguage": "Python",
|
||||
"techStack": "",
|
||||
"license": "LGPL-3.0",
|
||||
"FediAccount": "",
|
||||
"apClass": true,
|
||||
"zotClass": false,
|
||||
"diasporaClass": false,
|
||||
"OStatusClass": false,
|
||||
"categories": ["Other","Extension"]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -27,15 +27,9 @@
|
|||
"devTutorial": "https://misskey-hub.net/en/docs/install.html",
|
||||
"forks":
|
||||
[
|
||||
<<<<<<< HEAD
|
||||
{"id": "0", "url": "https://firefish.social/", "descr": "formerly known as Calckey, Firefish was originally a Misskey fork"},
|
||||
{"id": "1", "url": "https://akkoma.dev/FoundKeyGang/FoundKey", "descr": "Foundkey - fork that removes bloat from Misskey"},
|
||||
{"id": "2", "url": "https://github.com/mei23/misskey", "descr": "Meiskey - actively developed fork v11"}
|
||||
=======
|
||||
{"id": "0", "url": "https://joinfirefish.org/", "descr": "Firefish - hard fork with a community oriented direction"},
|
||||
{"id": "1", "url": "https://github.com/mei23/misskey", "descr": "Meiskey - actively developed fork v11"},
|
||||
{"id": "2", "url": "https://akkoma.dev/FoundKeyGang/FoundKey", "descr": "FoundKey - hard fork that removes bloat from Misskey"}
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
],
|
||||
"mascot": [{"item": "藍 (Ai)", "imgNum": "1"}],
|
||||
"dwellers": "Miskist",
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
{
|
||||
"data":
|
||||
{
|
||||
"title": "misskey",
|
||||
"category": "social network",
|
||||
"type": "microblogging",
|
||||
"logoClr": "9fd608",
|
||||
"created": "2014",
|
||||
"official": "https://misskey-hub.net/en",
|
||||
"license": "AGPL-3.0",
|
||||
"repo": "https://github.com/misskey-dev/misskey",
|
||||
"language": "TypeScript",
|
||||
"protocols":
|
||||
[
|
||||
{"title": "ActivityPub", "url": "https://activitypub.rocks"}
|
||||
],
|
||||
"wiki": "https://misskey-hub.net/en/docs/misskey.html",
|
||||
"servers":
|
||||
[
|
||||
{"num": "1", "url": "https://misskey-hub.net/en/instances.html"},
|
||||
{"num": "2", "url": "https://join.misskey.page/en/wiki/instances"},
|
||||
{"num": "3", "url": "https://the-federation.info/misskey"},
|
||||
{"num": "4", "url": "https://fedidb.org/software/misskey"},
|
||||
{"num": "5", "url": "https://misskey.fediverse.observer/list"}
|
||||
],
|
||||
"mobile": "https://misskey-hub.net/en/docs/faq.html",
|
||||
"devTutorial": "https://misskey-hub.net/en/docs/install.html",
|
||||
"forks":
|
||||
[
|
||||
<<<<<<< HEAD
|
||||
{"id": "0", "url": "https://firefish.social/", "descr": "formerly known as Calckey, Firefish was originally a Misskey fork"},
|
||||
{"id": "1", "url": "https://akkoma.dev/FoundKeyGang/FoundKey", "descr": "Foundkey - fork that removes bloat from Misskey"},
|
||||
{"id": "2", "url": "https://github.com/mei23/misskey", "descr": "Meiskey - actively developed fork v11"}
|
||||
=======
|
||||
{"id": "0", "url": "https://joinfirefish.org/", "descr": "Firefish - hard fork with a community oriented direction"},
|
||||
{"id": "1", "url": "https://github.com/mei23/misskey", "descr": "Meiskey - actively developed fork v11"},
|
||||
{"id": "2", "url": "https://akkoma.dev/FoundKeyGang/FoundKey", "descr": "FoundKey - hard fork that removes bloat from Misskey"}
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
],
|
||||
"mascot": [{"item": "藍 (Ai)", "imgNum": "1"}],
|
||||
"dwellers": "Miskist",
|
||||
"communities": "",
|
||||
"descr": "Apart from the mainstream microblogging experience, this network provides many additional features like a calendar, emoji reactions, rich chatting, antennas, animated text posts, and more. The web client can be customized by choosing from various available widgets. Original interface language is Japanese, but translations for many other languages such as English, German, Korean and more are available.",
|
||||
"connections": ["Friendica", "Hubzilla", "microblog.pub", "Mastodon", "PeerTube", "Pixelfed", "Pleroma", "Plume", "WriteFreely"],
|
||||
"screenshots":
|
||||
[
|
||||
{"descr": "Misskey interface", "img": "misskey-1.jpg"},
|
||||
{"descr": "Dark theme", "img": "misskey-2.jpg"}
|
||||
],
|
||||
"features":
|
||||
[
|
||||
"polls",
|
||||
"emoji reactions",
|
||||
"lists",
|
||||
"calendar",
|
||||
"trends",
|
||||
"recommended users",
|
||||
"tips for newcomers",
|
||||
"server information",
|
||||
"animated markdown",
|
||||
"rich chatting"
|
||||
],
|
||||
"donate": "https://www.patreon.com/syuilo",
|
||||
"tracker": "https://github.com/syuilo/misskey/issues",
|
||||
"bounty": "",
|
||||
"translating": "https://crowdin.com/project/misskey",
|
||||
"reading": "",
|
||||
"notable": ""
|
||||
}
|
||||
}
|
||||
|
|
@ -689,7 +689,7 @@
|
|||
"title": "XWiki AP extension",
|
||||
"source": "https://github.com/xwiki-contrib/application-activitypub",
|
||||
"protocols": "ActivityPub",
|
||||
"site": "https://extensions.xwiki.org/xwiki/bin/view/Extension/ActivityPub%20Application/",
|
||||
"site": "",
|
||||
"logo": "",
|
||||
"servers": "",
|
||||
"description": "An implementation of the ActivityPub protocol for XWiki.",
|
||||
|
|
|
|||
|
|
@ -1,42 +1 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 362.83 362.83">
|
||||
<defs>
|
||||
<style>
|
||||
.cls-1 {
|
||||
fill: #462d7a;
|
||||
}
|
||||
|
||||
.cls-2 {
|
||||
stroke: #2c1e50;
|
||||
}
|
||||
|
||||
.cls-2, .cls-3 {
|
||||
stroke-miterlimit: 10;
|
||||
}
|
||||
|
||||
.cls-3 {
|
||||
stroke: #fff;
|
||||
}
|
||||
</style>
|
||||
</defs>
|
||||
<g id="Layer_9" data-name="Layer 9">
|
||||
<path class="cls-2" d="M269.3,197.19c-5.77-11.54-85.59,16.83-154.76,27.39-21.09,3.22-38.13,4.31-47.3,4.75-.74,2.91-1.76,7.02-2.87,11.97-1.93,8.6-2.89,12.89-2.6,13.78,3.3,9.95,59.73-.88,99.18-7.64,32.67-5.6,115.14-18.96,114.61-30.77-.03-.69-1.11-4.01-3.27-10.65-1.78-5.47-2.67-8.2-2.98-8.83Z"/>
|
||||
</g>
|
||||
<g id="Layer_6" data-name="Layer 6">
|
||||
<path class="cls-1" d="M115.2,131.89c6.26-6.54,20.19-20.63,42.39-26.14,15.79-3.92,28.51-1.28,33.51,0,83.72,21.41,116.03,201.78,77.79,226.32-10.28,6.6-26.86,2.7-36.77-3.3-32.63-19.78-29.3-72.87-44.44-73.73-5.11-.29-7.15,5.8-20.91,24.94-19.63,27.3-31.49,43.44-49.21,50.87-2.53,1.06-26.91,12.07-41.84,1.23-38.55-28-2.96-155.84,39.49-200.18Zm56.31,10.45c-27.39-.52-46.38,38.21-37.98,54.55,10.09,19.62,65.5,18.26,74.77-3.3,7.21-16.78-11.38-50.77-36.79-51.24Z"/>
|
||||
</g>
|
||||
<g id="Layer_4" data-name="Layer 4">
|
||||
<path d="M68.93,86.51c-6.55,27.74,252.45,113.97,267.56,89.66,9.24-14.87-64.9-83.62-163.53-97.57-39.06-5.52-100.95-5.14-104.03,7.91Z"/>
|
||||
</g>
|
||||
<g id="Layer_5" data-name="Layer 5">
|
||||
<path class="cls-3" d="M138.96,93.76c.41-5.25,6.51-5.74,28.85-19.42,26.97-16.51,28.85-22.38,56.86-40.83,30.07-19.81,48.46-31.94,54.82-26.61,9.72,8.15-25.18,43.33-21.31,99.35,.87,12.61,3.12,17.79-.86,23.01-18.25,23.95-120.07-13.68-118.35-35.5Z"/>
|
||||
</g>
|
||||
</svg>
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><path d="M17.83 13.837c-.408-.817-6.058 1.191-10.953 1.939a32.559 32.559 0 0 1-3.348.336c-.052.206-.125.497-.203.847-.137.609-.205.912-.184.975.234.704 4.228-.062 7.02-.541 2.312-.396 8.149-1.342 8.112-2.178-.002-.049-.079-.284-.231-.754-.128-.386-.191-.579-.213-.624z"/><path fill="#462D7A" d="M6.923 9.216c.443-.463 1.429-1.46 3-1.85a4.876 4.876 0 0 1 2.372 0c5.925 1.515 8.212 14.281 5.506 16.018-.728.467-1.901.191-2.602-.234-2.309-1.4-2.074-5.158-3.145-5.218-.362-.021-.506.411-1.48 1.765-1.389 1.932-2.229 3.075-3.483 3.6-.179.075-1.905.854-2.961.087-2.73-1.981-.211-11.029 2.793-14.168zm3.986.739C8.97 9.918 7.626 12.66 8.22 13.816c.714 1.389 4.636 1.292 5.292-.234.511-1.187-.805-3.593-2.603-3.627z"/><path d="M3.648 6.004c-.463 1.963 17.868 8.066 18.937 6.346.654-1.052-4.593-5.918-11.574-6.906-2.764-.391-7.145-.364-7.363.56z"/><path stroke="#fff" stroke-width=".5" d="M8.605 6.517c.029-.372.461-.406 2.042-1.374 1.909-1.169 2.042-1.584 4.024-2.89C16.799.851 18.101-.008 18.551.37c.688.577-1.782 3.067-1.508 7.032.062.892.221 1.259-.061 1.629-1.292 1.694-8.498-.97-8.377-2.514z"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><path d="M17.83 13.837c-.408-.817-6.058 1.191-10.953 1.939a32.559 32.559 0 0 1-3.348.336c-.052.206-.125.497-.203.847-.137.609-.205.912-.184.975.234.704 4.228-.062 7.02-.541 2.312-.396 8.149-1.342 8.112-2.178-.002-.049-.079-.284-.231-.754-.128-.386-.191-.579-.213-.624z"/><path fill="#462D7A" d="M6.923 9.216c.443-.463 1.429-1.46 3-1.85a4.876 4.876 0 0 1 2.372 0c5.925 1.515 8.212 14.281 5.506 16.018-.728.467-1.901.191-2.602-.234-2.309-1.4-2.074-5.158-3.145-5.218-.362-.021-.506.411-1.48 1.765-1.389 1.932-2.229 3.075-3.483 3.6-.179.075-1.905.854-2.961.087-2.73-1.981-.211-11.029 2.793-14.168zm3.986.739C8.97 9.918 7.626 12.66 8.22 13.816c.714 1.389 4.636 1.292 5.292-.234.511-1.187-.805-3.593-2.603-3.627z"/><path d="M3.648 6.004c-.463 1.963 17.868 8.066 18.937 6.346.654-1.052-4.593-5.918-11.574-6.906-2.764-.391-7.145-.364-7.363.56z"/><path stroke="#fff" stroke-width=".5" d="M8.605 6.517c.029-.372.461-.406 2.042-1.374 1.909-1.169 2.042-1.584 4.024-2.89C16.799.851 18.101-.008 18.551.37c.688.577-1.782 3.067-1.508 7.032.062.892.221 1.259-.061 1.629-1.292 1.694-8.498-.97-8.377-2.514z"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><path d="M17.83 13.837c-.408-.817-6.058 1.191-10.953 1.939a32.559 32.559 0 0 1-3.348.336c-.052.206-.125.497-.203.847-.137.609-.205.912-.184.975.234.704 4.228-.062 7.02-.541 2.312-.396 8.149-1.342 8.112-2.178-.002-.049-.079-.284-.231-.754-.128-.386-.191-.579-.213-.624z"/><path fill="#462D7A" d="M6.923 9.216c.443-.463 1.429-1.46 3-1.85a4.876 4.876 0 0 1 2.372 0c5.925 1.515 8.212 14.281 5.506 16.018-.728.467-1.901.191-2.602-.234-2.309-1.4-2.074-5.158-3.145-5.218-.362-.021-.506.411-1.48 1.765-1.389 1.932-2.229 3.075-3.483 3.6-.179.075-1.905.854-2.961.087-2.73-1.981-.211-11.029 2.793-14.168zm3.986.739C8.97 9.918 7.626 12.66 8.22 13.816c.714 1.389 4.636 1.292 5.292-.234.511-1.187-.805-3.593-2.603-3.627z"/><path d="M3.648 6.004c-.463 1.963 17.868 8.066 18.937 6.346.654-1.052-4.593-5.918-11.574-6.906-2.764-.391-7.145-.364-7.363.56z"/><path stroke="#fff" stroke-width=".5" d="M8.605 6.517c.029-.372.461-.406 2.042-1.374 1.909-1.169 2.042-1.584 4.024-2.89C16.799.851 18.101-.008 18.551.37c.688.577-1.782 3.067-1.508 7.032.062.892.221 1.259-.061 1.629-1.292 1.694-8.498-.97-8.377-2.514z"/></svg>
|
||||
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 1.2 KiB |
|
|
@ -1,42 +0,0 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 362.83 362.83">
|
||||
<defs>
|
||||
<style>
|
||||
.cls-1 {
|
||||
fill: #462d7a;
|
||||
}
|
||||
|
||||
.cls-2 {
|
||||
stroke: #2c1e50;
|
||||
}
|
||||
|
||||
.cls-2, .cls-3 {
|
||||
stroke-miterlimit: 10;
|
||||
}
|
||||
|
||||
.cls-3 {
|
||||
stroke: #fff;
|
||||
}
|
||||
</style>
|
||||
</defs>
|
||||
<g id="Layer_9" data-name="Layer 9">
|
||||
<path class="cls-2" d="M269.3,197.19c-5.77-11.54-85.59,16.83-154.76,27.39-21.09,3.22-38.13,4.31-47.3,4.75-.74,2.91-1.76,7.02-2.87,11.97-1.93,8.6-2.89,12.89-2.6,13.78,3.3,9.95,59.73-.88,99.18-7.64,32.67-5.6,115.14-18.96,114.61-30.77-.03-.69-1.11-4.01-3.27-10.65-1.78-5.47-2.67-8.2-2.98-8.83Z"/>
|
||||
</g>
|
||||
<g id="Layer_6" data-name="Layer 6">
|
||||
<path class="cls-1" d="M115.2,131.89c6.26-6.54,20.19-20.63,42.39-26.14,15.79-3.92,28.51-1.28,33.51,0,83.72,21.41,116.03,201.78,77.79,226.32-10.28,6.6-26.86,2.7-36.77-3.3-32.63-19.78-29.3-72.87-44.44-73.73-5.11-.29-7.15,5.8-20.91,24.94-19.63,27.3-31.49,43.44-49.21,50.87-2.53,1.06-26.91,12.07-41.84,1.23-38.55-28-2.96-155.84,39.49-200.18Zm56.31,10.45c-27.39-.52-46.38,38.21-37.98,54.55,10.09,19.62,65.5,18.26,74.77-3.3,7.21-16.78-11.38-50.77-36.79-51.24Z"/>
|
||||
</g>
|
||||
<g id="Layer_4" data-name="Layer 4">
|
||||
<path d="M68.93,86.51c-6.55,27.74,252.45,113.97,267.56,89.66,9.24-14.87-64.9-83.62-163.53-97.57-39.06-5.52-100.95-5.14-104.03,7.91Z"/>
|
||||
</g>
|
||||
<g id="Layer_5" data-name="Layer 5">
|
||||
<path class="cls-3" d="M138.96,93.76c.41-5.25,6.51-5.74,28.85-19.42,26.97-16.51,28.85-22.38,56.86-40.83,30.07-19.81,48.46-31.94,54.82-26.61,9.72,8.15-25.18,43.33-21.31,99.35,.87,12.61,3.12,17.79-.86,23.01-18.25,23.95-120.07-13.68-118.35-35.5Z"/>
|
||||
</g>
|
||||
</svg>
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><path d="M17.83 13.837c-.408-.817-6.058 1.191-10.953 1.939a32.559 32.559 0 0 1-3.348.336c-.052.206-.125.497-.203.847-.137.609-.205.912-.184.975.234.704 4.228-.062 7.02-.541 2.312-.396 8.149-1.342 8.112-2.178-.002-.049-.079-.284-.231-.754-.128-.386-.191-.579-.213-.624z"/><path fill="#462D7A" d="M6.923 9.216c.443-.463 1.429-1.46 3-1.85a4.876 4.876 0 0 1 2.372 0c5.925 1.515 8.212 14.281 5.506 16.018-.728.467-1.901.191-2.602-.234-2.309-1.4-2.074-5.158-3.145-5.218-.362-.021-.506.411-1.48 1.765-1.389 1.932-2.229 3.075-3.483 3.6-.179.075-1.905.854-2.961.087-2.73-1.981-.211-11.029 2.793-14.168zm3.986.739C8.97 9.918 7.626 12.66 8.22 13.816c.714 1.389 4.636 1.292 5.292-.234.511-1.187-.805-3.593-2.603-3.627z"/><path d="M3.648 6.004c-.463 1.963 17.868 8.066 18.937 6.346.654-1.052-4.593-5.918-11.574-6.906-2.764-.391-7.145-.364-7.363.56z"/><path stroke="#fff" stroke-width=".5" d="M8.605 6.517c.029-.372.461-.406 2.042-1.374 1.909-1.169 2.042-1.584 4.024-2.89C16.799.851 18.101-.008 18.551.37c.688.577-1.782 3.067-1.508 7.032.062.892.221 1.259-.061 1.629-1.292 1.694-8.498-.97-8.377-2.514z"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><path d="M17.83 13.837c-.408-.817-6.058 1.191-10.953 1.939a32.559 32.559 0 0 1-3.348.336c-.052.206-.125.497-.203.847-.137.609-.205.912-.184.975.234.704 4.228-.062 7.02-.541 2.312-.396 8.149-1.342 8.112-2.178-.002-.049-.079-.284-.231-.754-.128-.386-.191-.579-.213-.624z"/><path fill="#462D7A" d="M6.923 9.216c.443-.463 1.429-1.46 3-1.85a4.876 4.876 0 0 1 2.372 0c5.925 1.515 8.212 14.281 5.506 16.018-.728.467-1.901.191-2.602-.234-2.309-1.4-2.074-5.158-3.145-5.218-.362-.021-.506.411-1.48 1.765-1.389 1.932-2.229 3.075-3.483 3.6-.179.075-1.905.854-2.961.087-2.73-1.981-.211-11.029 2.793-14.168zm3.986.739C8.97 9.918 7.626 12.66 8.22 13.816c.714 1.389 4.636 1.292 5.292-.234.511-1.187-.805-3.593-2.603-3.627z"/><path d="M3.648 6.004c-.463 1.963 17.868 8.066 18.937 6.346.654-1.052-4.593-5.918-11.574-6.906-2.764-.391-7.145-.364-7.363.56z"/><path stroke="#fff" stroke-width=".5" d="M8.605 6.517c.029-.372.461-.406 2.042-1.374 1.909-1.169 2.042-1.584 4.024-2.89C16.799.851 18.101-.008 18.551.37c.688.577-1.782 3.067-1.508 7.032.062.892.221 1.259-.061 1.629-1.292 1.694-8.498-.97-8.377-2.514z"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
|
|
@ -1,41 +1 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M16.5714 13.7154H1.71429C0.7675 13.7154 0 14.4828 0 15.4296V30.2856C0 31.2324 0.7675 31.9998 1.71429 31.9998H16.5714C17.5182 31.9998 18.2857 31.2324 18.2857 30.2856V15.4296C18.2857 14.4828 17.5182 13.7154 16.5714 13.7154ZM4.57143 27.4287C3.30911 27.4287 2.28571 26.4054 2.28571 25.1432C2.28571 23.8809 3.30911 22.8576 4.57143 22.8576C5.83375 22.8576 6.85714 23.8809 6.85714 25.1432C6.85714 26.4054 5.83375 27.4287 4.57143 27.4287ZM10.2857 27.4287C9.0234 27.4287 8.00001 26.4054 8.00001 25.1432C8.00001 23.8809 9.0234 22.8576 10.2857 22.8576C11.548 22.8576 12.5714 23.8809 12.5714 25.1432C12.5714 26.4054 11.548 27.4287 10.2857 27.4287Z" fill="url(#paint0_linear_1_20)"/>
|
||||
<path d="M16.5714 13.7156H1.71429C0.7675 13.7156 0 14.483 0 15.4297V30.2858C0 31.2325 0.7675 32 1.71429 32H16.5714C17.5182 32 18.2857 31.2325 18.2857 30.2858V15.4297C18.2857 14.483 17.5182 13.7156 16.5714 13.7156ZM4.57143 27.4289C3.30911 27.4289 2.28571 26.4056 2.28571 25.1433C2.28571 23.8811 3.30911 22.8578 4.57143 22.8578C5.83375 22.8578 6.85714 23.8811 6.85714 25.1433C6.85714 26.4056 5.83375 27.4289 4.57143 27.4289ZM10.2857 27.4289C9.0234 27.4289 8.00001 26.4056 8.00001 25.1433C8.00001 23.8811 9.0234 22.8578 10.2857 22.8578C11.548 22.8578 12.5714 23.8811 12.5714 25.1433C12.5714 26.4056 11.548 27.4289 10.2857 27.4289Z" fill="url(#paint1_linear_1_20)"/>
|
||||
<path d="M16.5654 11.4242H8.70931C7.76324 11.4242 6.99609 10.6572 6.99609 9.71106V1.85555C6.99609 0.329404 8.84145 -0.434827 9.92056 0.644203L17.7766 8.49972C18.8559 9.57892 18.0915 11.424 16.5652 11.424L16.5654 11.4242Z" fill="url(#paint2_linear_1_20)"/>
|
||||
<path d="M30.2618 25.1432H22.3062C21.3482 25.1432 20.5714 24.3664 20.5714 23.4085V15.4535C20.5714 13.9081 22.44 13.134 23.5328 14.2268L31.4884 22.1818C32.5812 23.2745 31.8073 25.143 30.2616 25.143L30.2618 25.1432Z" fill="url(#paint3_linear_1_20)"/>
|
||||
<path d="M30.2618 11.4279H22.3062C21.3482 11.4279 20.5714 10.6512 20.5714 9.69319V1.73822C20.5714 0.192798 22.44 -0.581255 23.5328 0.511525L31.4884 8.46649C32.5812 9.55927 31.8073 11.4277 30.2616 11.4277L30.2618 11.4279Z" fill="url(#paint4_linear_1_20)"/>
|
||||
<defs>
|
||||
<linearGradient id="paint0_linear_1_20" x1="0.471606" y1="31.5284" x2="26.6497" y2="5.34823" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_1_20" x1="9.14286" y1="31.9266" x2="9.14286" y2="24.975" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#DB44DB" stop-opacity="0.3"/>
|
||||
<stop offset="0.11" stop-color="#DB44DB" stop-opacity="0.21"/>
|
||||
<stop offset="0.27" stop-color="#DB44DB" stop-opacity="0.12"/>
|
||||
<stop offset="0.44" stop-color="#DB44DB" stop-opacity="0.05"/>
|
||||
<stop offset="0.65" stop-color="#DB44DB" stop-opacity="0.01"/>
|
||||
<stop offset="1" stop-color="#DB44DB" stop-opacity="0"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_1_20" x1="-6.2723" y1="24.6916" x2="20.547" y2="-2.12947" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint3_linear_1_20" x1="7.36249" y1="38.3512" x2="34.2" y2="11.5119" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint4_linear_1_20" x1="0.504457" y1="31.4934" x2="27.3418" y2="4.65415" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="294.716" y1="-381.222" x2="313.86" y2="-362.076" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#a)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.448a1.255 1.255 0 0 0-1.254-1.253zM3.714 20.223a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="301.057" y1="-381.513" x2="301.057" y2="-376.429" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#b358a2;stop-opacity:.3"/><stop offset=".11" style="stop-color:#b358a2;stop-opacity:.21"/><stop offset=".27" style="stop-color:#b358a2;stop-opacity:.12"/><stop offset=".44" style="stop-color:#b358a2;stop-opacity:.05"/><stop offset=".65" style="stop-color:#b358a2;stop-opacity:.01"/><stop offset="1" style="stop-color:#b358a2;stop-opacity:0"/></linearGradient><path fill="url(#b)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.449a1.255 1.255 0 0 0-1.254-1.254zM3.714 20.224a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="289.785" y1="-376.223" x2="309.398" y2="-356.608" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#c)" d="M12.485 8.519H6.74a1.253 1.253 0 0 1-1.253-1.253V1.522c0-1.116 1.35-1.675 2.139-.886l5.745 5.745c.789.789.23 2.138-.886 2.138z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="299.756" y1="-386.212" x2="319.382" y2="-366.584" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#d)" d="M22.501 18.552h-5.818a1.269 1.269 0 0 1-1.269-1.269v-5.817c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="294.741" y1="-381.197" x2="314.367" y2="-361.57" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#e)" d="M22.501 8.522h-5.818a1.269 1.269 0 0 1-1.269-1.269V1.436c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="294.716" y1="-381.222" x2="313.86" y2="-362.076" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#a)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.448a1.255 1.255 0 0 0-1.254-1.253zM3.714 20.223a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="301.057" y1="-381.513" x2="301.057" y2="-376.429" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#b358a2;stop-opacity:.3"/><stop offset=".11" style="stop-color:#b358a2;stop-opacity:.21"/><stop offset=".27" style="stop-color:#b358a2;stop-opacity:.12"/><stop offset=".44" style="stop-color:#b358a2;stop-opacity:.05"/><stop offset=".65" style="stop-color:#b358a2;stop-opacity:.01"/><stop offset="1" style="stop-color:#b358a2;stop-opacity:0"/></linearGradient><path fill="url(#b)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.449a1.255 1.255 0 0 0-1.254-1.254zM3.714 20.224a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="289.785" y1="-376.223" x2="309.398" y2="-356.608" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#c)" d="M12.485 8.519H6.74a1.253 1.253 0 0 1-1.253-1.253V1.522c0-1.116 1.35-1.675 2.139-.886l5.745 5.745c.789.789.23 2.138-.886 2.138z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="299.756" y1="-386.212" x2="319.382" y2="-366.584" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#d)" d="M22.501 18.552h-5.818a1.269 1.269 0 0 1-1.269-1.269v-5.817c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="294.741" y1="-381.197" x2="314.367" y2="-361.57" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#e)" d="M22.501 8.522h-5.818a1.269 1.269 0 0 1-1.269-1.269V1.436c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="294.716" y1="-381.222" x2="313.86" y2="-362.076" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#a)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.448a1.255 1.255 0 0 0-1.254-1.253zM3.714 20.223a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="301.057" y1="-381.513" x2="301.057" y2="-376.429" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#b358a2;stop-opacity:.3"/><stop offset=".11" style="stop-color:#b358a2;stop-opacity:.21"/><stop offset=".27" style="stop-color:#b358a2;stop-opacity:.12"/><stop offset=".44" style="stop-color:#b358a2;stop-opacity:.05"/><stop offset=".65" style="stop-color:#b358a2;stop-opacity:.01"/><stop offset="1" style="stop-color:#b358a2;stop-opacity:0"/></linearGradient><path fill="url(#b)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.449a1.255 1.255 0 0 0-1.254-1.254zM3.714 20.224a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="289.785" y1="-376.223" x2="309.398" y2="-356.608" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#c)" d="M12.485 8.519H6.74a1.253 1.253 0 0 1-1.253-1.253V1.522c0-1.116 1.35-1.675 2.139-.886l5.745 5.745c.789.789.23 2.138-.886 2.138z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="299.756" y1="-386.212" x2="319.382" y2="-366.584" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#d)" d="M22.501 18.552h-5.818a1.269 1.269 0 0 1-1.269-1.269v-5.817c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="294.741" y1="-381.197" x2="314.367" y2="-361.57" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#e)" d="M22.501 8.522h-5.818a1.269 1.269 0 0 1-1.269-1.269V1.436c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/></svg>
|
||||
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 2.7 KiB |
|
|
@ -1,41 +0,0 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M16.5714 13.7154H1.71429C0.7675 13.7154 0 14.4828 0 15.4296V30.2856C0 31.2324 0.7675 31.9998 1.71429 31.9998H16.5714C17.5182 31.9998 18.2857 31.2324 18.2857 30.2856V15.4296C18.2857 14.4828 17.5182 13.7154 16.5714 13.7154ZM4.57143 27.4287C3.30911 27.4287 2.28571 26.4054 2.28571 25.1432C2.28571 23.8809 3.30911 22.8576 4.57143 22.8576C5.83375 22.8576 6.85714 23.8809 6.85714 25.1432C6.85714 26.4054 5.83375 27.4287 4.57143 27.4287ZM10.2857 27.4287C9.0234 27.4287 8.00001 26.4054 8.00001 25.1432C8.00001 23.8809 9.0234 22.8576 10.2857 22.8576C11.548 22.8576 12.5714 23.8809 12.5714 25.1432C12.5714 26.4054 11.548 27.4287 10.2857 27.4287Z" fill="url(#paint0_linear_1_20)"/>
|
||||
<path d="M16.5714 13.7156H1.71429C0.7675 13.7156 0 14.483 0 15.4297V30.2858C0 31.2325 0.7675 32 1.71429 32H16.5714C17.5182 32 18.2857 31.2325 18.2857 30.2858V15.4297C18.2857 14.483 17.5182 13.7156 16.5714 13.7156ZM4.57143 27.4289C3.30911 27.4289 2.28571 26.4056 2.28571 25.1433C2.28571 23.8811 3.30911 22.8578 4.57143 22.8578C5.83375 22.8578 6.85714 23.8811 6.85714 25.1433C6.85714 26.4056 5.83375 27.4289 4.57143 27.4289ZM10.2857 27.4289C9.0234 27.4289 8.00001 26.4056 8.00001 25.1433C8.00001 23.8811 9.0234 22.8578 10.2857 22.8578C11.548 22.8578 12.5714 23.8811 12.5714 25.1433C12.5714 26.4056 11.548 27.4289 10.2857 27.4289Z" fill="url(#paint1_linear_1_20)"/>
|
||||
<path d="M16.5654 11.4242H8.70931C7.76324 11.4242 6.99609 10.6572 6.99609 9.71106V1.85555C6.99609 0.329404 8.84145 -0.434827 9.92056 0.644203L17.7766 8.49972C18.8559 9.57892 18.0915 11.424 16.5652 11.424L16.5654 11.4242Z" fill="url(#paint2_linear_1_20)"/>
|
||||
<path d="M30.2618 25.1432H22.3062C21.3482 25.1432 20.5714 24.3664 20.5714 23.4085V15.4535C20.5714 13.9081 22.44 13.134 23.5328 14.2268L31.4884 22.1818C32.5812 23.2745 31.8073 25.143 30.2616 25.143L30.2618 25.1432Z" fill="url(#paint3_linear_1_20)"/>
|
||||
<path d="M30.2618 11.4279H22.3062C21.3482 11.4279 20.5714 10.6512 20.5714 9.69319V1.73822C20.5714 0.192798 22.44 -0.581255 23.5328 0.511525L31.4884 8.46649C32.5812 9.55927 31.8073 11.4277 30.2616 11.4277L30.2618 11.4279Z" fill="url(#paint4_linear_1_20)"/>
|
||||
<defs>
|
||||
<linearGradient id="paint0_linear_1_20" x1="0.471606" y1="31.5284" x2="26.6497" y2="5.34823" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint1_linear_1_20" x1="9.14286" y1="31.9266" x2="9.14286" y2="24.975" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#DB44DB" stop-opacity="0.3"/>
|
||||
<stop offset="0.11" stop-color="#DB44DB" stop-opacity="0.21"/>
|
||||
<stop offset="0.27" stop-color="#DB44DB" stop-opacity="0.12"/>
|
||||
<stop offset="0.44" stop-color="#DB44DB" stop-opacity="0.05"/>
|
||||
<stop offset="0.65" stop-color="#DB44DB" stop-opacity="0.01"/>
|
||||
<stop offset="1" stop-color="#DB44DB" stop-opacity="0"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint2_linear_1_20" x1="-6.2723" y1="24.6916" x2="20.547" y2="-2.12947" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint3_linear_1_20" x1="7.36249" y1="38.3512" x2="34.2" y2="11.5119" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="paint4_linear_1_20" x1="0.504457" y1="31.4934" x2="27.3418" y2="4.65415" gradientUnits="userSpaceOnUse">
|
||||
<stop stop-color="#EC476D"/>
|
||||
<stop offset="1" stop-color="#F6AE4A"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
</svg>
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="294.716" y1="-381.222" x2="313.86" y2="-362.076" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#a)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.448a1.255 1.255 0 0 0-1.254-1.253zM3.714 20.223a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="301.057" y1="-381.513" x2="301.057" y2="-376.429" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#b358a2;stop-opacity:.3"/><stop offset=".11" style="stop-color:#b358a2;stop-opacity:.21"/><stop offset=".27" style="stop-color:#b358a2;stop-opacity:.12"/><stop offset=".44" style="stop-color:#b358a2;stop-opacity:.05"/><stop offset=".65" style="stop-color:#b358a2;stop-opacity:.01"/><stop offset="1" style="stop-color:#b358a2;stop-opacity:0"/></linearGradient><path fill="url(#b)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.449a1.255 1.255 0 0 0-1.254-1.254zM3.714 20.224a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="289.785" y1="-376.223" x2="309.398" y2="-356.608" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#c)" d="M12.485 8.519H6.74a1.253 1.253 0 0 1-1.253-1.253V1.522c0-1.116 1.35-1.675 2.139-.886l5.745 5.745c.789.789.23 2.138-.886 2.138z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="299.756" y1="-386.212" x2="319.382" y2="-366.584" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#d)" d="M22.501 18.552h-5.818a1.269 1.269 0 0 1-1.269-1.269v-5.817c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="294.741" y1="-381.197" x2="314.367" y2="-361.57" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#e)" d="M22.501 8.522h-5.818a1.269 1.269 0 0 1-1.269-1.269V1.436c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="294.716" y1="-381.222" x2="313.86" y2="-362.076" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#a)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.448a1.255 1.255 0 0 0-1.254-1.253zM3.714 20.223a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="301.057" y1="-381.513" x2="301.057" y2="-376.429" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#b358a2;stop-opacity:.3"/><stop offset=".11" style="stop-color:#b358a2;stop-opacity:.21"/><stop offset=".27" style="stop-color:#b358a2;stop-opacity:.12"/><stop offset=".44" style="stop-color:#b358a2;stop-opacity:.05"/><stop offset=".65" style="stop-color:#b358a2;stop-opacity:.01"/><stop offset="1" style="stop-color:#b358a2;stop-opacity:0"/></linearGradient><path fill="url(#b)" d="M12.49 10.195H1.625c-.692 0-1.254.561-1.254 1.254v10.864c0 .692.561 1.254 1.254 1.254H12.49c.692 0 1.254-.561 1.254-1.254V11.449a1.255 1.255 0 0 0-1.254-1.254zM3.714 20.224a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343zm4.179 0a1.672 1.672 0 1 1 0-3.343 1.672 1.672 0 0 1 0 3.343z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="289.785" y1="-376.223" x2="309.398" y2="-356.608" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#c)" d="M12.485 8.519H6.74a1.253 1.253 0 0 1-1.253-1.253V1.522c0-1.116 1.35-1.675 2.139-.886l5.745 5.745c.789.789.23 2.138-.886 2.138z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="299.756" y1="-386.212" x2="319.382" y2="-366.584" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#d)" d="M22.501 18.552h-5.818a1.269 1.269 0 0 1-1.269-1.269v-5.817c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/><linearGradient id="e" gradientUnits="userSpaceOnUse" x1="294.741" y1="-381.197" x2="314.367" y2="-361.57" gradientTransform="matrix(1 0 0 -1 -294 -358)"><stop offset="0" style="stop-color:#ed496d"/><stop offset="1" style="stop-color:#f5ae4b"/></linearGradient><path fill="url(#e)" d="M22.501 8.522h-5.818a1.269 1.269 0 0 1-1.269-1.269V1.436c0-1.13 1.367-1.696 2.166-.897l5.818 5.817c.8.799.234 2.166-.897 2.166z"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
|
|
@ -1,16 +0,0 @@
|
|||
<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg">
|
||||
<defs>
|
||||
<linearGradient x1="50%" y1="0%" x2="77.135%" y2="77.109%" id="a">
|
||||
<stop stop-color="#FE7E1F" offset="0%"/>
|
||||
<stop stop-color="#FFCF7B" offset="100%"/>
|
||||
</linearGradient>
|
||||
<linearGradient x1="50%" y1="0%" x2="77.135%" y2="77.109%" id="b">
|
||||
<stop stop-color="#FFF" stop-opacity=".48" offset="0%"/>
|
||||
<stop stop-color="#FFF" stop-opacity="0" offset="100%"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<g fill="none" fill-rule="evenodd">
|
||||
<path d="M16 0C7.163 0 0 7.163 0 16s7.163 16 16 16 16-7.163 16-16C31.99 7.168 24.832.01 16 0z" fill="url(#a)"/>
|
||||
<path d="M29.012 25.313A11.98 11.98 0 0 1 25 26c-6.627 0-12-5.373-12-12 0-6.235 4.756-11.36 10.838-11.944C28.705 4.8 31.993 10.016 32 16c0 3.474-1.107 6.69-2.988 9.313z" fill="url(#b)"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 850 B |
|
|
@ -1,69 +1 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 226.8 334.5" style="enable-background:new 0 0 226.8 334.5;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#0F554B;}
|
||||
.st1{fill:#14968C;}
|
||||
</style>
|
||||
<g>
|
||||
<g>
|
||||
<path class="st0" d="M29.2,310.6c-1.2-1.2-2.7-2.2-4.4-3c-1.7-0.8-3.7-1.6-5.8-2.4c-1.2-0.4-2.3-0.9-3.4-1.4c-1-0.5-1.9-1-2.6-1.5
|
||||
c-0.7-0.5-1.3-1.1-1.6-1.8c-0.4-0.6-0.6-1.4-0.6-2.3c0-1.5,0.5-2.6,1.7-3.5c1.2-0.9,2.8-1.3,4.9-1.3c1.8,0,3.7,0.2,5.4,0.6
|
||||
c1.7,0.4,3.3,1.1,4.8,1.9c0.1,0.1,0.3,0.1,0.5,0c0.2-0.1,0.3-0.2,0.3-0.3l2.6-6.8c0.1-0.3,0-0.5-0.2-0.7c-1.3-0.8-3.1-1.5-5.4-2.1
|
||||
c-2.3-0.7-4.9-1-7.8-1c-5.1,0-9.1,1.2-12.1,3.7c-3,2.5-4.5,5.9-4.5,10.2c0,2.1,0.4,3.9,1.1,5.3c0.7,1.5,1.7,2.8,2.8,3.8
|
||||
c1.2,1,2.5,1.9,4,2.6c1.5,0.7,3.1,1.3,4.7,1.9c1.6,0.5,3,1.1,4.2,1.6c1.2,0.5,2.2,1.1,3,1.7c0.8,0.6,1.4,1.3,1.8,2
|
||||
c0.4,0.7,0.6,1.6,0.6,2.6c0,1.7-0.6,2.9-1.8,3.9c-1.3,0.9-3.4,1.4-6.2,1.4c-2.8,0-5.2-0.3-7.2-1c-2-0.6-3.6-1.3-4.7-1.9
|
||||
c-0.1-0.1-0.3-0.1-0.5,0c-0.2,0.1-0.3,0.2-0.3,0.3L0,329.9c-0.1,0.2,0,0.5,0.2,0.7c0.6,0.3,1.3,0.7,2.2,1.1c0.9,0.4,2,0.8,3.2,1.1
|
||||
c1.2,0.4,2.7,0.7,4.2,0.9c1.6,0.2,3.4,0.4,5.3,0.4c5.7,0,10.2-1.2,13.2-3.5c3.1-2.4,4.6-5.8,4.6-10.1c0-2.2-0.3-4.2-1-5.7
|
||||
C31.4,313.1,30.5,311.7,29.2,310.6z"/>
|
||||
<path class="st0" d="M67.5,327.3c-1.2-1.8-2.5-3.6-3.9-5.3c-1.4-1.8-2.8-3.5-4.3-5c-1.3-1.4-2.6-2.6-3.8-3.7
|
||||
c2.3-2.4,4.7-4.8,7-7.3c2.5-2.7,4.8-5.3,7-7.7c0.1-0.2,0.2-0.4,0.1-0.6c-0.1-0.2-0.3-0.3-0.5-0.3h-9.5c-0.2,0-0.3,0.1-0.4,0.2
|
||||
c-0.7,0.8-1.6,1.8-2.5,2.9c-1,1.1-2,2.3-3.1,3.5c-1.1,1.2-2.2,2.4-3.4,3.6c-0.8,0.8-1.6,1.6-2.3,2.4v-28.9c0-0.2-0.1-0.3-0.2-0.4
|
||||
c-0.1-0.1-0.3-0.2-0.4-0.1l-8,1.3c-0.3,0-0.5,0.3-0.5,0.5v50c0,0.3,0.2,0.6,0.6,0.6h8c0.3,0,0.6-0.2,0.6-0.6v-14.8
|
||||
c0.9,0.7,1.8,1.5,2.7,2.5c1.2,1.2,2.4,2.6,3.6,4c1.2,1.4,2.3,2.9,3.3,4.3c1,1.5,1.9,2.9,2.7,4.3c0.1,0.2,0.3,0.3,0.5,0.3h9.3
|
||||
c0.2,0,0.4-0.1,0.5-0.3c0.1-0.2,0.1-0.4,0-0.5C69.7,330.7,68.7,329.1,67.5,327.3z"/>
|
||||
<path class="st0" d="M101.3,301.6c-1.5-1.6-3.3-2.9-5.5-3.8c-2.1-0.9-4.4-1.3-6.9-1.3c-2.5,0-4.8,0.4-6.9,1.3
|
||||
c-2.1,0.9-3.9,2.2-5.5,3.8c-1.5,1.6-2.7,3.6-3.6,5.9c-0.8,2.3-1.3,4.8-1.3,7.6c0,2.8,0.4,5.4,1.3,7.7c0.8,2.3,2,4.3,3.5,5.9
|
||||
c1.5,1.6,3.3,2.9,5.4,3.8c2.1,0.9,4.4,1.4,7,1.4c2.5,0,4.9-0.5,7-1.4c2.1-0.9,3.9-2.2,5.5-3.8c1.5-1.6,2.7-3.6,3.5-5.9
|
||||
c0.8-2.3,1.2-4.9,1.2-7.7c0-2.8-0.4-5.4-1.3-7.6C103.9,305.2,102.7,303.2,101.3,301.6z M96.7,315.2c0,3.4-0.7,6-2.1,7.9
|
||||
c-1.4,1.9-3.3,2.8-5.7,2.8c-2.5,0-4.4-0.9-5.7-2.8c-1.4-1.9-2.1-4.6-2.1-7.9c0-3.3,0.7-5.9,2.1-7.8c1.4-1.9,3.3-2.8,5.7-2.8
|
||||
c2.5,0,4.4,0.9,5.7,2.8C96,309.2,96.7,311.9,96.7,315.2z"/>
|
||||
<path class="st0" d="M150.8,286.1h-8.3c-0.3,0-0.6,0.2-0.6,0.6v17.8H123v-17.8c0-0.3-0.2-0.6-0.6-0.6h-8.3c-0.3,0-0.6,0.2-0.6,0.6
|
||||
v45.9c0,0.3,0.2,0.6,0.6,0.6h8.3c0.3,0,0.6-0.2,0.6-0.6v-19.8h18.8v19.8c0,0.3,0.2,0.6,0.6,0.6h8.3c0.3,0,0.6-0.2,0.6-0.6v-45.9
|
||||
C151.3,286.3,151.1,286.1,150.8,286.1z"/>
|
||||
<path class="st0" d="M187.2,297.3h-8c-0.3,0-0.6,0.2-0.6,0.6v27.6c-0.5,0.1-1.1,0.2-1.9,0.2c-1.1,0.1-2.1,0.1-3,0.1
|
||||
c-2.5,0-4.2-0.7-5.2-2.1c-1-1.5-1.5-4.1-1.5-7.6v-18.1c0-0.3-0.2-0.6-0.6-0.6h-8c-0.3,0-0.6,0.2-0.6,0.6v19.4
|
||||
c0,2.4,0.2,4.6,0.7,6.6c0.5,2,1.4,3.8,2.5,5.3c1.2,1.5,2.8,2.6,4.7,3.5c1.9,0.8,4.4,1.2,7.2,1.2c3,0,5.7-0.2,8.2-0.6
|
||||
c2.5-0.4,4.5-0.8,6.1-1.2c0.2-0.1,0.4-0.3,0.4-0.5v-33.6C187.8,297.6,187.6,297.3,187.2,297.3z"/>
|
||||
<path class="st0" d="M225.6,307.7c-0.7-2.3-1.7-4.3-3-5.9c-1.3-1.7-3-2.9-5-3.8c-2-0.9-4.2-1.3-6.7-1.3c-1.7,0-3.2,0.2-4.6,0.6
|
||||
c-1,0.3-1.9,0.6-2.7,1v-17.1c0-0.2-0.1-0.3-0.2-0.4c-0.1-0.1-0.3-0.2-0.4-0.1l-8,1.3c-0.3,0-0.5,0.3-0.5,0.5v49
|
||||
c0,0.2,0.2,0.5,0.4,0.5c1.6,0.5,3.6,0.9,6.1,1.3c2.4,0.4,5,0.6,7.7,0.6c2.8,0,5.3-0.4,7.5-1.3c2.2-0.9,4.2-2.1,5.7-3.8
|
||||
c1.6-1.6,2.8-3.6,3.6-5.9c0.8-2.3,1.3-4.9,1.3-7.7C226.7,312.5,226.3,310,225.6,307.7z M217.4,315.1c0,3.4-0.8,6.1-2.4,8
|
||||
c-1.6,1.9-3.7,2.8-6.5,2.8c-1.3,0-2.3-0.1-3.2-0.2c-0.7-0.1-1.3-0.2-1.7-0.3v-19.2c0.6-0.4,1.5-0.8,2.4-1.1
|
||||
c1.1-0.4,2.3-0.6,3.6-0.6c2.7,0,4.7,0.9,5.9,2.7C216.7,309.2,217.4,311.8,217.4,315.1z"/>
|
||||
</g>
|
||||
<g>
|
||||
<g>
|
||||
<g>
|
||||
<path class="st1" d="M189.7,123.8L56,45.3C43,37.6,23.3,23.5,19.6,0.4l-8.9,15.7c-28.1,49.4,6.8,76,26.6,87.5l133.7,78.6
|
||||
c13,7.6,32.7,21.8,36.4,44.8l8.9-15.7C244.3,162,209.4,135.4,189.7,123.8z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st1" d="M0.1,139.2v31.2c0,31.2,25.5,56.7,56.7,56.7h71.9l-96.5-56.7C21.9,164.4,7.6,154.4,0.1,139.2z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st1" d="M170.1,0.4H98.2l96.5,56.7c10.2,6,24.5,16,32,31.1V57.1C226.8,25.9,201.3,0.4,170.1,0.4z"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><g fill="#12554C"><path d="M6.191 22.177a1.096 1.096 0 0 0-.309-.211 6.585 6.585 0 0 0-.407-.169 2.146 2.146 0 0 1-.24-.097c-.07-.035-.133-.07-.183-.105s-.091-.077-.112-.126a.291.291 0 0 1-.042-.162c0-.105.035-.183.119-.246s.197-.091.344-.091a1.409 1.409 0 0 1 .716.175c.007.007.021.007.035 0 .014-.007.021-.014.021-.021l.183-.478c.007-.021 0-.035-.014-.049a1.458 1.458 0 0 0-.379-.148 1.892 1.892 0 0 0-.548-.07c-.358 0-.639.084-.85.26-.211.176-.316.415-.316.717a.834.834 0 0 0 .274.639c.084.07.176.133.281.183.105.049.218.091.33.133.112.035.211.077.295.112.084.035.155.077.211.119s.098.091.126.141a.37.37 0 0 1 .042.183.331.331 0 0 1-.126.274c-.091.063-.239.098-.436.098s-.365-.021-.506-.07a1.74 1.74 0 0 1-.33-.133c-.007-.007-.021-.007-.035 0-.014.007-.021.014-.021.021l-.176.478c-.007.014 0 .035.014.049.042.021.091.049.155.077.063.028.141.056.225.077.084.028.19.049.295.063.112.014.239.028.372.028.4 0 .717-.084.927-.246.218-.169.323-.407.323-.71a.972.972 0 0 0-.07-.4.595.595 0 0 0-.188-.295zM8.881 23.351a4.616 4.616 0 0 0-.274-.372 4.55 4.55 0 0 0-.569-.611c.162-.169.33-.337.492-.513.176-.19.337-.372.492-.541.007-.014.014-.028.007-.042a.038.038 0 0 0-.035-.021h-.668c-.014 0-.021.007-.028.014-.049.056-.112.126-.176.204-.07.077-.141.162-.218.246a7.935 7.935 0 0 1-.239.253c-.056.056-.112.112-.162.169v-2.03c0-.014-.007-.021-.014-.028-.007-.007-.021-.014-.028-.007l-.561.089c-.021 0-.035.021-.035.035v3.513c0 .021.014.042.042.042h.562c.021 0 .042-.014.042-.042v-1.04c.063.049.126.105.19.176a5.087 5.087 0 0 1 .485.583c.07.105.133.204.19.302a.038.038 0 0 0 .035.021h.653a.038.038 0 0 0 .035-.021c.007-.014.007-.028 0-.035a7.51 7.51 0 0 0-.218-.344zM11.256 21.545a1.09 1.09 0 0 0-.386-.267c-.148-.063-.309-.091-.485-.091s-.337.028-.485.091-.274.155-.386.267c-.105.112-.19.253-.253.415a1.61 1.61 0 0 0-.091.534c0 .197.028.379.091.541a1.127 1.127 0 0 0 .625.682c.148.063.309.098.492.098.176 0 .344-.035.492-.098a1.22 1.22 0 0 0 .386-.267c.105-.112.19-.253.246-.415s.084-.344.084-.541c0-.197-.028-.379-.091-.534a1.266 1.266 0 0 0-.239-.415zm-.323.956c0 .239-.049.422-.148.555a.47.47 0 0 1-.4.197c-.176 0-.309-.063-.4-.197-.098-.133-.148-.323-.148-.555s.049-.415.148-.548a.47.47 0 0 1 .4-.197c.176 0 .309.063.4.197.099.126.148.316.148.548zM14.734 20.456h-.583c-.021 0-.042.014-.042.042v1.251h-1.328v-1.251c0-.021-.014-.042-.042-.042h-.583c-.021 0-.042.014-.042.042v3.225c0 .021.014.042.042.042h.583c.021 0 .042-.014.042-.042v-1.391h1.321v1.391c0 .021.014.042.042.042h.583c.021 0 .042-.014.042-.042v-3.225c0-.028-.014-.042-.035-.042zM17.291 21.243h-.562c-.021 0-.042.014-.042.042v1.939a.644.644 0 0 1-.133.014c-.077.007-.148.007-.211.007-.176 0-.295-.049-.365-.148-.07-.105-.105-.288-.105-.534v-1.272c0-.021-.014-.042-.042-.042h-.562c-.021 0-.042.014-.042.042v1.363c0 .169.014.323.049.464.035.141.098.267.176.372a.908.908 0 0 0 .33.246c.133.056.309.084.506.084.211 0 .4-.014.576-.042.176-.028.316-.056.429-.084.014-.007.028-.021.028-.035v-2.361c.012-.034-.002-.055-.03-.055zM19.989 21.974a1.203 1.203 0 0 0-.211-.415.887.887 0 0 0-.351-.267 1.131 1.131 0 0 0-.471-.091 1.164 1.164 0 0 0-.513.112v-1.201c0-.014-.007-.021-.014-.028-.007-.007-.021-.014-.028-.007l-.562.091c-.021 0-.035.021-.035.035v3.443c0 .014.014.035.028.035.112.035.253.063.429.091.169.028.351.042.541.042.197 0 .372-.028.527-.091a1.05 1.05 0 0 0 .4-.267c.112-.112.197-.253.253-.415s.091-.344.091-.541a2.068 2.068 0 0 0-.084-.526zm-.576.52c0 .239-.056.429-.169.562a.558.558 0 0 1-.457.197c-.091 0-.162-.007-.225-.014a1.312 1.312 0 0 1-.119-.021v-1.349a.742.742 0 0 1 .169-.077.738.738 0 0 1 .253-.042c.19 0 .33.063.415.19.084.139.133.322.133.554z"/></g><path fill="#18968C" d="M17.467 9.054 8.073 3.538C7.16 2.997 5.776 2.007 5.516.384l-.625 1.103c-1.974 3.471.478 5.339 1.869 6.147l9.393 5.522c.913.534 2.297 1.532 2.557 3.147l.625-1.103c1.968-3.463-.484-5.331-1.868-6.146zM4.146 10.136v2.192a3.995 3.995 0 0 0 3.984 3.984h5.051l-6.78-3.984c-.723-.422-1.728-1.125-2.255-2.192zM16.09.384h-5.051l6.78 3.984c.717.422 1.721 1.124 2.248 2.185V4.367A3.984 3.984 0 0 0 16.09.384z"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><g fill="#12554C"><path d="M6.191 22.177a1.096 1.096 0 0 0-.309-.211 6.585 6.585 0 0 0-.407-.169 2.146 2.146 0 0 1-.24-.097c-.07-.035-.133-.07-.183-.105s-.091-.077-.112-.126a.291.291 0 0 1-.042-.162c0-.105.035-.183.119-.246s.197-.091.344-.091a1.409 1.409 0 0 1 .716.175c.007.007.021.007.035 0 .014-.007.021-.014.021-.021l.183-.478c.007-.021 0-.035-.014-.049a1.458 1.458 0 0 0-.379-.148 1.892 1.892 0 0 0-.548-.07c-.358 0-.639.084-.85.26-.211.176-.316.415-.316.717a.834.834 0 0 0 .274.639c.084.07.176.133.281.183.105.049.218.091.33.133.112.035.211.077.295.112.084.035.155.077.211.119s.098.091.126.141a.37.37 0 0 1 .042.183.331.331 0 0 1-.126.274c-.091.063-.239.098-.436.098s-.365-.021-.506-.07a1.74 1.74 0 0 1-.33-.133c-.007-.007-.021-.007-.035 0-.014.007-.021.014-.021.021l-.176.478c-.007.014 0 .035.014.049.042.021.091.049.155.077.063.028.141.056.225.077.084.028.19.049.295.063.112.014.239.028.372.028.4 0 .717-.084.927-.246.218-.169.323-.407.323-.71a.972.972 0 0 0-.07-.4.595.595 0 0 0-.188-.295zM8.881 23.351a4.616 4.616 0 0 0-.274-.372 4.55 4.55 0 0 0-.569-.611c.162-.169.33-.337.492-.513.176-.19.337-.372.492-.541.007-.014.014-.028.007-.042a.038.038 0 0 0-.035-.021h-.668c-.014 0-.021.007-.028.014-.049.056-.112.126-.176.204-.07.077-.141.162-.218.246a7.935 7.935 0 0 1-.239.253c-.056.056-.112.112-.162.169v-2.03c0-.014-.007-.021-.014-.028-.007-.007-.021-.014-.028-.007l-.561.089c-.021 0-.035.021-.035.035v3.513c0 .021.014.042.042.042h.562c.021 0 .042-.014.042-.042v-1.04c.063.049.126.105.19.176a5.087 5.087 0 0 1 .485.583c.07.105.133.204.19.302a.038.038 0 0 0 .035.021h.653a.038.038 0 0 0 .035-.021c.007-.014.007-.028 0-.035a7.51 7.51 0 0 0-.218-.344zM11.256 21.545a1.09 1.09 0 0 0-.386-.267c-.148-.063-.309-.091-.485-.091s-.337.028-.485.091-.274.155-.386.267c-.105.112-.19.253-.253.415a1.61 1.61 0 0 0-.091.534c0 .197.028.379.091.541a1.127 1.127 0 0 0 .625.682c.148.063.309.098.492.098.176 0 .344-.035.492-.098a1.22 1.22 0 0 0 .386-.267c.105-.112.19-.253.246-.415s.084-.344.084-.541c0-.197-.028-.379-.091-.534a1.266 1.266 0 0 0-.239-.415zm-.323.956c0 .239-.049.422-.148.555a.47.47 0 0 1-.4.197c-.176 0-.309-.063-.4-.197-.098-.133-.148-.323-.148-.555s.049-.415.148-.548a.47.47 0 0 1 .4-.197c.176 0 .309.063.4.197.099.126.148.316.148.548zM14.734 20.456h-.583c-.021 0-.042.014-.042.042v1.251h-1.328v-1.251c0-.021-.014-.042-.042-.042h-.583c-.021 0-.042.014-.042.042v3.225c0 .021.014.042.042.042h.583c.021 0 .042-.014.042-.042v-1.391h1.321v1.391c0 .021.014.042.042.042h.583c.021 0 .042-.014.042-.042v-3.225c0-.028-.014-.042-.035-.042zM17.291 21.243h-.562c-.021 0-.042.014-.042.042v1.939a.644.644 0 0 1-.133.014c-.077.007-.148.007-.211.007-.176 0-.295-.049-.365-.148-.07-.105-.105-.288-.105-.534v-1.272c0-.021-.014-.042-.042-.042h-.562c-.021 0-.042.014-.042.042v1.363c0 .169.014.323.049.464.035.141.098.267.176.372a.908.908 0 0 0 .33.246c.133.056.309.084.506.084.211 0 .4-.014.576-.042.176-.028.316-.056.429-.084.014-.007.028-.021.028-.035v-2.361c.012-.034-.002-.055-.03-.055zM19.989 21.974a1.203 1.203 0 0 0-.211-.415.887.887 0 0 0-.351-.267 1.131 1.131 0 0 0-.471-.091 1.164 1.164 0 0 0-.513.112v-1.201c0-.014-.007-.021-.014-.028-.007-.007-.021-.014-.028-.007l-.562.091c-.021 0-.035.021-.035.035v3.443c0 .014.014.035.028.035.112.035.253.063.429.091.169.028.351.042.541.042.197 0 .372-.028.527-.091a1.05 1.05 0 0 0 .4-.267c.112-.112.197-.253.253-.415s.091-.344.091-.541a2.068 2.068 0 0 0-.084-.526zm-.576.52c0 .239-.056.429-.169.562a.558.558 0 0 1-.457.197c-.091 0-.162-.007-.225-.014a1.312 1.312 0 0 1-.119-.021v-1.349a.742.742 0 0 1 .169-.077.738.738 0 0 1 .253-.042c.19 0 .33.063.415.19.084.139.133.322.133.554z"/></g><path fill="#18968C" d="M17.467 9.054 8.073 3.538C7.16 2.997 5.776 2.007 5.516.384l-.625 1.103c-1.974 3.471.478 5.339 1.869 6.147l9.393 5.522c.913.534 2.297 1.532 2.557 3.147l.625-1.103c1.968-3.463-.484-5.331-1.868-6.146zM4.146 10.136v2.192a3.995 3.995 0 0 0 3.984 3.984h5.051l-6.78-3.984c-.723-.422-1.728-1.125-2.255-2.192zM16.09.384h-5.051l6.78 3.984c.717.422 1.721 1.124 2.248 2.185V4.367A3.984 3.984 0 0 0 16.09.384z"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><g fill="#12554C"><path d="M6.191 22.177a1.096 1.096 0 0 0-.309-.211 6.585 6.585 0 0 0-.407-.169 2.146 2.146 0 0 1-.24-.097c-.07-.035-.133-.07-.183-.105s-.091-.077-.112-.126a.291.291 0 0 1-.042-.162c0-.105.035-.183.119-.246s.197-.091.344-.091a1.409 1.409 0 0 1 .716.175c.007.007.021.007.035 0 .014-.007.021-.014.021-.021l.183-.478c.007-.021 0-.035-.014-.049a1.458 1.458 0 0 0-.379-.148 1.892 1.892 0 0 0-.548-.07c-.358 0-.639.084-.85.26-.211.176-.316.415-.316.717a.834.834 0 0 0 .274.639c.084.07.176.133.281.183.105.049.218.091.33.133.112.035.211.077.295.112.084.035.155.077.211.119s.098.091.126.141a.37.37 0 0 1 .042.183.331.331 0 0 1-.126.274c-.091.063-.239.098-.436.098s-.365-.021-.506-.07a1.74 1.74 0 0 1-.33-.133c-.007-.007-.021-.007-.035 0-.014.007-.021.014-.021.021l-.176.478c-.007.014 0 .035.014.049.042.021.091.049.155.077.063.028.141.056.225.077.084.028.19.049.295.063.112.014.239.028.372.028.4 0 .717-.084.927-.246.218-.169.323-.407.323-.71a.972.972 0 0 0-.07-.4.595.595 0 0 0-.188-.295zM8.881 23.351a4.616 4.616 0 0 0-.274-.372 4.55 4.55 0 0 0-.569-.611c.162-.169.33-.337.492-.513.176-.19.337-.372.492-.541.007-.014.014-.028.007-.042a.038.038 0 0 0-.035-.021h-.668c-.014 0-.021.007-.028.014-.049.056-.112.126-.176.204-.07.077-.141.162-.218.246a7.935 7.935 0 0 1-.239.253c-.056.056-.112.112-.162.169v-2.03c0-.014-.007-.021-.014-.028-.007-.007-.021-.014-.028-.007l-.561.089c-.021 0-.035.021-.035.035v3.513c0 .021.014.042.042.042h.562c.021 0 .042-.014.042-.042v-1.04c.063.049.126.105.19.176a5.087 5.087 0 0 1 .485.583c.07.105.133.204.19.302a.038.038 0 0 0 .035.021h.653a.038.038 0 0 0 .035-.021c.007-.014.007-.028 0-.035a7.51 7.51 0 0 0-.218-.344zM11.256 21.545a1.09 1.09 0 0 0-.386-.267c-.148-.063-.309-.091-.485-.091s-.337.028-.485.091-.274.155-.386.267c-.105.112-.19.253-.253.415a1.61 1.61 0 0 0-.091.534c0 .197.028.379.091.541a1.127 1.127 0 0 0 .625.682c.148.063.309.098.492.098.176 0 .344-.035.492-.098a1.22 1.22 0 0 0 .386-.267c.105-.112.19-.253.246-.415s.084-.344.084-.541c0-.197-.028-.379-.091-.534a1.266 1.266 0 0 0-.239-.415zm-.323.956c0 .239-.049.422-.148.555a.47.47 0 0 1-.4.197c-.176 0-.309-.063-.4-.197-.098-.133-.148-.323-.148-.555s.049-.415.148-.548a.47.47 0 0 1 .4-.197c.176 0 .309.063.4.197.099.126.148.316.148.548zM14.734 20.456h-.583c-.021 0-.042.014-.042.042v1.251h-1.328v-1.251c0-.021-.014-.042-.042-.042h-.583c-.021 0-.042.014-.042.042v3.225c0 .021.014.042.042.042h.583c.021 0 .042-.014.042-.042v-1.391h1.321v1.391c0 .021.014.042.042.042h.583c.021 0 .042-.014.042-.042v-3.225c0-.028-.014-.042-.035-.042zM17.291 21.243h-.562c-.021 0-.042.014-.042.042v1.939a.644.644 0 0 1-.133.014c-.077.007-.148.007-.211.007-.176 0-.295-.049-.365-.148-.07-.105-.105-.288-.105-.534v-1.272c0-.021-.014-.042-.042-.042h-.562c-.021 0-.042.014-.042.042v1.363c0 .169.014.323.049.464.035.141.098.267.176.372a.908.908 0 0 0 .33.246c.133.056.309.084.506.084.211 0 .4-.014.576-.042.176-.028.316-.056.429-.084.014-.007.028-.021.028-.035v-2.361c.012-.034-.002-.055-.03-.055zM19.989 21.974a1.203 1.203 0 0 0-.211-.415.887.887 0 0 0-.351-.267 1.131 1.131 0 0 0-.471-.091 1.164 1.164 0 0 0-.513.112v-1.201c0-.014-.007-.021-.014-.028-.007-.007-.021-.014-.028-.007l-.562.091c-.021 0-.035.021-.035.035v3.443c0 .014.014.035.028.035.112.035.253.063.429.091.169.028.351.042.541.042.197 0 .372-.028.527-.091a1.05 1.05 0 0 0 .4-.267c.112-.112.197-.253.253-.415s.091-.344.091-.541a2.068 2.068 0 0 0-.084-.526zm-.576.52c0 .239-.056.429-.169.562a.558.558 0 0 1-.457.197c-.091 0-.162-.007-.225-.014a1.312 1.312 0 0 1-.119-.021v-1.349a.742.742 0 0 1 .169-.077.738.738 0 0 1 .253-.042c.19 0 .33.063.415.19.084.139.133.322.133.554z"/></g><path fill="#18968C" d="M17.467 9.054 8.073 3.538C7.16 2.997 5.776 2.007 5.516.384l-.625 1.103c-1.974 3.471.478 5.339 1.869 6.147l9.393 5.522c.913.534 2.297 1.532 2.557 3.147l.625-1.103c1.968-3.463-.484-5.331-1.868-6.146zM4.146 10.136v2.192a3.995 3.995 0 0 0 3.984 3.984h5.051l-6.78-3.984c-.723-.422-1.728-1.125-2.255-2.192zM16.09.384h-5.051l6.78 3.984c.717.422 1.721 1.124 2.248 2.185V4.367A3.984 3.984 0 0 0 16.09.384z"/></svg>
|
||||
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 4.0 KiB |
|
|
@ -1,136 +1 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="1024"
|
||||
height="1024"
|
||||
viewBox="0 0 270.93333 270.93333"
|
||||
version="1.1"
|
||||
id="svg5"
|
||||
xml:space="preserve"
|
||||
inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
|
||||
sodipodi:docname="icon.svg"
|
||||
inkscape:export-filename="icon-128.png"
|
||||
inkscape:export-xdpi="12.000001"
|
||||
inkscape:export-ydpi="12.000001"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
|
||||
id="namedview7"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#000000"
|
||||
borderopacity="0.25"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
inkscape:document-units="mm"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.5946522"
|
||||
inkscape:cx="752.54073"
|
||||
inkscape:cy="450.68361"
|
||||
inkscape:current-layer="layer1"><inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid111" /></sodipodi:namedview><defs
|
||||
id="defs2"><linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient19130"><stop
|
||||
style="stop-color:#dfd69b;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop19126" /><stop
|
||||
style="stop-color:#d2c572;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop19128" /></linearGradient><linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient19122"><stop
|
||||
style="stop-color:#f05328;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop19118" /><stop
|
||||
style="stop-color:#cf370f;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop19120" /></linearGradient><linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient19114"><stop
|
||||
style="stop-color:#006aaa;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop19110" /><stop
|
||||
style="stop-color:#005487;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop19112" /></linearGradient><linearGradient
|
||||
inkscape:collect="always"
|
||||
id="linearGradient181"><stop
|
||||
style="stop-color:#133e4b;stop-opacity:1;"
|
||||
offset="0"
|
||||
id="stop177" /><stop
|
||||
style="stop-color:#0c2b3d;stop-opacity:1;"
|
||||
offset="1"
|
||||
id="stop179" /></linearGradient><linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient181"
|
||||
id="linearGradient183"
|
||||
x1="250.75105"
|
||||
y1="19.506355"
|
||||
x2="20.450212"
|
||||
y2="248.54874"
|
||||
gradientUnits="userSpaceOnUse" /><linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient19114"
|
||||
id="linearGradient19116"
|
||||
x1="72.969826"
|
||||
y1="73.859703"
|
||||
x2="25.361464"
|
||||
y2="257.17413"
|
||||
gradientUnits="userSpaceOnUse" /><linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient19122"
|
||||
id="linearGradient19124"
|
||||
x1="149.05421"
|
||||
y1="68.965385"
|
||||
x2="138.3757"
|
||||
y2="127.25226"
|
||||
gradientUnits="userSpaceOnUse" /><linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#linearGradient19130"
|
||||
id="linearGradient19132"
|
||||
x1="170.85617"
|
||||
y1="146.82953"
|
||||
x2="201.5569"
|
||||
y2="188.65369"
|
||||
gradientUnits="userSpaceOnUse" /></defs><g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"><rect
|
||||
style="fill:url(#linearGradient183);fill-opacity:1;stroke-width:0.264583"
|
||||
id="rect115"
|
||||
width="270.93332"
|
||||
height="270.93332"
|
||||
x="0"
|
||||
y="0"
|
||||
rx="33.866665" /><path
|
||||
style="opacity:1;fill:url(#linearGradient19116);fill-opacity:1;stroke-width:0.264583"
|
||||
d="m 0,69.41032 c 0,0 15.97341,-15.642206 48.0533,-21.973129 34.750862,-6.858036 65.71908,-10e-7 65.71908,-10e-7 l 29.94258,29.982012 -1.77975,90.322408 c 0,0 20.77918,34.00148 8.1347,35.37354 -26.69628,2.89682 -33.27837,33.1808 -28.04801,50.49948 5.23035,17.31867 4.34048,17.3187 4.34048,17.3187 L 0,270.9333 Z"
|
||||
id="path18329"
|
||||
sodipodi:nodetypes="cscccssccc" /><path
|
||||
style="fill:url(#linearGradient19124);fill-opacity:1;stroke-width:0.264583"
|
||||
d="m 113.77238,47.437191 c 0,0 14.85651,51.896699 13.28342,78.010049 -1.5731,26.11334 -5.0339,27.68645 -5.0339,27.68645 l 73.1442,-51.48951 C 179.27554,82.720765 145.61903,53.85498 113.77238,47.437191 Z"
|
||||
id="path12139"
|
||||
sodipodi:nodetypes="csccc" /><path
|
||||
style="opacity:1;fill:url(#linearGradient19132);fill-opacity:1;stroke-width:0.264583"
|
||||
d="m 122.0219,153.13369 73.1442,-51.48951 c 0,0 17.14886,15.4811 33.97498,41.63762 16.02811,24.91601 28.61719,57.75025 28.61719,57.75025 0,0 -36.26795,-3.41078 -67.93143,-3.01587 -46.29774,0.57743 -66.45321,7.99579 -66.45321,7.99579 -9.60125,-22.07547 -9.60125,-30.80281 -1.35173,-52.87828 z"
|
||||
id="path13694"
|
||||
sodipodi:nodetypes="ccscscc" /><circle
|
||||
style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:0.264583"
|
||||
id="path18331"
|
||||
cx="94.10437"
|
||||
cy="131.92412"
|
||||
r="17.130112" /></g></svg>
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="84.365" y1="-76.858" x2="79.068" y2="-82.126" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#153e4b"/><stop offset="1" style="stop-color:#0c2b3d"/></linearGradient><path fill="url(#a)" d="M3.168.224h17.664a2.944 2.944 0 0 1 2.944 2.944v17.664a2.944 2.944 0 0 1-2.944 2.944H3.168a2.944 2.944 0 0 1-2.944-2.944V3.168A2.944 2.944 0 0 1 3.168.224z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="80.686" y1="-78.204" x2="79.591" y2="-82.42" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#046bab"/><stop offset="1" style="stop-color:#058"/></linearGradient><path fill="url(#b)" d="M.224 6.258s1.389-1.36 4.177-1.91c3.021-.596 5.713 0 5.713 0l2.603 2.606-.155 7.852s1.806 2.956.707 3.075c-2.321.252-2.893 2.884-2.438 4.39.455 1.505.377 1.505.377 1.505H.223V6.258z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="82.154" y1="-78.007" x2="81.908" y2="-79.348" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#f15628"/><stop offset="1" style="stop-color:#ce3b27"/></linearGradient><path fill="url(#c)" d="M10.114 4.348s1.291 4.511 1.155 6.781c-.137 2.27-.438 2.407-.438 2.407L17.19 9.06c-1.382-1.645-4.307-4.154-7.076-4.712z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="82.292" y1="-79.933" x2="82.998" y2="-80.895" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#e0d69b"/><stop offset="1" style="stop-color:#d1c572"/></linearGradient><path fill="url(#d)" d="M10.831 13.536 17.19 9.06s1.491 1.346 2.953 3.62c1.393 2.166 2.488 5.02 2.488 5.02s-3.153-.296-5.905-.262c-4.025.05-5.777.695-5.777.695-.835-1.92-.835-2.678-.118-4.597z"/><circle fill="#FFF" cx="8.404" cy="11.692" r="1.489"/></svg>
|
||||
>>>>>>> 0daae32b68ada01b48994248e3ead7de41083a30
|
||||
=======
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="84.365" y1="-76.858" x2="79.068" y2="-82.126" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#153e4b"/><stop offset="1" style="stop-color:#0c2b3d"/></linearGradient><path fill="url(#a)" d="M3.168.224h17.664a2.944 2.944 0 0 1 2.944 2.944v17.664a2.944 2.944 0 0 1-2.944 2.944H3.168a2.944 2.944 0 0 1-2.944-2.944V3.168A2.944 2.944 0 0 1 3.168.224z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="80.686" y1="-78.204" x2="79.591" y2="-82.42" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#046bab"/><stop offset="1" style="stop-color:#058"/></linearGradient><path fill="url(#b)" d="M.224 6.258s1.389-1.36 4.177-1.91c3.021-.596 5.713 0 5.713 0l2.603 2.606-.155 7.852s1.806 2.956.707 3.075c-2.321.252-2.893 2.884-2.438 4.39.455 1.505.377 1.505.377 1.505H.223V6.258z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="82.154" y1="-78.007" x2="81.908" y2="-79.348" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#f15628"/><stop offset="1" style="stop-color:#ce3b27"/></linearGradient><path fill="url(#c)" d="M10.114 4.348s1.291 4.511 1.155 6.781c-.137 2.27-.438 2.407-.438 2.407L17.19 9.06c-1.382-1.645-4.307-4.154-7.076-4.712z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="82.292" y1="-79.933" x2="82.998" y2="-80.895" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#e0d69b"/><stop offset="1" style="stop-color:#d1c572"/></linearGradient><path fill="url(#d)" d="M10.831 13.536 17.19 9.06s1.491 1.346 2.953 3.62c1.393 2.166 2.488 5.02 2.488 5.02s-3.153-.296-5.905-.262c-4.025.05-5.777.695-5.777.695-.835-1.92-.835-2.678-.118-4.597z"/><circle fill="#FFF" cx="8.404" cy="11.692" r="1.489"/></svg>
|
||||
>>>>>>> 304c8fb66279ea678e36caff4bd089e5b189e078
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" xml:space="preserve"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="84.365" y1="-76.858" x2="79.068" y2="-82.126" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#153e4b"/><stop offset="1" style="stop-color:#0c2b3d"/></linearGradient><path fill="url(#a)" d="M3.168.224h17.664a2.944 2.944 0 0 1 2.944 2.944v17.664a2.944 2.944 0 0 1-2.944 2.944H3.168a2.944 2.944 0 0 1-2.944-2.944V3.168A2.944 2.944 0 0 1 3.168.224z"/><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="80.686" y1="-78.204" x2="79.591" y2="-82.42" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#046bab"/><stop offset="1" style="stop-color:#058"/></linearGradient><path fill="url(#b)" d="M.224 6.258s1.389-1.36 4.177-1.91c3.021-.596 5.713 0 5.713 0l2.603 2.606-.155 7.852s1.806 2.956.707 3.075c-2.321.252-2.893 2.884-2.438 4.39.455 1.505.377 1.505.377 1.505H.223V6.258z"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="82.154" y1="-78.007" x2="81.908" y2="-79.348" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#f15628"/><stop offset="1" style="stop-color:#ce3b27"/></linearGradient><path fill="url(#c)" d="M10.114 4.348s1.291 4.511 1.155 6.781c-.137 2.27-.438 2.407-.438 2.407L17.19 9.06c-1.382-1.645-4.307-4.154-7.076-4.712z"/><linearGradient id="d" gradientUnits="userSpaceOnUse" x1="82.292" y1="-79.933" x2="82.998" y2="-80.895" gradientTransform="matrix(3.7795 0 0 -3.7795 -296.78 -288.512)"><stop offset="0" style="stop-color:#e0d69b"/><stop offset="1" style="stop-color:#d1c572"/></linearGradient><path fill="url(#d)" d="M10.831 13.536 17.19 9.06s1.491 1.346 2.953 3.62c1.393 2.166 2.488 5.02 2.488 5.02s-3.153-.296-5.905-.262c-4.025.05-5.777.695-5.777.695-.835-1.92-.835-2.678-.118-4.597z"/><circle fill="#FFF" cx="8.404" cy="11.692" r="1.489"/></svg>
|
||||
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
Loading…
Reference in New Issue