From 813d9223cce757734d70a33491791267de648122 Mon Sep 17 00:00:00 2001 From: Quentin Legot Date: Sat, 19 Dec 2020 20:56:25 +0100 Subject: [PATCH] Improved installation behavior + fixed font Roboto not loading --- app.ico | Bin 0 -> 4166 bytes config.forge.js | 20 +++ include/index.css | 7 +- include/login.css | 2 +- index.html | 3 +- login.html | 3 +- main.js | 54 +++++++- package-lock.json | 333 ---------------------------------------------- package.json | 30 +---- 9 files changed, 85 insertions(+), 367 deletions(-) create mode 100644 app.ico create mode 100644 config.forge.js diff --git a/app.ico b/app.ico new file mode 100644 index 0000000000000000000000000000000000000000..b381b100aabfd8ef52d63147a61fe9a295d7d78f GIT binary patch literal 4166 zcmeH|J96AG42B^ylXVqsm6mNvm#)G+ijS~2AU(O5auXeaB?}JWAACvFWRi?0jVFSa z5IzBfNbq5z34hK#p;0)&kxGcc1Ld6_Gx9M2w)ES1B7h~jJ1KRIcV)lM;uZQ@KjC_M1-0KOOf5D-xPxX&%*rQt(sXf|}SG>+r{YPHx z=yyl1?!30h(f3=)m!{F5S~+TbJaFGm)xWmsRqordveQHU=WRRZ@6&c(D!1_b47=kZ zFT(CP6}IyDFyhQORMOjeiwDzlpSF@DOdmHQI{nQ35>08xuaTxW@aG9POpkvJGldIX zTYs>_?-{&EzRBwaKVV@cZ1!xxYxY~_q~HX@WKo5!?|kug@z$H_k6`CbVH4*#dplM3 zg};Myey_tN%>F7v(&(RAds5*GY9t3MsF0Zo&mN5Jfcc6a-$JTL8uh45-XyZ9S7znG z2xNK`PHLsQfg!1(Sgp6a6@!C@;%R*u*sU*5Rva8O6uaeqwPJA4Q0#7g;N|A)Iu`#* zVPveFm5v-V6#LF{?+9b?V#pl?IdV{=ALn$4$2lGt*POGGsOH0epEYCS0-OJ@xd;A3 Y1Dp7ivjS%Y&I+6rI4f{g;6JOt8-+EX(f|Me literal 0 HcmV?d00001 diff --git a/config.forge.js b/config.forge.js new file mode 100644 index 0000000..5ca3563 --- /dev/null +++ b/config.forge.js @@ -0,0 +1,20 @@ +const path = require('path'); +module.exports = { + packagerConfig: { + packageName: "Launcher", + name: "Launcher", + productName: "Launcher"//, + //icon: path.resolve(__dirname, 'app.ico') + }, + makers: [ + { + name: "@electron-forge/maker-squirrel", + config: { + name: "Launcher", + iconUrl: path.resolve(__dirname, 'app.ico'), + //loadingGif: path.resolve(__dirname, 'src/assets/loading.gif'), + setupIcon: path.resolve(__dirname, 'app.ico') + } + } + ] +} diff --git a/include/index.css b/include/index.css index 8eac1bc..d5d32f0 100644 --- a/include/index.css +++ b/include/index.css @@ -2,6 +2,11 @@ box-sizing: border-box; } +@font-face { + font-family: "Roboto"; + src: url("./Roboto-Regular.ttf") format("truetype"); +} + html{ height: 100%; } @@ -10,7 +15,7 @@ body{ background: white; margin:0; height:100%; - font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif; + font-family: "Roboto"; } #content{ diff --git a/include/login.css b/include/login.css index 3bc87e3..efba09a 100644 --- a/include/login.css +++ b/include/login.css @@ -4,7 +4,7 @@ @font-face { font-family: "Roboto"; - src: url("./include/Roboto-Regular.ttf") format("truetype"); + src: url("./Roboto-Regular.ttf") format("truetype"); } html{ diff --git a/index.html b/index.html index 3155c06..8b793a5 100644 --- a/index.html +++ b/index.html @@ -6,7 +6,8 @@ - + +