Various changes and improvements.
Added warning message when console is opened, this is in preparation for alpha. Added a new background image. Restored random backgrounds on launch (for now). Changed the overlay dismiss/cancel buttons from anchors to buttons.
This commit is contained in:
parent
2f66d44824
commit
4b8133474d
@ -7,7 +7,7 @@
|
|||||||
<link type="text/css" rel="stylesheet" href="./assets/css/launcher.css">
|
<link type="text/css" rel="stylesheet" href="./assets/css/launcher.css">
|
||||||
<style>
|
<style>
|
||||||
body {
|
body {
|
||||||
background: url('assets/images/backgrounds/<%=0%>.jpg') no-repeat center center fixed;
|
background: url('assets/images/backgrounds/<%=bkid%>.jpg') no-repeat center center fixed;
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
}
|
}
|
||||||
#main {
|
#main {
|
||||||
|
@ -1326,14 +1326,17 @@ p {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Main overlay content anchor styles. */
|
/* Main overlay content anchor styles. */
|
||||||
#overlayContent a {
|
#overlayContent a,
|
||||||
|
#overlayDismiss {
|
||||||
color: rgba(202, 202, 202, 0.75);
|
color: rgba(202, 202, 202, 0.75);
|
||||||
transition: 0.25s ease;
|
transition: 0.25s ease;
|
||||||
}
|
}
|
||||||
#overlayContent a:hover {
|
#overlayContent a:hover,
|
||||||
|
#overlayDismiss {
|
||||||
color: rgba(255, 255, 255, 0.75);
|
color: rgba(255, 255, 255, 0.75);
|
||||||
}
|
}
|
||||||
#overlayContent a:active {
|
#overlayContent a:active,
|
||||||
|
#overlayDismiss {
|
||||||
color: rgba(165, 165, 165, 0.75);
|
color: rgba(165, 165, 165, 0.75);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1401,6 +1404,10 @@ p {
|
|||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
padding-top: 2.5px;
|
padding-top: 2.5px;
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
outline: none;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
#overlayDismiss:hover {
|
#overlayDismiss:hover {
|
||||||
color: rgba(255, 255, 255, 0.75);
|
color: rgba(255, 255, 255, 0.75);
|
||||||
@ -1640,6 +1647,10 @@ p {
|
|||||||
padding-top: 2.5px;
|
padding-top: 2.5px;
|
||||||
color: rgba(202, 202, 202, 0.75);
|
color: rgba(202, 202, 202, 0.75);
|
||||||
transition: 0.25s ease;
|
transition: 0.25s ease;
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
outline: none;
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
#serverSelectCancel:hover {
|
#serverSelectCancel:hover {
|
||||||
color: rgba(255, 255, 255, 0.75);
|
color: rgba(255, 255, 255, 0.75);
|
||||||
|
BIN
app/assets/images/backgrounds/5.jpg
Normal file
BIN
app/assets/images/backgrounds/5.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 456 KiB |
@ -4,7 +4,7 @@ const os = require('os')
|
|||||||
const path = require('path')
|
const path = require('path')
|
||||||
const rimraf = require('rimraf')
|
const rimraf = require('rimraf')
|
||||||
|
|
||||||
console.log('Preloading')
|
console.log('%c[Preloader]', 'color: #a02d2a; font-weight: bold', 'Loading..')
|
||||||
|
|
||||||
// Load ConfigManager
|
// Load ConfigManager
|
||||||
ConfigManager.load()
|
ConfigManager.load()
|
||||||
@ -22,8 +22,8 @@ if(ConfigManager.getSelectedServer() == null){
|
|||||||
// Clean up temp dir incase previous launches ended unexpectedly.
|
// Clean up temp dir incase previous launches ended unexpectedly.
|
||||||
rimraf(path.join(os.tmpdir(), ConfigManager.getTempNativeFolder()), (err) => {
|
rimraf(path.join(os.tmpdir(), ConfigManager.getTempNativeFolder()), (err) => {
|
||||||
if(err){
|
if(err){
|
||||||
console.warn('Error while cleaning temp dir', err)
|
console.warn('%c[Preloader]', 'color: #a02d2a; font-weight: bold', 'Error while cleaning natives directory', err)
|
||||||
} else {
|
} else {
|
||||||
console.log('Cleaned temp dir.')
|
console.log('%c[Preloader]', 'color: #a02d2a; font-weight: bold', 'Cleaned natives directory.')
|
||||||
}
|
}
|
||||||
})
|
})
|
@ -2,6 +2,8 @@
|
|||||||
* Script for overlay.ejs
|
* Script for overlay.ejs
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
//document.getElementById('overlayDismiss').href = 'javascript:void(0);'
|
||||||
|
|
||||||
/* Overlay Wrapper Functions */
|
/* Overlay Wrapper Functions */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -14,6 +14,13 @@ window.eval = global.eval = function () {
|
|||||||
throw new Error('Sorry, this app does not support window.eval().')
|
throw new Error('Sorry, this app does not support window.eval().')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Display warning when devtools window is opened.
|
||||||
|
remote.getCurrentWebContents().on('devtools-opened', () => {
|
||||||
|
console.log('%cThe console is dark and full of terrors.', 'color: white; -webkit-text-stroke: 4px #a02d2a; font-size: 60px; font-weight: bold')
|
||||||
|
console.log('%cIf you\'ve been told to paste something here, you\'re being scammed.', 'font-size: 16px')
|
||||||
|
console.log('%cUnless you know exactly what you\'re doing, close this window.', 'font-size: 16px')
|
||||||
|
})
|
||||||
|
|
||||||
// Disable zoom, needed for darwin.
|
// Disable zoom, needed for darwin.
|
||||||
webFrame.setZoomLevel(0)
|
webFrame.setZoomLevel(0)
|
||||||
webFrame.setVisualZoomLevelLimits(1, 1)
|
webFrame.setVisualZoomLevelLimits(1, 1)
|
||||||
|
@ -61,7 +61,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div id="serverSelectActions">
|
<div id="serverSelectActions">
|
||||||
<button id="serverSelectConfirm">Select</button>
|
<button id="serverSelectConfirm">Select</button>
|
||||||
<a href="javascript:void(0);" id="serverSelectCancel">Cancel</a>
|
<div id="serverSelectCancelWrapper">
|
||||||
|
<button id="serverSelectCancel">Cancel</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="overlayContent" style="display: none;">
|
<div id="overlayContent" style="display: none;">
|
||||||
@ -69,7 +71,9 @@
|
|||||||
<span id="overlayDesc">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud..</span>
|
<span id="overlayDesc">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud..</span>
|
||||||
<div id="overlayActionContainer">
|
<div id="overlayActionContainer">
|
||||||
<button id="overlayAcknowledge">Conare Iterum</button>
|
<button id="overlayAcknowledge">Conare Iterum</button>
|
||||||
<a href="javascript:void(0);" id="overlayDismiss" style="display: none;">Dismiss</a>
|
<div id="overlayDismissWrapper">
|
||||||
|
<button id="overlayDismiss" style="display: none;">Dismiss</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script src="./assets/js/scripts/overlay.js"></script>
|
<script src="./assets/js/scripts/overlay.js"></script>
|
||||||
|
Loading…
Reference in New Issue
Block a user