aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinteck <46352972+Minteck@users.noreply.github.com>2021-07-09 00:37:48 +0200
committerMinteck <46352972+Minteck@users.noreply.github.com>2021-07-09 00:37:48 +0200
commit8886d5111aa4ae75f54f46c93f09fa7548979969 (patch)
tree51ca4a81263486f1298e1262537703b0470fa4e6
parenta69a90e2f5970efb23dba5ca900e9624b35cfa36 (diff)
downloadkartik-client-8886d5111aa4ae75f54f46c93f09fa7548979969.tar.gz
kartik-client-8886d5111aa4ae75f54f46c93f09fa7548979969.tar.bz2
kartik-client-8886d5111aa4ae75f54f46c93f09fa7548979969.zip
Fixes
-rw-r--r--app.js138
-rw-r--r--index.html14
-rw-r--r--package.json2
-rw-r--r--race/_archived/triangle.html2
-rw-r--r--race/circuits/furry.html2
-rw-r--r--race/circuits/main.html2
-rw-r--r--race/circuits/snowy.html2
-rw-r--r--race/circuits/water.html2
-rw-r--r--sfx/notification.mp3bin0 -> 41006 bytes
-rw-r--r--views/common/load-new.ttfbin0 -> 50172 bytes
-rw-r--r--views/load.html44
-rw-r--r--views/loader.svg128
-rw-r--r--views/menu.css10
-rw-r--r--views/script/core_notification.js13
-rw-r--r--views/script/loader_global.js2
15 files changed, 255 insertions, 106 deletions
diff --git a/app.js b/app.js
index 3135b2c..8e4ea52 100644
--- a/app.js
+++ b/app.js
@@ -302,7 +302,7 @@ const { app, BrowserWindow } = require('electron');
resizable: false,
maximizable: false,
frame: false,
- show: true,
+ show: false,
enableLargerThanScreen: true,
icon: "logo/logo.png",
backgroundColor: "#4b4e50",
@@ -316,82 +316,86 @@ const { app, BrowserWindow } = require('electron');
}
})
load.loadFile("./views/load.html");
- setTimeout(() => {
- console.log(" * Checking signatures");
-
- sigdb = require("./bin/signatures.json");
- total = Object.keys(sigdb["v1"]).length * 3;
- processed = 0;
- for (file in sigdb["v1"]) {
- if (fs.existsSync(file)) {
- try {
- hash = require('crypto').createHash('sha512').update(fs.readFileSync(file)).digest('base64');
- if (hash !== sigdb["v1"][file]) {
- require('electron').dialog.showMessageBoxSync(
- {
- type: "warning",
- title: "Source modification detected",
- message: "File " + file + " has been flagged as modified (signing V1). If this is normal, please run the signing process again.\n\nExpected: " + sigdb["v1"][file] + "\nGot: " + hash + "\n\nYou are running a modified version of Kartik, do not expect to get support!"
- }
- )
+ load.webContents.once('dom-ready', () => {
+ console.log(" * Showing splash screen");
+ load.show();
+ setTimeout(() => {
+ console.log(" * Checking signatures");
+
+ sigdb = require("./bin/signatures.json");
+ total = Object.keys(sigdb["v1"]).length * 3;
+ processed = 0;
+ for (file in sigdb["v1"]) {
+ if (fs.existsSync(file)) {
+ try {
+ hash = require('crypto').createHash('sha512').update(fs.readFileSync(file)).digest('base64');
+ if (hash !== sigdb["v1"][file]) {
+ require('electron').dialog.showMessageBoxSync(
+ {
+ type: "warning",
+ title: "Source modification detected",
+ message: "File " + file + " has been flagged as modified (signing V1). If this is normal, please run the signing process again.\n\nExpected: " + sigdb["v1"][file] + "\nGot: " + hash + "\n\nYou are running a modified version of Kartik, do not expect to get support!"
+ }
+ )
+ }
+ } catch (e) {
+ console.warn(" ! Could not V1 compute hash for " + file);
}
- } catch (e) {
- console.warn(" ! Could not V1 compute hash for " + file);
}
- }
- processed++;
- load.webContents.send('progress', (processed/total)*100);
- }
- for (file in sigdb["v2"]) {
- if (fs.existsSync(file)) {
- try {
- hash = require('crypto').createHash('sha1').update(fs.readFileSync(file)).digest('base64');
- if (hash !== sigdb["v2"][file]) {
- require('electron').dialog.showMessageBoxSync(
- {
- type: "warning",
- title: "Source modification detected",
- message: "File " + file + " has been flagged as modified (signing V2). If this is normal, please run the signing process again.\n\nExpected: " + sigdb["v2"][file] + "\nGot: " + hash + "\n\nYou are running a modified version of Kartik, do not expect to get support!"
- }
- )
+ processed++;
+ load.webContents.send('progress', (processed/total)*100);
+ }
+ for (file in sigdb["v2"]) {
+ if (fs.existsSync(file)) {
+ try {
+ hash = require('crypto').createHash('sha1').update(fs.readFileSync(file)).digest('base64');
+ if (hash !== sigdb["v2"][file]) {
+ require('electron').dialog.showMessageBoxSync(
+ {
+ type: "warning",
+ title: "Source modification detected",
+ message: "File " + file + " has been flagged as modified (signing V2). If this is normal, please run the signing process again.\n\nExpected: " + sigdb["v2"][file] + "\nGot: " + hash + "\n\nYou are running a modified version of Kartik, do not expect to get support!"
+ }
+ )
+ }
+ } catch (e) {
+ console.warn(" ! Could not compute V2 hash for " + file);
}
- } catch (e) {
- console.warn(" ! Could not compute V2 hash for " + file);
}
- }
- processed++;
- load.webContents.send('progress', (processed/total)*100);
- }
- for (file in sigdb["v3"]) {
- if (fs.existsSync(file)) {
- try {
- hash = require('crypto').createHash('md5').update(fs.readFileSync(file)).digest('base64');
- if (hash !== sigdb["v3"][file]) {
- require('electron').dialog.showMessageBoxSync(
- {
- type: "warning",
- title: "Source modification detected",
- message: "File " + file + " has been flagged as modified (signing V3). If this is normal, please run the signing process again.\n\nExpected: " + sigdb["v3"][file] + "\nGot: " + hash + "\n\nYou are running a modified version of Kartik, do not expect to get support!"
- }
- )
+ processed++;
+ load.webContents.send('progress', (processed/total)*100);
+ }
+ for (file in sigdb["v3"]) {
+ if (fs.existsSync(file)) {
+ try {
+ hash = require('crypto').createHash('md5').update(fs.readFileSync(file)).digest('base64');
+ if (hash !== sigdb["v3"][file]) {
+ require('electron').dialog.showMessageBoxSync(
+ {
+ type: "warning",
+ title: "Source modification detected",
+ message: "File " + file + " has been flagged as modified (signing V3). If this is normal, please run the signing process again.\n\nExpected: " + sigdb["v3"][file] + "\nGot: " + hash + "\n\nYou are running a modified version of Kartik, do not expect to get support!"
+ }
+ )
+ }
+ } catch (e) {
+ console.warn(" ! Could not compute V3 hash for " + file);
}
- } catch (e) {
- console.warn(" ! Could not compute V3 hash for " + file);
}
- }
- processed++;
- load.webContents.send('progress', (processed/total)*100);
- }
+ processed++;
+ load.webContents.send('progress', (processed/total)*100);
+ }
- console.log(" * Generating resources pack");
- require('./modding/resources');
- console.log(" * Starting Kartik Modding Platform");
- require('./modding/parser');
- createWindow();
- }, 5000)
+ console.log(" * Generating resources pack");
+ require('./modding/resources');
+ console.log(" * Starting Kartik Modding Platform");
+ require('./modding/parser');
+ createWindow();
+ }, 5000)
+ })
})
app.on('window-all-closed', () => {
diff --git a/index.html b/index.html
index 6c44948..2262caa 100644
--- a/index.html
+++ b/index.html
@@ -40,6 +40,19 @@
}
}
</style>
+ <div id="notification" style="position: fixed; z-index: 9999; background: rgba(0, 0, 0, 0.5); color: white; padding: 10px; width: 256px; right: -300px; top: 20px; opacity: 0; border-radius: 10px; backdrop-filter: blur(10px); transition: right 400ms linear 0s, opacity 400ms linear 0s;">
+ <span id="notification-title" style="
+ font-weight: bold;
+ text-align: left;
+ display: block;
+ padding-bottom: 5px;
+">hello</span>
+ <span id="notification-message" style="
+ display: block;
+ max-width: 256px;
+ text-align: left;
+">goodbye</span>
+ </div>
<div id="message" style="
position: fixed;
display: none;
@@ -92,6 +105,7 @@
<script src="./views/script/core_music.js"></script>
<script src="./views/script/core_viewer.js"></script>
<script src="./views/script/core_stats.js"></script>
+ <script src="./views/script/core_notification.js"></script>
<script>info("MainWindow", "Main container up!");if (native){require('@electron/remote').getCurrentWindow().log(" * View loaded, Kartik is now up and running!");}</script>
</body>
</html>
diff --git a/package.json b/package.json
index 8dbdbb4..73a4ee2 100644
--- a/package.json
+++ b/package.json
@@ -1 +1 @@
-{"name":"kartik","version":"f3e78ef","channel":"git","description":"A multiplatform 2D karting game","main":"app.js","dependencies":{"@electron/remote":"^1.0.4","discord-rpc":"^3.2.0","electron":"^12.0.1","ini":"^1.3.8","jquery":"^3.6.0","os-locale":"^5.0.0","systeminformation":"^5.7.7","uuid":"^8.3.2","yaml":"^1.10.2"},"scripts":{"test":"node_modules\\electron\\dist\\electron.exe app.js"},"author":"Minteck Projects","license":"GPL-3.0-or-later","serial":"XXX99999999999"} \ No newline at end of file
+{"name":"kartik","version":"21.06.15","channel":"stable","description":"A multiplatform 2D karting game","main":"app.js","dependencies":{"@electron/remote":"^1.0.4","discord-rpc":"^3.2.0","electron":"^12.0.1","ini":"^1.3.8","jquery":"^3.6.0","os-locale":"^5.0.0","systeminformation":"^5.7.7","uuid":"^8.3.2","yaml":"^1.10.2"},"scripts":{"test":"node_modules\\electron\\dist\\electron.exe app.js"},"author":"Minteck Projects","license":"GPL-3.0-or-later","serial":"XXX99999999999"} \ No newline at end of file
diff --git a/race/_archived/triangle.html b/race/_archived/triangle.html
index a1cb13e..33dcaae 100644
--- a/race/_archived/triangle.html
+++ b/race/_archived/triangle.html
@@ -21,7 +21,7 @@
top: -7px;
bottom: -7px;
left: 0px;
- right: -30px;
+ right: -40px;
animation-name: aibox;
animation-duration: 2s;
animation-iteration-count: infinite;
diff --git a/race/circuits/furry.html b/race/circuits/furry.html
index 01a4d16..b1c0e9c 100644
--- a/race/circuits/furry.html
+++ b/race/circuits/furry.html
@@ -21,7 +21,7 @@
top: -7px;
bottom: -7px;
left: 0px;
- right: -30px;
+ right: -40px;
animation-name: aibox;
animation-duration: 2s;
animation-iteration-count: infinite;
diff --git a/race/circuits/main.html b/race/circuits/main.html
index 8285085..5f21eed 100644
--- a/race/circuits/main.html
+++ b/race/circuits/main.html
@@ -21,7 +21,7 @@
top: -7px;
bottom: -7px;
left: 0px;
- right: -30px;
+ right: -40px;
animation-name: aibox;
animation-duration: 2s;
animation-iteration-count: infinite;
diff --git a/race/circuits/snowy.html b/race/circuits/snowy.html
index 3fea303..03ceab8 100644
--- a/race/circuits/snowy.html
+++ b/race/circuits/snowy.html
@@ -21,7 +21,7 @@
top: -7px;
bottom: -7px;
left: 0px;
- right: -30px;
+ right: -40px;
animation-name: aibox;
animation-duration: 2s;
animation-iteration-count: infinite;
diff --git a/race/circuits/water.html b/race/circuits/water.html
index 1c6166a..3e3d6b8 100644
--- a/race/circuits/water.html
+++ b/race/circuits/water.html
@@ -21,7 +21,7 @@
top: -7px;
bottom: -7px;
left: 0px;
- right: -30px;
+ right: -40px;
animation-name: aibox;
animation-duration: 2s;
animation-iteration-count: infinite;
diff --git a/sfx/notification.mp3 b/sfx/notification.mp3
new file mode 100644
index 0000000..c3dc438
--- /dev/null
+++ b/sfx/notification.mp3
Binary files differ
diff --git a/views/common/load-new.ttf b/views/common/load-new.ttf
new file mode 100644
index 0000000..d2a94dc
--- /dev/null
+++ b/views/common/load-new.ttf
Binary files differ
diff --git a/views/load.html b/views/load.html
index c6e45bf..473c1ac 100644
--- a/views/load.html
+++ b/views/load.html
@@ -21,6 +21,11 @@
font-weight: normal;
}
+ @font-face {
+ font-family: "HomepageBaukasten-Bold";
+ src: url("./common/load-new.ttf");
+ }
+
</style>
<script>
document.addEventListener('keydown', function(e) {
@@ -32,35 +37,16 @@
</script>
</head>
<body style="overflow:hidden;margin:0;padding:0;background-color:#4b4e50;">
- <img src="splash.png" style="width:100%;">
- <div id="bar" style="position:fixed;top:300px;left:0;width:0;background:white;z-index:99999;height:4px;"></div>
- <span style="position: fixed;color: white;z-index: 99;top: 122px;font-size: 18px;display: inline-block;right: 309px;font-family: 'Milliard SB', sans-serif;">
- <script>
- var ipcRenderer = require('electron').ipcRenderer;
- ipcRenderer.on('progress', function (event, progress) {
- document.getElementById("bar").style.width = progress + "%";
- });
+ <script>
+ document.write(require('fs').readFileSync("./views/loader.svg").toString().replaceAll("%version%", require('../package.json').version.toUpperCase()));
- switch (require('../package.json').channel) {
- case "git":
- document.write(`<span style="font-family: 'Milliard', sans-serif;">TRUNK&nbsp;</span>`);
- break;
- case "nightly":
- document.write(`<span style="font-family: 'Milliard', sans-serif;">NIGHTLY&nbsp;</span>`);
- break;
- case "beta":
- document.write(`<span style="font-family: 'Milliard', sans-serif;">BETA&nbsp;</span>`);
- break;
- case "eap":
- document.write(`<span style="font-family: 'Milliard', sans-serif;">EAP&nbsp;</span>`);
- break;
- default:
- break;
- }
- </script>
- <script>
- document.write(require('../package.json').version.toUpperCase());
- </script>
- </span>
+ var ipcRenderer = require('electron').ipcRenderer;
+ ipcRenderer.on('progress', function (event, progress) {
+ document.getElementById("bar").style.width = progress + "%";
+ });
+ </script>
+ <div id="bar-container">
+ <div id="bar" style="position:fixed;bottom:0;left:0;width:0;background:white;z-index:99999;height:4px;"></div>
+ </div>
</body>
</html>
diff --git a/views/loader.svg b/views/loader.svg
new file mode 100644
index 0000000..77a496e
--- /dev/null
+++ b/views/loader.svg
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<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 640 400" style="enable-background:new 0 0 640 400;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#FFFFFF;}
+ .st1{font-family:'HomepageBaukasten-Bold';}
+ .st2{font-size:38.6753px;}
+ .st3{font-size:12.9px;}
+ .st4{fill:#504B4B;}
+</style>
+<font horiz-adv-x="1000">
+<!-- 2016 Copyright Webme GmbH -->
+<!-- Copyright: Copyright 2021 Adobe System Incorporated. All rights reserved. -->
+<font-face font-family="HomepageBaukasten-Bold" units-per-em="1000" underline-position="-123" underline-thickness="20"/>
+<missing-glyph horiz-adv-x="500"/>
+<glyph unicode=" " horiz-adv-x="300"/>
+<glyph unicode="!" horiz-adv-x="324" d="M95,665C95,674 99,682 106,689C113,695 123,698 134,698l61,0C206,698 215,695 222,689C229,682 233,674 233,665l0,-31l-138,0M95,615l138,0l0,-266l-138,0M141,378l0,213l-16,0l0,-213M172,378l0,213l-16,0l0,-213M202,378l0,213l-15,0l0,-213M96,331l135,0l-36,-60l-62,0M141,251l44,0l-21,-37M81,160l162,0l0,-160l-162,0z"/>
+<glyph unicode="&quot;" horiz-adv-x="520" d="M243,700l0,-5l-109,-314l-77,0l18,319M479,700l0,-5l-109,-314l-77,0l18,319z"/>
+<glyph unicode="#" horiz-adv-x="700" d="M542,278l88,0l0,-128l-110,0l-26,-150l-132,0l26,150l-145,0l-26,-150l-132,0l26,150l-76,0l0,128l98,0l25,148l-88,0l0,128l110,0l25,146l132,0l-25,-146l145,0l25,146l132,0l-25,-146l76,0l0,-128l-98,0M265,278l145,0l25,148l-145,0z"/>
+<glyph unicode="$" horiz-adv-x="646" d="M384,1l0,-99l-104,0l0,101C237,8 196,19 155,36C114,52 77,73 44,98l78,114C151,190 178,173 204,160C230,147 257,137 285,131l0,159C210,310 156,336 122,369C87,401 70,446 70,503C70,558 89,603 127,638C165,673 216,693 280,700l0,58l104,0l0,-60C451,689 513,664 570,624l-67,-117C460,536 419,555 379,566l0,-151C455,394 510,367 545,334C579,300 596,255 596,199C596,144 577,100 539,65C500,30 449,8 384,1M216,512C216,495 221,482 231,471C241,460 259,449 285,440l0,135C262,572 244,565 233,554C222,543 216,529 216,512M379,266l0,-140C426,133 450,155 450,191C450,208 445,223 435,234C424,245 406,256 379,266z"/>
+<glyph unicode="%" horiz-adv-x="860" d="M214,350C181,350 152,358 127,374C101,389 81,411 67,438C52,465 45,495 45,528C45,561 52,592 67,619C81,646 101,668 127,684C153,700 183,708 216,708C249,708 278,700 304,685C329,669 349,647 364,620C378,593 385,563 385,530C385,497 378,466 364,439C349,412 329,390 303,374C277,358 247,350 214,350M115,0l511,700l119,0l-511,-700M214,617C194,617 178,609 167,592C156,575 150,555 150,530C150,505 156,484 169,467C181,450 197,441 216,441C236,441 252,449 263,466C274,483 280,503 280,528C280,553 274,574 262,591C249,608 233,617 214,617M644,-8C611,-8 582,0 557,16C531,31 511,53 497,80C482,107 475,137 475,170C475,203 482,234 497,261C511,288 531,310 557,326C583,342 613,350 646,350C679,350 708,342 734,327C759,311 779,289 794,262C808,235 815,205 815,172C815,139 808,108 794,81C779,54 759,32 733,16C707,0 677,-8 644,-8M644,259C624,259 608,251 597,234C586,217 580,197 580,172C580,147 586,126 599,109C611,92 627,83 646,83C666,83 682,91 693,108C704,125 710,145 710,170C710,195 704,216 692,233C679,250 663,259 644,259z"/>
+<glyph unicode="&amp;" horiz-adv-x="696" d="M474,68C411,16 342,-10 269,-10C224,-10 184,-2 149,15C113,32 85,55 65,86C44,117 34,152 34,193C34,280 79,345 170,386C153,411 140,434 133,457C125,479 121,502 121,527C121,560 130,590 147,619C164,647 188,670 220,687C252,704 290,712 333,712C372,712 406,704 436,689C466,674 489,653 506,626C522,599 530,568 530,535C530,490 517,452 492,423C466,393 430,369 383,351l93,-93C498,293 521,333 544,378l113,-62C622,253 592,204 565,168l103,-103l-113,-79M330,592C309,592 293,585 281,572C268,559 262,541 262,520C262,505 265,490 272,477C278,464 288,449 303,432C335,444 359,457 374,472C389,486 396,504 396,526C396,547 390,563 378,575C366,586 350,592 330,592M189,199C189,174 198,154 217,139C235,124 258,116 287,116C320,116 354,129 388,156l-134,136C232,281 216,267 205,251C194,235 189,218 189,199z"/>
+<glyph unicode="&#x2019;" horiz-adv-x="286" d="M129,540l-62,0l0,160l162,0l0,-135C229,501 214,454 183,425C152,395 105,379 44,378l-13,63C66,444 91,455 108,472C125,489 132,511 129,540z"/>
+<glyph unicode="(" horiz-adv-x="445" d="M210,287C210,217 225,157 256,107C286,56 335,7 403,-40l-67,-101C243,-90 174,-30 128,40C82,109 59,192 59,287C59,382 82,465 128,535C174,604 243,664 336,715l67,-101C335,567 286,518 256,468C225,417 210,357 210,287z"/>
+<glyph unicode=")" horiz-adv-x="445" d="M109,-141l-67,101C110,7 159,56 190,107C220,157 235,217 235,287C235,357 220,417 190,468C159,518 110,567 42,614l67,101C202,664 271,604 317,535C363,465 386,382 386,287C386,192 363,109 317,40C271,-30 202,-90 109,-141z"/>
+<glyph unicode="*" horiz-adv-x="430" d="M240,492l16,-120l-82,0l16,120l-97,-74l-42,72l112,47l-112,47l42,72l97,-74l-16,120l82,0l-16,-120l97,74l42,-72l-112,-47l112,-47l-42,-72z"/>
+<glyph unicode="+" horiz-adv-x="640" d="M391,601l0,-180l181,0l0,-138l-181,0l0,-180l-142,0l0,180l-181,0l0,138l181,0l0,180z"/>
+<glyph unicode="," horiz-adv-x="286" d="M124,0l-62,0l0,160l162,0l0,-135C224,-39 209,-86 178,-115C147,-145 100,-161 39,-162l-13,63C61,-96 86,-85 103,-68C120,-51 127,-29 124,0z"/>
+<glyph unicode="-" horiz-adv-x="408" d="M50,383l308,0l0,-146l-308,0z"/>
+<glyph unicode="." horiz-adv-x="286" d="M62,160l162,0l0,-160l-162,0z"/>
+<glyph unicode="/" horiz-adv-x="530" d="M101,-128l-129,0l443,926l129,0z"/>
+<glyph unicode="0" horiz-adv-x="730" d="M364,-12C303,-12 249,4 202,36C155,67 118,110 93,165C67,220 54,281 54,349C54,417 67,479 93,534C119,589 156,632 203,664C250,696 305,712 366,712C427,712 482,696 529,665C576,633 612,590 638,535C663,480 676,419 676,351C676,283 663,222 637,167C611,112 574,68 527,36C480,4 425,-12 364,-12M364,573C333,573 307,564 284,545C261,526 243,499 231,466C218,432 212,394 212,351C212,308 218,270 231,236C244,202 262,175 285,156C308,137 335,127 366,127C397,127 424,137 447,156C470,175 487,201 500,235C512,268 518,306 518,349C518,392 512,430 499,464C486,498 468,525 445,544C422,563 395,573 364,573z"/>
+<glyph unicode="1" horiz-adv-x="422" d="M330,705l0,-705l-152,0l0,549l-122,-30l-32,126l201,60z"/>
+<glyph unicode="2" horiz-adv-x="623" d="M166,478l-108,87C95,615 133,652 172,675C211,698 260,710 319,710C368,710 411,701 448,683C484,665 512,640 531,607C550,574 560,536 560,493C560,455 554,422 541,393C528,364 508,338 483,313C458,288 422,257 376,221l-114,-88l305,0l0,-133l-518,0l0,122l233,191C328,351 360,382 377,405C394,428 403,453 403,481C403,510 394,532 377,548C360,564 337,572 309,572C283,572 260,565 239,551C218,536 193,512 166,478z"/>
+<glyph unicode="3" horiz-adv-x="621" d="M79,700l473,0l0,-116l-177,-169C430,406 476,386 511,355C546,324 563,278 563,218C563,174 553,135 533,100C512,65 483,37 445,18C406,-2 362,-12 311,-12C197,-12 106,28 38,109l106,101C169,182 195,161 222,147C249,133 279,126 313,126C342,126 366,134 385,150C403,165 412,186 412,212C412,241 400,263 377,279C353,294 319,302 275,302l-64,0l-24,98l167,168l-275,0z"/>
+<glyph unicode="4" horiz-adv-x="689" d="M545,276l94,0l0,-125l-94,0l0,-151l-147,0l0,151l-342,0l-25,109l384,445l130,0M212,276l186,0l0,218z"/>
+<glyph unicode="5" horiz-adv-x="630" d="M540,700l0,-135l-298,0l-8,-121C266,452 297,456 326,456C399,456 459,438 504,401C549,364 571,307 571,231C571,182 560,139 538,102C516,65 485,37 445,18C405,-2 358,-12 305,-12C251,-12 203,-3 161,15C118,33 79,59 43,93l93,111C164,179 191,160 218,147C245,134 273,128 303,128C340,128 368,137 389,154C410,171 420,195 420,226C420,256 409,280 387,297C364,314 334,322 296,322C259,322 220,313 179,296l-89,59l20,345z"/>
+<glyph unicode="6" horiz-adv-x="662" d="M356,572C315,572 282,557 259,528C235,498 220,459 215,410C236,424 258,435 280,443C302,451 329,455 360,455C407,455 450,446 487,429C524,412 553,386 574,353C595,319 606,278 606,231C606,184 594,142 571,105C548,68 516,40 475,19C434,-2 389,-12 339,-12C294,-12 256,-6 224,7C191,19 162,38 137,63C110,90 89,125 75,167C61,208 54,262 54,329C54,403 65,469 88,527C111,584 145,630 191,663C237,696 294,712 361,712C406,712 446,706 480,693C514,680 547,661 580,635l-81,-119C474,535 451,550 430,559C409,568 384,572 356,572M331,327C294,327 264,318 243,299C222,280 211,256 211,225C211,194 222,168 244,149C266,130 296,120 333,120C370,120 400,130 421,149C442,168 453,193 453,224C453,255 442,280 420,299C398,318 368,327 331,327z"/>
+<glyph unicode="7" horiz-adv-x="619" d="M572,700l0,-116l-314,-584l-174,0l313,567l-329,0l0,133z"/>
+<glyph unicode="8" horiz-adv-x="630" d="M315,-10C264,-10 218,-2 177,15C136,32 103,56 80,87C57,118 45,153 45,193C45,235 54,270 73,297C92,324 120,346 158,363C129,380 107,401 92,426C77,451 69,481 69,517C69,553 79,586 100,615C121,644 150,668 187,685C224,702 267,710 315,710C363,710 406,702 443,685C480,668 509,644 530,615C551,586 561,553 561,517C561,481 553,451 538,426C523,401 501,380 472,363C510,343 538,320 557,295C576,270 585,237 585,197C585,154 573,117 550,86C527,55 495,31 454,15C413,-2 367,-10 315,-10M315,583C284,583 260,575 242,559C224,543 215,524 215,501C215,476 224,455 243,439C261,422 285,414 315,414C345,414 369,422 388,438C406,454 415,475 415,500C415,523 406,543 388,559C370,575 346,583 315,583M315,292C279,292 250,284 228,269C205,253 194,232 194,205C194,180 205,159 227,142C248,125 278,117 315,117C352,117 382,125 404,142C425,159 436,180 436,205C436,232 425,253 403,269C380,284 351,292 315,292z"/>
+<glyph unicode="9" horiz-adv-x="662" d="M302,-12C254,-12 212,-5 175,10C138,24 104,44 72,71l81,117C179,167 204,151 228,142C251,133 277,128 306,128C347,128 380,142 404,171C428,200 443,238 448,287C411,255 363,239 306,239C229,239 169,259 124,300C79,340 56,395 56,466C56,513 67,555 90,592C113,629 144,659 185,680C225,701 271,712 323,712C369,712 408,706 439,694C470,682 498,663 525,636C552,609 572,575 587,533C601,491 608,437 608,371C608,294 596,227 573,170C549,112 514,67 469,36C423,4 367,-12 302,-12M328,580C291,580 262,570 241,551C220,531 209,505 209,473C209,441 220,415 242,396C264,377 294,367 331,367C368,367 398,377 419,396C440,415 451,441 451,472C451,504 440,530 418,550C396,570 366,580 328,580z"/>
+<glyph unicode=":" horiz-adv-x="296" d="M67,536l162,0l0,-160l-162,0M67,160l162,0l0,-160l-162,0z"/>
+<glyph unicode=";" horiz-adv-x="296" d="M67,536l162,0l0,-160l-162,0M129,0l-62,0l0,160l162,0l0,-135C229,-39 214,-86 183,-115C152,-145 105,-161 44,-162l-13,63C66,-96 91,-85 108,-68C125,-51 132,-29 129,0z"/>
+<glyph unicode="&lt;" horiz-adv-x="640" d="M552,492l-338,-139l338,-139l0,-143l-484,212l0,138l484,212z"/>
+<glyph unicode="=" horiz-adv-x="640" d="M557,413l-474,0l0,138l474,0M557,153l-474,0l0,138l474,0z"/>
+<glyph unicode="&gt;" horiz-adv-x="640" d="M88,212l338,139l-338,139l0,143l484,-212l0,-138l-484,-212z"/>
+<glyph unicode="?" horiz-adv-x="544" d="M354,497C354,520 346,537 330,550C314,563 291,569 262,569C208,569 158,546 112,500l-92,101C85,673 167,709 265,709C338,709 397,691 441,655C485,618 507,567 507,501C507,442 489,396 454,365C419,333 371,311 310,299l-11,-61l-102,0l-23,162l5,5C240,408 285,417 313,432C340,447 354,469 354,497M164,160l162,0l0,-160l-162,0z"/>
+<glyph unicode="@" horiz-adv-x="980" d="M728,65C691,65 660,71 635,82C610,93 590,108 575,125C531,85 482,65 427,65C393,65 362,73 334,89C306,104 284,127 268,156C252,185 244,219 244,258C244,304 255,346 276,385C297,423 324,453 359,476C393,498 429,509 468,509C527,509 573,486 606,441l11,53l118,-19l-47,-269C686,196 685,186 685,175C685,156 692,141 705,130C718,118 735,112 758,112C795,112 825,130 849,166C873,202 885,252 885,316C885,377 868,435 833,490C798,545 751,589 691,622C630,655 564,672 491,672C417,672 350,654 290,619C229,583 182,535 147,474C112,413 95,346 95,274C95,201 112,135 147,74C182,13 230,-34 291,-69C352,-104 422,-122 499,-122C547,-122 590,-116 628,-105C666,-94 705,-78 744,-55l20,-32C724,-112 682,-130 639,-143C596,-156 549,-162 499,-162C416,-162 340,-142 272,-103C204,-64 151,-11 112,56C73,123 53,195 53,274C53,353 73,426 112,493C151,560 204,613 271,653C338,692 411,712 491,712C570,712 644,694 711,657C778,620 830,571 869,510C908,449 927,384 927,316C927,262 918,216 901,179C883,141 859,113 829,94C799,75 765,65 728,65M488,406C467,406 447,400 429,388C410,375 396,358 385,337C374,315 368,291 368,265C368,234 377,211 394,194C411,177 434,168 462,168C483,168 502,174 521,187C539,200 554,217 565,239C576,261 581,285 581,312C581,340 572,363 555,380C538,397 515,406 488,406z"/>
+<glyph unicode="A" horiz-adv-x="790" d="M541,157l-296,0l-64,-157l-157,0l300,705l142,0l300,-705l-161,0M300,293l186,0l-93,227z"/>
+<glyph unicode="B" horiz-adv-x="722" d="M417,0l-333,0l0,700l325,0C480,700 537,684 578,651C619,618 640,574 640,519l0,-2C640,451 609,401 548,366C591,349 624,328 646,301C668,274 679,239 679,194l0,-2C679,129 656,82 609,49C562,16 498,0 417,0M386,565l-152,0l0,-148l142,0C411,417 439,423 458,435C477,447 487,466 487,491l0,2C487,516 478,534 461,547C444,559 419,565 386,565M412,289l-178,0l0,-154l183,0C452,135 479,141 498,154C517,167 526,186 526,211l0,2C526,237 517,256 498,269C479,282 451,289 412,289z"/>
+<glyph unicode="C" horiz-adv-x="738" d="M412,-12C345,-12 284,4 229,36C174,68 131,112 100,167C69,222 53,282 53,348l0,2C53,416 69,477 100,532C131,587 174,631 230,664C285,696 348,712 418,712C480,712 533,703 576,685C619,666 659,639 694,604l-98,-113C567,517 539,537 510,550C481,563 450,570 417,570C378,570 344,560 313,541C282,521 257,495 240,462C223,429 214,392 214,352l0,-2C214,310 223,273 240,240C257,206 281,179 312,160C343,140 378,130 417,130C454,130 487,137 514,150C541,163 570,184 601,212l98,-99C660,72 619,41 575,20C530,-1 476,-12 412,-12z"/>
+<glyph unicode="D" horiz-adv-x="782" d="M357,0l-273,0l0,700l273,0C429,700 493,685 550,655C606,624 650,583 682,530C713,477 729,417 729,352l0,-2C729,285 713,225 682,172C650,119 606,77 550,46C493,15 429,0 357,0M357,561l-119,0l0,-422l119,0C398,139 435,148 467,166C499,183 524,208 542,240C559,271 568,307 568,348l0,2C568,391 559,427 542,459C524,491 499,516 467,534C435,552 398,561 357,561z"/>
+<glyph unicode="E" horiz-adv-x="670" d="M84,700l528,0l0,-137l-375,0l0,-142l330,0l0,-137l-330,0l0,-147l380,0l0,-137l-533,0z"/>
+<glyph unicode="F" horiz-adv-x="656" d="M238,411l334,0l0,-140l-334,0l0,-271l-154,0l0,700l533,0l0,-140l-379,0z"/>
+<glyph unicode="G" horiz-adv-x="784" d="M421,-12C350,-12 286,4 230,35C174,66 131,108 100,163C69,218 53,279 53,348l0,2C53,416 69,477 101,532C132,587 176,631 232,664C288,696 351,712 420,712C481,712 532,704 574,689C616,673 656,649 695,616l-97,-117C569,524 540,542 513,553C486,564 453,570 415,570C378,570 345,560 314,541C283,521 259,494 241,461C223,428 214,391 214,352l0,-2C214,308 223,270 241,236C259,202 284,176 317,157C349,138 385,128 426,128C484,128 532,142 571,170l0,100l-155,0l0,133l304,0l0,-304C633,25 533,-12 421,-12z"/>
+<glyph unicode="H" horiz-adv-x="760" d="M522,281l-284,0l0,-281l-154,0l0,700l154,0l0,-277l284,0l0,277l154,0l0,-700l-154,0z"/>
+<glyph unicode="I" horiz-adv-x="336" d="M91,700l154,0l0,-700l-154,0z"/>
+<glyph unicode="J" horiz-adv-x="564" d="M243,-10C149,-10 73,25 14,95l97,108C132,180 153,162 174,151C194,139 216,133 239,133C269,133 292,143 309,162C325,181 333,210 333,249l0,451l158,0l0,-458C491,159 469,97 425,54C380,11 320,-10 243,-10z"/>
+<glyph unicode="K" horiz-adv-x="730" d="M319,298l-81,-84l0,-214l-154,0l0,700l154,0l0,-306l284,306l186,0l-285,-297l298,-403l-185,0z"/>
+<glyph unicode="L" horiz-adv-x="619" d="M84,700l154,0l0,-560l349,0l0,-140l-503,0z"/>
+<glyph unicode="M" horiz-adv-x="868" d="M631,457l-197,-299l-4,0l-195,296l0,-454l-151,0l0,700l166,0l184,-296l184,296l166,0l0,-700l-153,0z"/>
+<glyph unicode="N" horiz-adv-x="790" d="M236,445l0,-445l-152,0l0,700l142,0l328,-431l0,431l152,0l0,-700l-131,0z"/>
+<glyph unicode="O" horiz-adv-x="850" d="M424,-12C353,-12 290,4 234,36C177,68 133,112 101,167C69,222 53,282 53,348l0,2C53,416 69,477 102,532C134,587 178,631 235,664C292,696 355,712 426,712C497,712 560,696 617,664C673,632 717,589 749,534C781,479 797,418 797,352l0,-2C797,284 781,223 749,168C716,113 672,69 615,37C558,4 495,-12 424,-12M424,570C383,570 347,560 316,541C284,522 259,495 241,462C223,429 214,392 214,352l0,-2C214,310 223,273 242,240C260,206 285,179 317,160C349,140 385,130 426,130C467,130 503,140 535,159C566,178 591,205 609,238C627,271 636,308 636,348l0,2C636,390 627,427 609,461C590,494 565,521 533,541C501,560 465,570 424,570z"/>
+<glyph unicode="P" horiz-adv-x="668" d="M355,210l-117,0l0,-210l-154,0l0,700l286,0C425,700 472,690 513,670C553,649 584,621 606,584C627,547 638,505 638,458l0,-2C638,404 626,359 601,322C576,285 542,257 499,238C456,219 408,210 355,210M357,561l-119,0l0,-214l122,0C397,347 427,357 449,377C471,397 482,422 482,453l0,2C482,489 471,515 449,534C427,552 396,561 357,561z"/>
+<glyph unicode="Q" horiz-adv-x="850" d="M632,48C570,8 501,-12 424,-12C353,-12 290,4 234,36C177,68 133,112 101,167C69,222 53,282 53,348l0,2C53,416 69,477 102,532C134,587 178,631 235,664C292,696 355,712 426,712C497,712 560,696 617,664C673,632 717,589 749,534C781,479 797,418 797,352l0,-2C797,313 792,278 781,244C770,210 755,178 735,149l72,-61l-98,-109M424,570C383,570 347,560 316,541C284,522 259,495 241,462C223,429 214,392 214,352l0,-2C214,310 223,273 242,240C260,206 285,179 317,160C349,140 385,130 426,130C459,130 489,136 518,149l-114,97l98,110l115,-104C630,280 636,312 636,348l0,2C636,390 627,427 609,461C590,494 565,521 533,541C501,560 465,570 424,570z"/>
+<glyph unicode="R" horiz-adv-x="723" d="M359,224l-121,0l0,-224l-154,0l0,700l320,0C487,700 551,680 598,639C645,598 668,541 668,469l0,-2C668,412 655,367 628,331C601,294 565,267 518,250l171,-250l-180,0M391,561l-153,0l0,-201l156,0C431,360 460,369 481,387C502,405 512,429 512,459l0,2C512,494 501,519 480,536C459,553 429,561 391,561z"/>
+<glyph unicode="S" horiz-adv-x="640" d="M333,-10C279,-10 226,0 175,19C124,38 77,65 36,102l91,109C160,184 194,163 228,148C262,133 298,126 336,126C367,126 392,132 410,144C428,155 437,171 437,192l0,2C437,208 433,220 426,229C419,238 405,247 385,256C364,264 335,273 296,283C243,297 200,312 168,327C135,342 110,363 92,390C73,417 64,452 64,497l0,2C64,541 75,578 96,610C117,641 146,666 183,684C220,701 262,710 309,710C408,710 495,680 569,621l-80,-116C423,551 362,574 307,574C278,574 256,568 241,557C225,546 217,531 217,513l0,-2C217,496 221,483 230,474C238,464 252,455 273,447C294,439 325,430 368,419C444,399 500,374 536,343C572,312 590,267 590,209l0,-2C590,139 567,86 520,48C473,9 410,-10 333,-10z"/>
+<glyph unicode="T" horiz-adv-x="648" d="M401,0l-154,0l0,558l-213,0l0,142l580,0l0,-142l-213,0z"/>
+<glyph unicode="U" horiz-adv-x="756" d="M376,-11C281,-11 206,16 153,69C100,122 73,199 73,300l0,400l154,0l0,-396C227,248 240,205 267,176C293,146 330,131 378,131C426,131 463,145 490,174C516,203 529,244 529,299l0,401l154,0l0,-395C683,201 656,122 602,69C547,16 472,-11 376,-11z"/>
+<glyph unicode="V" horiz-adv-x="750" d="M307,-5l-283,705l170,0l183,-493l183,493l166,0l-283,-705z"/>
+<glyph unicode="W" horiz-adv-x="1122" d="M719,-5l-158,458l-158,-458l-134,0l-239,705l165,0l145,-474l157,476l132,0l157,-476l145,474l161,0l-239,-705z"/>
+<glyph unicode="X" horiz-adv-x="732" d="M364,240l-158,-240l-175,0l244,356l-234,344l180,0l147,-227l148,227l175,0l-234,-342l244,-358l-180,0z"/>
+<glyph unicode="Y" horiz-adv-x="716" d="M435,0l-154,0l0,276l-269,424l180,0l167,-281l170,281l175,0l-269,-421z"/>
+<glyph unicode="Z" horiz-adv-x="708" d="M63,117l385,448l-373,0l0,135l571,0l0,-117l-385,-448l385,0l0,-135l-583,0z"/>
+<glyph unicode="\" horiz-adv-x="530" d="M429,-128l-443,926l129,0l443,-926z"/>
+<glyph unicode="^" horiz-adv-x="500" d="M50,493l148,207l104,0l148,-207l-110,0l-91,117l-91,-117z"/>
+<glyph unicode="_" horiz-adv-x="600" d="M602,-160l-604,0l0,116l604,0z"/>
+<glyph unicode="&#x2018;" horiz-adv-x="286" d="M157,543l62,0l0,-160l-162,0l0,135C57,582 73,629 104,659C135,688 181,704 242,705l13,-63C220,639 195,629 178,612C161,595 154,572 157,543z"/>
+<glyph unicode="a" horiz-adv-x="592" d="M382,58C341,13 287,-10 220,-10C167,-10 124,5 89,34C54,63 36,103 36,154l0,2C36,213 56,255 95,284C134,313 186,327 252,327C297,327 340,320 383,305l0,9C383,346 373,370 354,387C335,404 306,412 268,412C241,412 216,410 194,405C171,400 147,393 120,383l-38,116C115,514 147,525 179,532C210,539 247,542 290,542C371,542 432,522 471,483C510,443 529,386 529,311l0,-311l-147,0M288,236C255,236 230,230 211,217C192,204 183,186 183,162l0,-2C183,140 191,124 206,113C221,101 241,95 266,95C301,95 330,104 352,122C374,139 385,162 385,189l0,27C356,229 324,236 288,236z"/>
+<glyph unicode="b" horiz-adv-x="675" d="M387,-10C350,-10 318,-3 291,12C264,26 241,45 220,70l0,-70l-152,0l0,730l152,0l0,-271C263,517 318,546 387,546C430,546 470,535 507,514C544,492 574,460 597,418C620,376 631,326 631,269l0,-2C631,210 620,160 598,118C575,76 545,44 508,23C471,1 430,-10 387,-10M348,417C324,417 302,411 283,399C263,386 247,369 236,346C224,323 218,298 218,269l0,-2C218,238 224,213 236,190C247,167 263,150 283,138C302,125 324,119 348,119C372,119 394,125 414,138C434,150 450,167 462,190C473,212 479,238 479,267l0,2C479,298 473,323 462,346C450,369 434,386 414,399C394,411 372,417 348,417z"/>
+<glyph unicode="c" horiz-adv-x="571" d="M321,-12C268,-12 221,0 179,25C136,50 103,83 79,126C54,168 42,214 42,265l0,2C42,318 54,364 78,407C102,450 136,484 179,509C222,534 270,546 323,546C372,546 413,538 447,523C480,508 510,485 537,456l-93,-100C425,376 407,391 388,401C369,410 347,415 322,415C297,415 275,408 256,395C236,382 220,364 209,342C198,319 192,295 192,269l0,-2C192,225 205,190 230,162C255,133 287,119 328,119C352,119 374,124 393,133C412,142 431,157 451,176l89,-90C511,54 479,30 446,13C413,-4 371,-12 321,-12z"/>
+<glyph unicode="d" horiz-adv-x="675" d="M455,77C412,19 357,-10 288,-10C245,-10 205,1 168,23C131,44 101,76 78,118C55,160 44,210 44,267l0,2C44,326 55,376 78,418C100,460 130,492 167,514C204,535 245,546 288,546C325,546 357,539 384,525C411,510 434,491 455,466l0,264l152,0l0,-730l-152,0M327,417C303,417 281,411 261,399C241,386 225,369 214,347C202,324 196,298 196,269l0,-2C196,238 202,213 214,190C225,167 241,150 261,138C281,125 303,119 327,119C351,119 373,125 393,138C412,150 428,167 440,190C451,213 457,238 457,267l0,2C457,298 451,323 440,346C428,369 412,386 393,399C373,411 351,417 327,417z"/>
+<glyph unicode="e" horiz-adv-x="613" d="M566,215l-373,0C200,181 215,155 238,137C261,119 289,110 324,110C349,110 372,114 392,123C412,132 433,146 454,165l87,-77C487,21 414,-12 322,-12C269,-12 221,0 179,23C136,46 103,79 79,121C54,163 42,211 42,265l0,2C42,318 53,364 76,407C99,450 130,484 171,509C211,534 256,546 307,546C364,546 413,533 452,506C491,479 520,444 539,400C558,356 568,308 568,255l0,-2C568,246 567,234 566,215M307,424C276,424 251,414 231,394C210,373 197,345 191,310l229,0C415,345 403,372 384,393C364,414 338,424 307,424z"/>
+<glyph unicode="f" horiz-adv-x="382" d="M299,609C262,609 244,590 244,551l0,-21l123,0l0,-124l-121,0l0,-406l-152,0l0,406l-63,0l0,125l63,0l0,34C94,680 149,737 260,737C301,737 337,732 368,722l0,-126C344,605 321,609 299,609z"/>
+<glyph unicode="g" horiz-adv-x="675" d="M308,-162C221,-162 142,-143 71,-106l52,114C152,-8 181,-20 210,-28C239,-37 270,-41 304,-41C406,-41 457,8 457,105l0,26C433,102 408,80 381,66C354,51 321,44 282,44C239,44 200,54 164,74C127,94 98,123 77,161C55,198 44,243 44,294l0,2C44,347 55,392 77,430C99,467 128,496 165,516C201,536 240,546 282,546C321,546 353,539 380,525C407,511 432,491 455,466l0,70l152,0l0,-415C607,22 583,-50 534,-95C485,-140 409,-162 308,-162M326,420C289,420 258,408 233,385C208,362 196,332 196,296l0,-2C196,257 208,228 233,205C258,182 289,170 326,170C363,170 395,182 420,205C445,228 457,258 457,294l0,2C457,332 445,362 420,385C395,408 363,420 326,420z"/>
+<glyph unicode="h" horiz-adv-x="623" d="M407,299C407,334 399,361 383,380C367,399 344,408 315,408C286,408 263,399 246,380C229,361 220,334 220,299l0,-299l-152,0l0,730l152,0l0,-270C241,487 263,508 288,523C312,538 342,546 377,546C434,546 479,528 511,493C543,458 559,409 559,347l0,-347l-152,0z"/>
+<glyph unicode="i" horiz-adv-x="302" d="M71,730l160,0l0,-135l-160,0M75,536l152,0l0,-536l-152,0z"/>
+<glyph unicode="j" horiz-adv-x="302" d="M71,730l160,0l0,-135l-160,0M55,-163C32,-163 10,-161 -11,-157l0,119C1,-40 12,-41 21,-41C57,-41 75,-20 75,21l0,515l152,0l0,-527C227,-106 170,-163 55,-163z"/>
+<glyph unicode="k" horiz-adv-x="592" d="M273,219l-53,-56l0,-163l-152,0l0,730l152,0l0,-389l178,195l182,0l-204,-211l211,-325l-174,0z"/>
+<glyph unicode="l" horiz-adv-x="302" d="M75,730l152,0l0,-730l-152,0z"/>
+<glyph unicode="m" horiz-adv-x="950" d="M734,299C734,335 726,362 711,381C696,399 674,408 645,408C616,408 594,399 578,380C561,361 553,334 553,299l0,-299l-152,0l0,299C401,335 393,362 378,381C363,399 341,408 312,408C283,408 261,399 245,380C228,361 220,334 220,299l0,-299l-152,0l0,536l152,0l0,-76C241,487 263,508 288,523C313,538 343,546 378,546C413,546 443,539 469,524C495,509 515,488 529,461C578,518 636,546 705,546C762,546 807,529 839,496C870,462 886,413 886,349l0,-349l-152,0z"/>
+<glyph unicode="n" horiz-adv-x="623" d="M407,299C407,334 399,361 383,380C367,399 344,408 315,408C286,408 263,399 246,380C229,361 220,334 220,299l0,-299l-152,0l0,536l152,0l0,-76C241,487 263,508 288,523C312,538 342,546 377,546C434,546 479,528 511,493C543,458 559,409 559,347l0,-347l-152,0z"/>
+<glyph unicode="o" horiz-adv-x="664" d="M331,-12C277,-12 228,0 184,25C139,50 105,83 80,126C55,168 42,214 42,265l0,2C42,318 55,364 80,407C105,450 140,484 185,509C229,534 278,546 333,546C387,546 436,534 481,509C525,484 560,451 585,409C610,366 622,320 622,269l0,-2C622,216 609,170 584,127C559,84 524,51 480,26C435,1 386,-12 331,-12M331,415C289,415 255,401 230,373C205,345 192,310 192,269l0,-2C192,240 198,216 210,194C222,171 239,153 260,140C281,126 306,119 333,119C375,119 409,133 434,161C459,189 472,224 472,265l0,2C472,294 466,318 454,341C442,363 425,381 404,395C383,408 358,415 331,415z"/>
+<glyph unicode="p" horiz-adv-x="675" d="M387,-10C350,-10 318,-3 291,12C264,26 241,45 220,70l0,-230l-152,0l0,696l152,0l0,-77C263,517 318,546 387,546C430,546 470,535 507,514C544,492 574,460 597,418C620,376 631,326 631,269l0,-2C631,210 620,160 598,118C575,76 545,44 508,23C471,1 430,-10 387,-10M348,417C324,417 302,411 283,399C263,386 247,369 236,346C224,323 218,298 218,269l0,-2C218,238 224,213 236,190C247,167 263,150 283,138C302,125 324,119 348,119C372,119 394,125 414,138C434,150 450,167 462,190C473,212 479,238 479,267l0,2C479,298 473,323 462,346C450,369 434,386 414,399C394,411 372,417 348,417z"/>
+<glyph unicode="q" horiz-adv-x="675" d="M455,77C412,19 357,-10 288,-10C245,-10 205,1 168,23C131,44 101,76 78,118C55,160 44,210 44,267l0,2C44,326 55,376 78,418C100,460 130,492 167,514C204,535 245,546 288,546C325,546 357,539 384,525C411,510 434,491 455,466l0,70l152,0l0,-696l-152,0M327,417C303,417 281,411 261,399C241,386 225,369 214,347C202,324 196,298 196,269l0,-2C196,238 202,213 214,190C225,167 241,150 261,138C281,125 303,119 327,119C351,119 373,125 393,138C412,150 428,167 440,190C451,213 457,238 457,267l0,2C457,298 451,323 440,346C428,369 412,386 393,399C373,411 351,417 327,417z"/>
+<glyph unicode="r" horiz-adv-x="418" d="M220,198l0,-198l-152,0l0,536l152,0l0,-108C237,467 259,497 286,518C313,539 348,548 391,546l0,-159l-8,0C331,387 291,371 263,340C234,308 220,261 220,198z"/>
+<glyph unicode="s" horiz-adv-x="502" d="M256,-10C217,-10 177,-3 137,10C97,23 60,44 26,71l65,100C120,150 149,135 178,124C207,113 235,107 260,107C281,107 297,111 308,118C319,125 324,134 324,147l0,2C324,162 317,172 303,180C288,187 265,196 233,205l-20,6C164,225 126,244 97,267C68,290 53,325 53,372l0,2C53,409 62,440 79,466C96,491 120,511 150,524C179,537 212,544 249,544C283,544 318,539 353,528C388,517 420,501 449,482l-58,-105C364,393 338,405 313,414C288,423 265,427 246,427C228,427 214,424 205,417C195,410 190,401 190,390l0,-2C190,379 195,371 204,364C213,357 227,350 245,343C262,336 280,330 299,324C348,307 388,288 417,265C446,242 461,208 461,165l0,-2C461,106 442,63 405,34C367,5 317,-10 256,-10z"/>
+<glyph unicode="t" horiz-adv-x="415" d="M249,-9C199,-9 161,3 134,28C107,52 93,93 93,152l0,254l-64,0l0,130l64,0l0,137l152,0l0,-137l126,0l0,-130l-126,0l0,-229C245,160 249,147 257,138C265,129 277,125 294,125C321,125 346,131 369,144l0,-122C334,1 294,-9 249,-9z"/>
+<glyph unicode="u" horiz-adv-x="623" d="M403,76C382,49 360,28 336,13C311,-2 281,-10 246,-10C189,-10 144,8 112,43C80,78 64,127 64,189l0,347l152,0l0,-299C216,202 224,175 240,156C256,137 279,128 308,128C337,128 361,137 378,156C395,175 403,202 403,237l0,299l152,0l0,-536l-152,0z"/>
+<glyph unicode="v" horiz-adv-x="600" d="M231,-4l-211,540l161,0l120,-359l121,359l158,0l-211,-540z"/>
+<glyph unicode="w" horiz-adv-x="861" d="M533,-4l-103,329l-105,-329l-136,0l-165,540l154,0l86,-325l101,327l131,0l102,-328l88,326l151,0l-167,-540z"/>
+<glyph unicode="x" horiz-adv-x="584" d="M290,167l-108,-167l-159,0l188,272l-181,264l163,0l100,-156l101,156l159,0l-181,-261l189,-275l-163,0z"/>
+<glyph unicode="y" horiz-adv-x="600" d="M196,-163C170,-163 146,-160 125,-153C103,-147 82,-138 61,-126l51,110C135,-30 157,-37 177,-37C190,-37 201,-34 209,-29C216,-24 223,-15 230,-2l-210,538l161,0l122,-365l117,365l158,0l-206,-549C351,-68 328,-107 302,-129C276,-152 241,-163 196,-163z"/>
+<glyph unicode="z" horiz-adv-x="563" d="M50,107l277,306l-268,0l0,123l457,0l0,-107l-278,-306l278,0l0,-123l-466,0z"/>
+<glyph unicode="~" horiz-adv-x="510" d="M337,234C322,234 308,236 295,240C282,243 265,249 242,257C217,268 199,273 187,273C172,273 161,269 154,262C146,254 138,241 130,224l-81,25C62,295 77,330 96,353C115,376 140,387 173,387C188,387 202,385 215,382C228,378 245,372 268,364C293,353 311,348 323,348C338,348 349,352 357,360C364,367 372,380 380,397l81,-25C448,326 433,292 414,269C395,246 370,234 337,234z"/>
+<glyph unicode="&#xA3;" horiz-adv-x="644" d="M373,710C426,710 470,700 505,680C540,660 571,632 598,595l-117,-94C463,524 446,541 430,552C414,562 396,567 375,567C350,567 330,559 315,542C300,525 292,501 292,471l0,-77l228,0l0,-127l-228,0l0,-134l304,0l0,-133l-536,0l0,101l76,25l0,141l-76,0l0,127l76,0l0,81C136,549 157,607 198,648C239,689 298,710 373,710z"/>
+<glyph unicode="'" horiz-adv-x="286" d="M245,700l0,-5l-109,-314l-79,0l18,319z"/>
+<glyph unicode="&#x201C;" horiz-adv-x="540" d="M157,543l62,0l0,-160l-162,0l0,135C57,582 73,629 104,659C135,688 181,704 242,705l13,-63C220,639 195,629 178,612C161,595 154,572 157,543M411,543l62,0l0,-160l-162,0l0,135C311,582 327,629 358,659C389,688 435,704 496,705l13,-63C474,639 449,629 432,612C415,595 408,572 411,543z"/>
+<glyph unicode="&#x2022;" horiz-adv-x="500" d="M250,203C223,203 199,210 176,223C153,236 134,255 121,278C108,301 101,325 101,352C101,379 108,404 121,427C134,450 153,468 176,481C199,494 223,501 250,501C277,501 302,494 325,481C348,468 366,450 379,427C392,404 399,379 399,352C399,325 392,301 379,278C366,255 348,236 325,223C302,210 277,203 250,203z"/>
+<glyph unicode="&#x201D;" horiz-adv-x="540" d="M129,540l-62,0l0,160l162,0l0,-135C229,501 214,454 183,425C152,395 105,379 44,378l-13,63C66,444 91,455 108,472C125,489 132,511 129,540M383,540l-62,0l0,160l162,0l0,-135C483,501 468,454 437,425C406,395 359,379 298,378l-13,63C320,444 345,455 362,472C379,489 386,511 383,540z"/>
+<glyph unicode="&#x2122;" horiz-adv-x="690" d="M118,392l0,246l-92,0l0,62l254,0l0,-62l-92,0l0,-246M496,465l-85,135l0,-208l-66,0l0,308l74,0l81,-130l81,130l72,0l0,-308l-66,0l0,208l-85,-135z"/>
+<glyph unicode="&#xA9;" horiz-adv-x="830" d="M414,-12C347,-12 287,4 232,37C177,69 133,113 101,168C69,223 53,284 53,349C53,414 69,475 102,531C134,586 178,630 233,663C288,696 349,712 416,712C483,712 544,696 599,664C654,631 697,587 729,532C761,477 777,416 777,351C777,286 761,225 729,170C696,114 652,70 597,37C542,4 481,-12 414,-12M416,672C356,672 302,658 253,629C204,600 165,560 137,511C109,462 95,408 95,349C95,290 109,237 137,188C165,139 203,100 252,71C301,42 355,28 414,28C474,28 529,43 578,72C627,101 665,140 693,189C721,238 735,292 735,351C735,410 721,464 693,513C665,562 627,600 578,629C529,658 475,672 416,672M419,156C382,156 348,165 318,182C288,199 265,223 248,254C231,284 222,317 222,354C222,391 231,424 248,455C265,485 288,509 319,527C349,545 383,554 422,554C456,554 485,549 509,539C532,529 554,514 574,495l-55,-64C487,460 455,474 422,474C391,474 365,463 344,440C323,417 312,388 312,355C312,322 322,294 343,271C364,248 390,236 422,236C442,236 459,240 474,247C488,254 504,266 521,281l56,-56C556,202 533,184 509,173C484,162 454,156 419,156z"/>
+<glyph unicode="&#xAE;" horiz-adv-x="830" d="M414,-12C347,-12 287,4 232,37C177,69 133,113 101,168C69,223 53,284 53,349C53,414 69,475 102,531C134,586 178,630 233,663C288,696 349,712 416,712C483,712 544,696 599,664C654,631 697,587 729,532C761,477 777,416 777,351C777,286 761,225 729,170C696,114 652,70 597,37C542,4 481,-12 414,-12M416,672C356,672 302,658 253,629C204,600 165,560 137,511C109,462 95,408 95,349C95,290 109,237 137,188C165,139 203,100 252,71C301,42 355,28 414,28C474,28 529,43 578,72C627,101 665,140 693,189C721,238 735,292 735,351C735,410 721,464 693,513C665,562 627,600 578,629C529,658 475,672 416,672M505,306l94,-138l-99,0l-82,124l-67,0l0,-124l-85,0l0,385l171,0C484,553 521,542 548,520C575,497 588,466 588,426C588,396 581,371 566,351C551,330 531,315 505,306M434,478l-83,0l0,-113l85,0C457,365 474,370 485,381C496,391 502,404 502,421C502,440 496,454 484,464C472,473 455,478 434,478z"/>
+<glyph unicode="&#xA0;" horiz-adv-x="300"/>
+</font>
+
+ <image style="overflow:visible;" width="787" height="443" xlink:href="C:\Users\Minteck\Desktop\loader.png" transform="matrix(0.9974 0 0 0.9977 1 1)">
+</image>
+<text transform="matrix(1 0 0 1 59.7305 138.855)" class="st0 st1 st2">Kartik</text>
+<text transform="matrix(1 0 0 1 61.7622 159.8193)" class="st0 st1 st3">%version%</text>
+<rect x="-8.8" y="392" class="st4" width="711.8" height="153.5"/>
+<rect x="638" y="0" class="st4" width="43.4" height="443"/>
+<rect x="-709.8" y="0" class="st4" width="711.8" height="443"/>
+<rect x="-42" y="-441" class="st4" width="711.8" height="443"/>
+<image style="overflow:visible;" width="1080" height="1080" xlink:href="C:\Users\Minteck\Desktop\1.png" transform="matrix(4.612159e-02 0 0 4.612159e-02 540.8679 295.5552)">
+</image>
+</svg>
diff --git a/views/menu.css b/views/menu.css
index d6fc60e..2c2b94f 100644
--- a/views/menu.css
+++ b/views/menu.css
@@ -37,8 +37,12 @@
}
.services:not(.services-settings) li.selected .item {
- border-color: #00ff99;
+ background-color: rgba(0, 255, 153, 0.25);
+ backdrop-filter: blur(10px);
+ border-radius: 10px;
animation-direction: alternate-reverse;
+ position: relative;
+ z-index: 9999999999;
animation-duration: 3s;
animation-name: border-overlay;
animation-fill-mode: both;
@@ -59,10 +63,10 @@
@keyframes border-overlay {
0% {
- border-color: #00ff66;
+ background-color: rgba(0, 255, 102, 0.25);
}
100% {
- border-color: #00ccff;
+ background-color: rgba(0, 204, 255, 0.25);
}
}
diff --git a/views/script/core_notification.js b/views/script/core_notification.js
new file mode 100644
index 0000000..118d19d
--- /dev/null
+++ b/views/script/core_notification.js
@@ -0,0 +1,13 @@
+var ipcRenderer = require('electron').ipcRenderer;
+ipcRenderer.on('notification', function (event, data) {
+ document.getElementById("notification-title").innerText = data.title;
+ document.getElementById("notification-message").innerText = data.message;
+ document.getElementById("notification").style.right = "20px";
+ document.getElementById("notification").style.opacity = "1";
+ new Audio("./sfx/notification.mp3").play();
+
+ setTimeout(() => {
+ document.getElementById("notification").style.right = "-300px";
+ document.getElementById("notification").style.opacity = "0";
+ }, 5000)
+}); \ No newline at end of file
diff --git a/views/script/loader_global.js b/views/script/loader_global.js
index 6bde06c..7c89d0f 100644
--- a/views/script/loader_global.js
+++ b/views/script/loader_global.js
@@ -19,7 +19,7 @@ window.addEventListener('load', () => {
document.getElementById('updates').style.backgroundColor = "lightgreen";
document.getElementById('updates').innerText = lang.updates.ok;
} else {
- document.getElementById('warning').style.opacity = "1";
+ require('@electron/remote').getCurrentWindow().webContents.send("notification", {title: lang.updates.warn[0], message: lang.updates.warn[1]});
document.getElementById('updates').style.backgroundColor = "lightyellow";
document.getElementById('updates').innerText = lang.updates.available;
}