mirror of
https://github.com/OpenFusionProject/Client.git
synced 2024-11-21 21:20:05 +00:00
switch from tabs to spaces & set indent size to 4
This commit is contained in:
Hichem Fantar
parent
51a876cf2b
commit
fd92f2de5e
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"trailingComma": "es5",
|
"trailingComma": "es5",
|
||||||
"tabWidth": 2,
|
"useTabs": false,
|
||||||
"useTabs": true,
|
"tabWidth": 4,
|
||||||
"singleQuote": false,
|
"singleQuote": false,
|
||||||
"semi": true,
|
"semi": true,
|
||||||
"bracketSameLine": false,
|
"bracketSameLine": false,
|
||||||
|
|||||||
47
index.html
47
index.html
@ -35,8 +35,8 @@
|
|||||||
width="256"
|
width="256"
|
||||||
/>
|
/>
|
||||||
<p id="of-intro-text">
|
<p id="of-intro-text">
|
||||||
Welcome to OpenFusion.<br />Select a server from the list below to
|
Welcome to OpenFusion.<br />Select a server from the
|
||||||
get started.
|
list below to get started.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -59,7 +59,8 @@
|
|||||||
<tbody id="server-tablebody">
|
<tbody id="server-tablebody">
|
||||||
<tr id="server-listing-placeholder">
|
<tr id="server-listing-placeholder">
|
||||||
<td colspan="2">
|
<td colspan="2">
|
||||||
No servers added yet... perhaps you should find one?
|
No servers added yet... perhaps you
|
||||||
|
should find one?
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
@ -72,7 +73,9 @@
|
|||||||
id="of-serverbuttons"
|
id="of-serverbuttons"
|
||||||
style="padding-bottom: 16px"
|
style="padding-bottom: 16px"
|
||||||
>
|
>
|
||||||
<div class="col-4 text-left d-inline-flex justify-content-xl-start">
|
<div
|
||||||
|
class="col-4 text-left d-inline-flex justify-content-xl-start"
|
||||||
|
>
|
||||||
<button
|
<button
|
||||||
class="btn btn-success mr-1"
|
class="btn btn-success mr-1"
|
||||||
data-toggle="modal"
|
data-toggle="modal"
|
||||||
@ -121,12 +124,19 @@
|
|||||||
onclick="connectToServer()"
|
onclick="connectToServer()"
|
||||||
disabled=""
|
disabled=""
|
||||||
>
|
>
|
||||||
Connect <i class="fas fa-angle-double-right"></i>
|
Connect <i
|
||||||
|
class="fas fa-angle-double-right"
|
||||||
|
></i>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal fade" role="dialog" tabindex="-1" id="of-aboutmodal">
|
<div
|
||||||
|
class="modal fade"
|
||||||
|
role="dialog"
|
||||||
|
tabindex="-1"
|
||||||
|
id="of-aboutmodal"
|
||||||
|
>
|
||||||
<div class="modal-dialog modal-dialog-centered" role="document">
|
<div class="modal-dialog modal-dialog-centered" role="document">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
@ -143,8 +153,8 @@
|
|||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<p class="text-monospace">Version 1.4</p>
|
<p class="text-monospace">Version 1.4</p>
|
||||||
<p>
|
<p>
|
||||||
©2020-2022 OpenFusion Contributors<br />OpenFusion is licensed
|
©2020-2022 OpenFusion Contributors<br />OpenFusion
|
||||||
under MIT.<br />
|
is licensed under MIT.<br />
|
||||||
</p>
|
</p>
|
||||||
<a
|
<a
|
||||||
href="#of-restoreserversmodal"
|
href="#of-restoreserversmodal"
|
||||||
@ -179,7 +189,11 @@
|
|||||||
>
|
>
|
||||||
<i
|
<i
|
||||||
class="fab fa-discord"
|
class="fab fa-discord"
|
||||||
style="font-size: 24px; position: relative; top: 1px"
|
style="
|
||||||
|
font-size: 24px;
|
||||||
|
position: relative;
|
||||||
|
top: 1px;
|
||||||
|
"
|
||||||
></i>
|
></i>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@ -218,7 +232,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<form id="addserver-form" class="needs-validation">
|
<form id="addserver-form" class="needs-validation">
|
||||||
<label for="addserver-descinput">Server Description</label
|
<label for="addserver-descinput"
|
||||||
|
>Server Description</label
|
||||||
><input
|
><input
|
||||||
class="form-control form-row w-75"
|
class="form-control form-row w-75"
|
||||||
type="text"
|
type="text"
|
||||||
@ -227,7 +242,8 @@
|
|||||||
required=""
|
required=""
|
||||||
minlength="1"
|
minlength="1"
|
||||||
maxlength="70"
|
maxlength="70"
|
||||||
/><label for="addserver-ipinput">Server IP</label
|
/><label for="addserver-ipinput"
|
||||||
|
>Server IP</label
|
||||||
><input
|
><input
|
||||||
class="form-control form-row w-75"
|
class="form-control form-row w-75"
|
||||||
type="text"
|
type="text"
|
||||||
@ -288,7 +304,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<form id="editserver-form" class="needs-validation">
|
<form id="editserver-form" class="needs-validation">
|
||||||
<label for="editserver-descinput">Server Description</label
|
<label for="editserver-descinput"
|
||||||
|
>Server Description</label
|
||||||
><input
|
><input
|
||||||
class="form-control form-row w-75"
|
class="form-control form-row w-75"
|
||||||
type="text"
|
type="text"
|
||||||
@ -297,7 +314,8 @@
|
|||||||
required=""
|
required=""
|
||||||
minlength="1"
|
minlength="1"
|
||||||
maxlength="70"
|
maxlength="70"
|
||||||
/><label for="addserver-ipinput">Server IP</label
|
/><label for="addserver-ipinput"
|
||||||
|
>Server IP</label
|
||||||
><input
|
><input
|
||||||
class="form-control form-row w-75"
|
class="form-control form-row w-75"
|
||||||
type="text"
|
type="text"
|
||||||
@ -405,7 +423,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<p class="lead">
|
<p class="lead">
|
||||||
Do you really want to restore the default servers?
|
Do you really want to restore the default
|
||||||
|
servers?
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
|
|||||||
5
index.js
5
index.js
@ -154,7 +154,10 @@ function showMainWindow() {
|
|||||||
dialog.showErrorBox("Sorry!", errormsg);
|
dialog.showErrorBox("Sorry!", errormsg);
|
||||||
break;
|
break;
|
||||||
case "https://audience.fusionfall.com/ff/login.do":
|
case "https://audience.fusionfall.com/ff/login.do":
|
||||||
dialog.showErrorBox("Sorry!", "Account management is not available.");
|
dialog.showErrorBox(
|
||||||
|
"Sorry!",
|
||||||
|
"Account management is not available."
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
case "http://forums.fusionfall.com/":
|
case "http://forums.fusionfall.com/":
|
||||||
require("shell").openExternal("https://discord.gg/DYavckB");
|
require("shell").openExternal("https://discord.gg/DYavckB");
|
||||||
|
|||||||
@ -23,14 +23,15 @@
|
|||||||
text-shadow: 1px 1px 8px #4349c4;
|
text-shadow: 1px 1px 8px #4349c4;
|
||||||
color: #4a76b7;
|
color: #4a76b7;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
|
font-family: -apple-system, BlinkMacSystemFont,
|
||||||
'Helvetica Neue', Arial, 'Noto Sans', sans-serif,
|
'Segoe UI', Roboto, 'Helvetica Neue', Arial,
|
||||||
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
|
'Noto Sans', sans-serif, 'Apple Color Emoji',
|
||||||
|
'Segoe UI Emoji', 'Segoe UI Symbol',
|
||||||
'Noto Color Emoji';
|
'Noto Color Emoji';
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
OpenFusion is setting up...<br />Please wait - this should take
|
OpenFusion is setting up...<br />Please wait - this
|
||||||
<br />less than a minute.
|
should take <br />less than a minute.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user