simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-12-14 15:19:04 +00:00
Code Issues Projects Releases Wiki Activity

Fixed websocket problem by upgrading spark version. Also fixed z-index problem with console

Browse Source
This commit is contained in:
simon
2018-04-29 17:00:42 -04:00
parent 2c856aae80
commit 083af31b84
8 changed files with 94 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Server/src/main/java/net/simon987/server/web/WebServer.java
View File

@@ -26,7 +26,7 @@ public class WebServer {
/*
* Generate keystore from Let's Encrypt with command:
* openssl pkcs12 -export -in fullchain.pem -inkey privkey.pem -out keystore.kjs -name muchassemblyrequired -CAfile chain.pem -caname root -password file:password.txt
* openssl pkcs12 -export -in fullchain.pem -inkey privkey.pem -out keystore.jks -name muchassemblyrequired -CAfile chain.pem -caname root -password file:password.txt
*
* Certificates generated from Let's Encrypt are usually in /etc/letsencrypt/live/www.site.com
*/

6
Server/src/main/resources/static/css/mar.css
View File

@@ -118,7 +118,7 @@
width: 100%;
position: fixed;
bottom: 0;
z-index: 4;
z-index: 8;
box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.2);
}
@@ -138,7 +138,7 @@
background: #2d2d2d;
height: 100%;
pointer-events: auto;
box-shadow: rgb(0, 0, 0, 0.2) 3px 0 8px;
box-shadow: rgba(0, 0, 0, 0.2) 3px 0 8px;
}
.bottom-panel {
@@ -147,7 +147,7 @@
width: 100%;
position: fixed;
bottom: 0;
z-index: 4;
z-index: 8;
box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.2);
}