From 91f5d1c91a66bb52966c34b62506614c1f84598f Mon Sep 17 00:00:00 2001
From: Quentin Legot <legotquentin@gmail.com>
Date: Fri, 9 Apr 2021 17:47:48 +0200
Subject: [PATCH] centralized fonts rules in fonts.css + improved settings tab
 visually + dump to 0.2.2

---
 package-lock.json                             |  2 +-
 package.json                                  |  8 ++----
 .../css/{material-icons.css => fonts.css}     | 21 +++++++++++----
 src/client/assets/css/index.css               | 27 ++++++++++---------
 src/client/assets/css/login.css               |  5 ----
 src/client/index.html                         | 14 +++++-----
 src/client/login.html                         |  2 +-
 7 files changed, 41 insertions(+), 38 deletions(-)
 rename src/client/assets/css/{material-icons.css => fonts.css} (54%)

diff --git a/package-lock.json b/package-lock.json
index cb33fc5..f196569 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "altarik-launcher",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d450e82..73f825d 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,9 @@
 {
   "name": "altarik-launcher",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Altarik Launcher",
   "main": "src/server/main.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/AltarikMC/Launcher.git"
-  },
+  "repository": "AltarikMC/Launcher",
   "scripts": {
     "start": "electron-forge start",
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -15,7 +12,6 @@
   },
   "keywords": [],
   "authors": [
-    "Topeka_",
     "Altarik"
   ],
   "license": "BSD-3-Clause",
diff --git a/src/client/assets/css/material-icons.css b/src/client/assets/css/fonts.css
similarity index 54%
rename from src/client/assets/css/material-icons.css
rename to src/client/assets/css/fonts.css
index 2d035ff..72028d3 100644
--- a/src/client/assets/css/material-icons.css
+++ b/src/client/assets/css/fonts.css
@@ -1,15 +1,14 @@
-/* fallback */
 @font-face {
     font-family: 'Material Icons';
     font-style: normal;
     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-weight: normal;
-    font-style: normal;
+   font-style: normal;
     font-size: 24px;
     line-height: 1;
     letter-spacing: normal;
@@ -18,6 +17,18 @@
     white-space: nowrap;
     word-wrap: normal;
     direction: ltr;
+    font-feature-settings: 'liga';
     -webkit-font-feature-settings: 'liga';
     -webkit-font-smoothing: antialiased;
-  }
\ No newline at end of file
+}
+
+  
+@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");
+}
diff --git a/src/client/assets/css/index.css b/src/client/assets/css/index.css
index 82168d5..b564be1 100644
--- a/src/client/assets/css/index.css
+++ b/src/client/assets/css/index.css
@@ -2,16 +2,6 @@
     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{
 	height: 100%;
 }
@@ -164,10 +154,21 @@ h3 {
 	top: 50%;
 	left: 50%;
 	transform: translate(-50%, -50%);
-	width: 400px;
-	min-height: 470px;
+	width: 480px;
+	min-height: 550px;
 	background-image: url("../images/svg/chapters_scroll.svg");
 	background-repeat: no-repeat;
 	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;
 }
\ No newline at end of file
diff --git a/src/client/assets/css/login.css b/src/client/assets/css/login.css
index f5a222a..47ef42e 100644
--- a/src/client/assets/css/login.css
+++ b/src/client/assets/css/login.css
@@ -2,11 +2,6 @@
     box-sizing: border-box;
 }
 
-@font-face {
-    font-family: "Roboto";
-    src: url("../fonts/Roboto-Regular.ttf") format("truetype");
-}
-
 html{
     height: 100%;
 }
diff --git a/src/client/index.html b/src/client/index.html
index 88e2917..59b7f44 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -4,9 +4,9 @@
     <meta charset="UTF-8">
     <title>Launcher Projet Secret</title>
     <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/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"/>
 </head>
 <body>
@@ -21,13 +21,13 @@
     <div id="fullscreen">
         <div id="close"><i class="material-icons">close</i></div>
         <div id="settings">
-                <h3>Modifier la configuration</h3>
-                <button id="disconnect-btn">Se déconnecter</button>
+                <h2>Modifier la configuration</h2>
+                <span href="" id="disconnect-btn">Se déconnecter</span>
                 <h4>Allocation mémoire</h4>
-                <label for="minMem">mémoire minimale : <div id="outputMinMem"></div></label>
-                <input type="range" min="1024" max="2048" step="128" value="1" class="slider" id="minMem">
-                <label for="maxMem">mémoire maximale : <div id="outputMaxMem"></div></label>
-                <input type="range" min="1024" max="2048" step="128" value="1" class="slider" id="maxMem">
+                <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"><br />
+                <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"><br />
         </div>
     </div>
     <div id="content">
diff --git a/src/client/login.html b/src/client/login.html
index 9d29273..68f44db 100644
--- a/src/client/login.html
+++ b/src/client/login.html
@@ -4,9 +4,9 @@
     <meta charset="UTF-8">
     <title>Launcher Projet Secret</title>
     <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/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"/>
 </head>
 <body>