slight fixes

build.gradle

@@ -23,7 +23,7 @@ dependencies {
   implementation group: "org.http4k", name: "http4k-server-netty", version: "$http_4k_version"
   implementation group: "org.http4k", name: "http4k-client-apache", version: "$http_4k_version"
   implementation group: "commons-io", name: "commons-io", version: "2.7"
-
+  compile "org.java-websocket:Java-WebSocket:1.5.1"
   implementation "ch.qos.logback:logback-classic:$logback_version"
   runtimeOnly 'io.netty:netty-tcnative-boringssl-static:2.0.30.Final'
 }

src/main/kotlin/mdnet/base/Netty.kt

@@ -18,6 +18,7 @@ import io.netty.handler.ssl.SslContextBuilder
 import io.netty.handler.stream.ChunkedWriteHandler
 import io.netty.handler.traffic.GlobalTrafficShapingHandler
 import io.netty.handler.traffic.TrafficCounter
+import mdnet.base.settings.ClientSettings
 import org.http4k.core.HttpHandler
 import org.http4k.server.Http4kChannelHandler
 import org.http4k.server.Http4kServer

src/main/resources/webui/index.html

@@ -98,7 +98,7 @@
                 <label><select id="themeIn" class="optionInput input">
                     <option value="lightTheme">Light</option>
                     <option value="darkTheme">Dark</option>
-                    <option value="midnightTheme">Midnight (not maintained)</option>
+                    <option value="midnightTheme">Midnight</option>
                     <option value="eyekillerTheme">High Vibrancy (not maintained)</option>
                 </select></label>
             </div>

src/main/resources/webui/layout.css

@@ -40,7 +40,6 @@ body {
     position: absolute;
     right: 0;
     margin: 20px 20px 20px 20px;
-    width: 150px;
     height: 35px;
     border-style: solid;
     outline: none;
@@ -247,8 +246,6 @@ body {
     position: fixed;
     bottom: 20px;
     right: 190px;
-    width: 150px;
-    height: 30px;
 }
 
 .option {
@@ -301,6 +298,8 @@ body {
 .button {
     outline: none;
     border-width: 2px;
+    width: 150px;
+    height: 30px;
 }
 
 .switch input {
@@ -464,6 +463,7 @@ body {
     float: left;
     height: 14px;
     padding: 0 25px 5px 10px;
+    top: 1px;
     position: relative
 }
 

src/main/resources/webui/themes/darkTheme.css

@@ -58,14 +58,14 @@ body {
 }
 
 .numerical_data {
-    background-color: #606060;
+    background-color: #555555;
 }
 
 #gDat {
 }
 
 .line_graph_data {
-    background-color: #606060;
+    background-color: #555555;
 }
 
 /*Console and options colors*/

src/main/resources/webui/themes/midnightTheme.css

@@ -50,18 +50,12 @@ body {
 
 }
 
-#nDat {
-}
-
 .numerical_data {
-    background-color: #404040;
+    background-color: #353535;
-}
-
-#gDat {
 }
 
 .line_graph_data {
-    background-color: #404040;
+    background-color: #353535;
 }
 
 /*Console and options colors*/
@@ -161,3 +155,173 @@ input:checked + .slider {
 ::-webkit-scrollbar-track {
 
 }
+
+/*golden layout*/
+.lm_goldenlayout {
+    background: rgba(0, 0, 0, 0);
+}
+
+.lm_content {
+    background: rgba(0, 0, 0, 0);
+}
+
+.lm_dragProxy .lm_content {
+    box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.9)
+}
+
+.lm_dropTargetIndicator {
+    box-shadow: inset 0 0 30px #000000;
+    outline: 1px dashed #cccccc;
+    transition: all 200ms ease
+}
+
+.lm_dropTargetIndicator .lm_inner {
+    background: #000000;
+    opacity: .2
+}
+
+.lm_splitter {
+    background: inherit;
+    opacity: .001;
+    transition: opacity 200ms ease
+}
+
+.lm_splitter:hover, .lm_splitter.lm_dragging {
+    background: #303030;
+    opacity: 1
+}
+
+.lm_header {
+    background-color: #404040;
+    height: 20px;
+    user-select: none
+}
+
+.lm_header.lm_selectable {
+    cursor: pointer
+}
+
+.lm_header .lm_tab {
+    font-size: 12px;
+    color: #bfbfbf;
+    background-color: #404040;
+    margin-right: 2px;
+    padding-bottom: 2px;
+    padding-top: 1px
+}
+
+.lm_header .lm_tab .lm_close_tab {
+    width: 9px;
+    height: 9px;
+    background-image: url("../icons/close.png");
+    filter: invert(100%);
+    background-size: 14px 14px;
+    background-position: center center;
+    background-repeat: no-repeat;
+    top: 4px;
+    right: 6px;
+    opacity: .4
+}
+
+.lm_header .lm_tab .lm_close_tab:hover {
+    opacity: 1
+}
+
+.lm_header .lm_tab.lm_active {
+    background-color: #606060;
+}
+.lm_header .lm_tab.lm_active:hover {
+    background-color: #505050;
+}
+
+.lm_header .lm_tab.lm_active .lm_close_tab:hover {
+    opacity: 1
+}
+
+.lm_dragProxy.lm_bottom .lm_header .lm_tab, .lm_stack.lm_bottom .lm_header .lm_tab {
+    box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.3)
+}
+
+.lm_dragProxy.lm_bottom .lm_header .lm_tab.lm_active, .lm_stack.lm_bottom .lm_header .lm_tab.lm_active {
+    box-shadow: 0 2px 2px #000000
+}
+
+.lm_selected .lm_header {
+    background-color: #452500
+}
+
+.lm_tab:hover{
+    background-color: #505050;
+    color: #bfbfbf
+}
+
+  .lm_header .lm_controls .lm_tabdropdown:before {
+    color: #ffffff
+}
+
+.lm_controls > li {
+    position: relative;
+    background-position: center center;
+    background-repeat: no-repeat;
+    opacity: .4;
+    transition: opacity 300ms ease
+}
+
+.lm_controls > li:hover {
+    opacity: 1
+}
+
+.lm_controls .lm_popout {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAPklEQVR4nI2Q0QoAIAwCNfr/X7aXCpGN8snBdgejJOzckpkxs9jR6K6T5JpU0nWl5pSXTk7qwh8SnNT+CAAWCgkKFpuSWsUAAAAASUVORK5CYII=)
+}
+
+.lm_controls .lm_maximise {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAAKElEQVR4nGP8////fwYCgImQAgYGBgYWKM2IR81/okwajIpgvsMbVgAwgQYRVakEKQAAAABJRU5ErkJggg==)
+}
+
+.lm_controls .lm_close {
+    top: 2px;
+    width: 18px !important;
+    height: 18px !important;
+    background-image: url("../icons/close.png");
+    background-size: 16px 16px;
+    background-position: center center;
+    filter: invert(100%);
+}
+
+.lm_maximised .lm_header {
+    background-color: #000000
+}
+
+.lm_maximised .lm_controls .lm_maximise {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAJ0lEQVR4nGP8//8/AzGAiShVI1YhCwMDA8OsWbPwBmZaWhoj0SYCAN1lBxMAX4n0AAAAAElFTkSuQmCC)
+}
+
+.lm_transition_indicator {
+    background-color: #000000;
+    border: 1px dashed #555555
+}
+
+.lm_popin {
+    cursor: pointer
+}
+
+.lm_popin .lm_bg {
+    background: #ffffff;
+    opacity: .3
+}
+
+.lm_popin .lm_icon {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAAJCAYAAADpeqZqAAAAWklEQVR4nJWOyw3AIAxDHcQC7L8jbwT3AlJBfNp3SiI7dtRaLSlKKeoA1oEsKSQZCEluexw8Tm3ohk+E7bnOUHUGcNh+HwbBygw4AZ7FN/Lt84p0l+yTflV8AKQyLdcCRJi/AAAAAElFTkSuQmCC);
+    background-position: center center;
+    background-repeat: no-repeat;
+    border-left: 1px solid #eeeeee;
+    border-top: 1px solid #eeeeee;
+    opacity: .7
+}
+
+.lm_popin:hover .lm_icon {
+    opacity: 1
+}
+
+/*# sourceMappingURL=goldenlayout-dark-theme.css.map */

src/main/resources/webui/themes/softStyle.css

@@ -4,7 +4,6 @@
 }
 
 #connection {
-    border-radius: 10px;
 }
 
 #consoleLatest {
@@ -89,7 +88,6 @@
 }
 
 #apply {
-    border-radius: 10px;
 }
 
 .option {
@@ -109,6 +107,10 @@
     border-radius: 10px;
 }
 
+.button{
+    border-radius: 10px;
+}
+
 .slider {
     border-radius: 30px;
     width: 60px;