Altarik/Launcher
4
0
Fork 0
mirror of https://github.com/AltarikMC/Launcher synced 2024-11-22 06:19:50 +01:00
Code

centralized fonts rules in fonts.css + improved settings tab visually + dump to 0.2.2

Browse Source
This commit is contained in:
Quentin Legot 2021-04-09 17:47:48 +02:00
parent 60798e202c
commit 91f5d1c91a
7 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "altarik-launcher", "name": "altarik-launcher",
"version": "0.2.1", "version": "0.2.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

8
package.json
View File

@ -1,12 +1,9 @@
{ {
"name": "altarik-launcher", "name": "altarik-launcher",
"version": "0.2.1", "version": "0.2.2",
"description": "Altarik Launcher", "description": "Altarik Launcher",
"main": "src/server/main.js", "main": "src/server/main.js",
"repository": { "repository": "AltarikMC/Launcher",
"type": "git",
"url": "https://github.com/AltarikMC/Launcher.git"
},
"scripts": { "scripts": {
"start": "electron-forge start", "start": "electron-forge start",
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",
@ -15,7 +12,6 @@
}, },
"keywords": [], "keywords": [],
"authors": [ "authors": [
"Topeka_",
"Altarik" "Altarik"
], ],
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

19
src/client/assets/css/material-icons.css → src/client/assets/css/fonts.css
View File

@ -1,12 +1,11 @@
/* fallback */
@font-face { @font-face {
font-family: 'Material Icons'; font-family: 'Material Icons';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url(../fonts/material-icons.woff2) format('woff2'); src: url("../fonts/material-icons.woff2") format('woff2');
} }
.material-icons { .material-icons {
font-family: 'Material Icons'; font-family: 'Material Icons';
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
@ -18,6 +17,18 @@
white-space: nowrap; white-space: nowrap;
word-wrap: normal; word-wrap: normal;
direction: ltr; direction: ltr;
font-feature-settings: 'liga';
-webkit-font-feature-settings: 'liga'; -webkit-font-feature-settings: 'liga';
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
} }
@font-face {
font-family: "Roboto";
src: url("../fonts/Roboto-Regular.ttf") format("truetype");
}
@font-face {
font-family: "French-Press";
src: url("../fonts/Frenchpress.otf") format("OpenType");
}

27
src/client/assets/css/index.css
View File

@ -2,16 +2,6 @@
box-sizing: border-box; box-sizing: border-box;
} }
@font-face {
font-family: "Roboto";
src: url("../fonts/Roboto-Regular.ttf") format("truetype");
}
@font-face {
font-family: "French-Press";
src: url("../fonts/Frenchpress.otf") format("OpenType");
}
html{ html{
height: 100%; height: 100%;
} }
@ -164,10 +154,21 @@ h3 {
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
width: 400px; width: 480px;
min-height: 470px; min-height: 550px;
background-image: url("../images/svg/chapters_scroll.svg"); background-image: url("../images/svg/chapters_scroll.svg");
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100%; background-size: 100%;
padding: 10px 50px; padding: 10px 65px;
}
#settings > h2 {
text-align: center;
margin-block-end: 2em;
}
#disconnect-btn {
text-decoration: underline;
cursor: pointer;
color: black;
} }

5
src/client/assets/css/login.css
View File

@ -2,11 +2,6 @@
box-sizing: border-box; box-sizing: border-box;
} }
@font-face {
font-family: "Roboto";
src: url("../fonts/Roboto-Regular.ttf") format("truetype");
}
html{ html{
height: 100%; height: 100%;
} }

14
src/client/index.html
View File

@ -4,9 +4,9 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Launcher Projet Secret</title> <title>Launcher Projet Secret</title>
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" /> <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
<link href="assets/css/fonts.css" rel="stylesheet" />
<link href="assets/css/index.css" rel="stylesheet" /> <link href="assets/css/index.css" rel="stylesheet" />
<link href="assets/css/menubar.css" rel="stylesheet" /> <link href="assets/css/menubar.css" rel="stylesheet" />
<link href="assets/css/material-icons.css" rel="stylesheet" />
<link rel="shortcut icon" type="image/png" href="assets/images/icon.png"/> <link rel="shortcut icon" type="image/png" href="assets/images/icon.png"/>
</head> </head>
<body> <body>
@ -21,13 +21,13 @@
<div id="fullscreen"> <div id="fullscreen">
<div id="close"><i class="material-icons">close</i></div> <div id="close"><i class="material-icons">close</i></div>
<div id="settings"> <div id="settings">
<h3>Modifier la configuration</h3> <h2>Modifier la configuration</h2>
<button id="disconnect-btn">Se déconnecter</button> <span href="" id="disconnect-btn">Se déconnecter</span>
<h4>Allocation mémoire</h4> <h4>Allocation mémoire</h4>
<label for="minMem">mémoire minimale : <div id="outputMinMem"></div></label> <label for="minMem">mémoire minimale : <span id="outputMinMem"></span></label><br />
<input type="range" min="1024" max="2048" step="128" value="1" class="slider" id="minMem"> <input type="range" min="1024" max="2048" step="128" value="1" class="slider" id="minMem"><br />
<label for="maxMem">mémoire maximale : <div id="outputMaxMem"></div></label> <label for="maxMem">mémoire maximale : <span id="outputMaxMem"></span></label><br />
<input type="range" min="1024" max="2048" step="128" value="1" class="slider" id="maxMem"> <input type="range" min="1024" max="2048" step="128" value="1" class="slider" id="maxMem"><br />
</div> </div>
</div> </div>
<div id="content"> <div id="content">

2
src/client/login.html
View File

@ -4,9 +4,9 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Launcher Projet Secret</title> <title>Launcher Projet Secret</title>
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" /> <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
<link href="assets/css/fonts.css" rel="stylesheet" />
<link href="assets/css/login.css" rel="stylesheet" /> <link href="assets/css/login.css" rel="stylesheet" />
<link href="assets/css/menubar.css" rel="stylesheet" /> <link href="assets/css/menubar.css" rel="stylesheet" />
<link href="assets/css/material-icons.css" rel="stylesheet" />
<link rel="shortcut icon" type="image/png" href="assets/images/icon.png"/> <link rel="shortcut icon" type="image/png" href="assets/images/icon.png"/>
</head> </head>
<body> <body>