mirror of
https://github.com/DevL0rd/SkyNX
synced 2024-11-26 13:00:17 +00:00
UI fixes and adjustments
This commit is contained in:
parent
222ded9f52
commit
c9e838c908
5 changed files with 53 additions and 41 deletions
|
@ -1,5 +1,5 @@
|
||||||
#main {
|
#main {
|
||||||
padding: 8px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
#settings {
|
#settings {
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
|
|
|
@ -215,7 +215,7 @@ textarea:focus, input:focus{
|
||||||
left: 50px;
|
left: 50px;
|
||||||
height: calc(100% - 57px);
|
height: calc(100% - 57px);
|
||||||
width: calc(100% - 50px);
|
width: calc(100% - 50px);
|
||||||
background: rgba(0,0,0,0.5);
|
background: rgba(50,50,50,0.5);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
.contentAreaScrollable{
|
.contentAreaScrollable{
|
||||||
|
@ -223,19 +223,9 @@ textarea:focus, input:focus{
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
}
|
}
|
||||||
#settingsSearch {
|
.sidePanel {
|
||||||
background: black;
|
background: rgba(30,30,30,0.5);
|
||||||
border: none;
|
}
|
||||||
border-radius: 25px;
|
|
||||||
color: white;
|
|
||||||
padding-left: 8px;
|
|
||||||
height: 40px;
|
|
||||||
width: calc(100% - 20px);
|
|
||||||
margin-top: 10px;
|
|
||||||
margin-left: 10px;
|
|
||||||
margin-bottom: 10px;
|
|
||||||
};
|
|
||||||
|
|
||||||
.dark-group-text {
|
.dark-group-text {
|
||||||
background-color: rgba(40,40,0.75);
|
background-color: rgba(40,40,0.75);
|
||||||
color: white;
|
color: white;
|
||||||
|
@ -249,7 +239,6 @@ color: white;
|
||||||
border: 3px solid tomato;
|
border: 3px solid tomato;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.selected{
|
.selected{
|
||||||
background: rgba(255, 255, 255, 0.1);
|
background: rgba(255, 255, 255, 0.1);
|
||||||
}
|
}
|
|
@ -31,6 +31,8 @@
|
||||||
title="Settings"><i class="fas fa-cogs"></i></button>
|
title="Settings"><i class="fas fa-cogs"></i></button>
|
||||||
</div>
|
</div>
|
||||||
<div id="main" class="contentArea">
|
<div id="main" class="contentArea">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-8">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="ipInput">Switch IP Address</label>
|
<label for="ipInput">Switch IP Address</label>
|
||||||
<input id="ipInput" type="text" class="form-control" placeholder="Switch IP">
|
<input id="ipInput" type="text" class="form-control" placeholder="Switch IP">
|
||||||
|
@ -44,21 +46,38 @@
|
||||||
<button id="startBtn" type="button" class="btn btn-dark btn-lg btn-block">Start Streamer</button>
|
<button id="startBtn" type="button" class="btn btn-dark btn-lg btn-block">Start Streamer</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-4 sidePanel">
|
||||||
|
<label>More Settings coming soon..</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
<div id="settings" class="contentArea contentAreaScrollable customScroll" style="display: none;">
|
<div id="settings" class="contentArea contentAreaScrollable customScroll" style="display: none;">
|
||||||
|
|
||||||
<form class="form-group">
|
<form class="form-group">
|
||||||
<button id="installScpVBusBtn" type="button" class="btn btn-dark btn-block">Install Xbox
|
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col">
|
||||||
|
<button id="installScpVBusBtn" type="button" class="btn btn-dark btn-block">Install Controller</button>
|
||||||
|
</div>
|
||||||
|
<div class="col">
|
||||||
|
<button id="unInstallScpVBusBtn" type="button" class="btn btn-danger btn-block">Un-Install
|
||||||
Controller</button>
|
Controller</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<form class="form-group">
|
<form class="form-group">
|
||||||
<button id="unInstallScpVBusBtn" type="button" class="btn btn-dark btn-block">Un-Install Xbox
|
<div class="row">
|
||||||
Controller</button>
|
<div class="col">
|
||||||
</form>
|
<button id="installAudioDriverBtn" type="button" class="btn btn-dark btn-block">Install Audio
|
||||||
<form class="form-group">
|
|
||||||
<button id="installAudioDriverBtn" type="button" class="btn btn-dark btn-block">Install Audio Driver</button>
|
|
||||||
</form>
|
|
||||||
<form class="form-group">
|
|
||||||
<button id="unInstallAudioDriverBtn" type="button" class="btn btn-dark btn-block">Un-Install Audio
|
|
||||||
Driver</button>
|
Driver</button>
|
||||||
|
</div>
|
||||||
|
<div class="col">
|
||||||
|
<button id="unInstallAudioDriverBtn" type="button" class="btn btn-danger btn-block">Un-Install Audio
|
||||||
|
Driver</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="switch">
|
<label class="switch">
|
||||||
|
|
|
@ -80,8 +80,8 @@ function applyClientSettings() {
|
||||||
ipcRenderer.send('installScpVBus');
|
ipcRenderer.send('installScpVBus');
|
||||||
ipcRenderer.send('installAudioDriver');
|
ipcRenderer.send('installAudioDriver');
|
||||||
clientSettings.firstInstall = true;
|
clientSettings.firstInstall = true;
|
||||||
saveClientSettings();
|
|
||||||
}
|
}
|
||||||
|
saveClientSettings();
|
||||||
}
|
}
|
||||||
$("#rainbowEnabled").on('change', function () {
|
$("#rainbowEnabled").on('change', function () {
|
||||||
clientSettings.rainbowEnabled = $("#rainbowEnabled").prop("checked");
|
clientSettings.rainbowEnabled = $("#rainbowEnabled").prop("checked");
|
||||||
|
|
|
@ -23,7 +23,7 @@ function createWindow() {
|
||||||
y: mainWindowState.y,
|
y: mainWindowState.y,
|
||||||
// width: mainWindowState.width,
|
// width: mainWindowState.width,
|
||||||
// height: mainWindowState.height,
|
// height: mainWindowState.height,
|
||||||
width: 350,
|
width: 400,
|
||||||
height: 280,
|
height: 280,
|
||||||
// minWidth: 350,
|
// minWidth: 350,
|
||||||
// minHeight: 300,
|
// minHeight: 300,
|
||||||
|
@ -47,7 +47,11 @@ function createWindow() {
|
||||||
// in an array if your app supports multi windows, this is the time
|
// in an array if your app supports multi windows, this is the time
|
||||||
// when you should delete the corresponding element.
|
// when you should delete the corresponding element.
|
||||||
mainWindow = null
|
mainWindow = null
|
||||||
|
try {
|
||||||
streamerProcess.kill();
|
streamerProcess.kill();
|
||||||
|
} catch (error) {
|
||||||
|
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue