diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js index a078f21b..77cf4281 100644 --- a/Launcher/runtime/dialog/dialog.js +++ b/Launcher/runtime/dialog/dialog.js @@ -460,7 +460,7 @@ var serverHolder = { set: function(btn){ pingServer(btn); - serverLabel.setText("СЕРВЕР " + profilesList[btn]); + serverLabel.setText(profilesList[btn]); serverDescription.setText(profilesList[btn].info); btn.setSelected(true); btn.setDisable(true); diff --git a/Launcher/runtime/dialog/overlay/debug/debug.fxml b/Launcher/runtime/dialog/overlay/debug/debug.fxml index 8411c831..40c01886 100644 --- a/Launcher/runtime/dialog/overlay/debug/debug.fxml +++ b/Launcher/runtime/dialog/overlay/debug/debug.fxml @@ -8,17 +8,17 @@ - + - + - - + + diff --git a/Launcher/runtime/dialog/overlay/settings/settings.fxml b/Launcher/runtime/dialog/overlay/settings/settings.fxml index f4ca9fac..bf1051f4 100644 --- a/Launcher/runtime/dialog/overlay/settings/settings.fxml +++ b/Launcher/runtime/dialog/overlay/settings/settings.fxml @@ -17,12 +17,12 @@ - - - - - - + + + + + + diff --git a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml index f124cd17..6b187622 100644 --- a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml +++ b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml @@ -44,7 +44,7 @@ - + @@ -53,24 +53,17 @@ - diff --git a/Launcher/runtime/dialog/servers.css b/Launcher/runtime/dialog/servers.css index edb37b39..ce53884e 100644 --- a/Launcher/runtime/dialog/servers.css +++ b/Launcher/runtime/dialog/servers.css @@ -17,9 +17,7 @@ .server-button { } .server-button:selected { - -fx-border-width: 0 0 0 2; - -fx-border-style: none none none solid; - -fx-border-color: #323232; + -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15,0,0,3); } /** server-button- **/ diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css index 03c7e2cd..69a98032 100644 --- a/Launcher/runtime/dialog/styles.css +++ b/Launcher/runtime/dialog/styles.css @@ -22,9 +22,6 @@ #background > #settingsTitle { #serverLabel{ -fx-text-fill: #323232; - -fx-padding: 0 0 0 14; - -fx-pref-width: 265px; - -fx-pref-height: 25px; } #serverStatus{ @@ -66,7 +63,7 @@ #close { -fx-pref-width: 46px; -fx-pref-height: 45px; } -#hide, #back, #goConsole, #settings, #logout, #discord { +#hide, #back, #goConsole, #settings, #discord { -fx-background-position: center; -jfx-button-type: FLAT; -fx-background-radius: 0; @@ -74,6 +71,23 @@ #hide, #back, #goConsole, #settings, #logout, #discord { -fx-pref-height: 45px; } +#logout{ + -fx-text-fill:#323232; + -fx-font-size:12; + -fx-font-weight:normal; + -fx-border-color:#CE5757; + -fx-border-width:1; + -fx-background-color:transparent; + -fx-padding:0; +} +#logout:hover, +#logout:focus{ + -fx-text-fill:#ff6a5e; +} +#logout:pressed{ + -fx-border-color:#cb4d43; +} + #send { -fx-background-radius: 0; -fx-text-fill: black;