diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js
index cb99d0a0..351c1ca1 100644
--- a/Launcher/runtime/dialog/dialog.js
+++ b/Launcher/runtime/dialog/dialog.js
@@ -529,6 +529,8 @@ var serverHolder = {
set: function(btn) {
pingServer(btn);
+ serverEntrance.getStyleClass().clear();
+ serverEntrance.getStyleClass().add("server-bg-" + profilesList[btn]);
serverLabel.setText(profilesList[btn]);
serverDescription.setText(profilesList[btn].info);
btn.setSelected(true);
diff --git a/Launcher/runtime/dialog/images/background.jpg b/Launcher/runtime/dialog/images/background.jpg
deleted file mode 100644
index bbd3866c..00000000
Binary files a/Launcher/runtime/dialog/images/background.jpg and /dev/null differ
diff --git a/Launcher/runtime/dialog/images/background.png b/Launcher/runtime/dialog/images/background.png
new file mode 100644
index 00000000..e500f172
Binary files /dev/null and b/Launcher/runtime/dialog/images/background.png differ
diff --git a/Launcher/runtime/dialog/images/downloader/blured.jpg b/Launcher/runtime/dialog/images/downloader/blured.jpg
deleted file mode 100644
index 2b739312..00000000
Binary files a/Launcher/runtime/dialog/images/downloader/blured.jpg and /dev/null differ
diff --git a/Launcher/runtime/dialog/images/downloader/blured.png b/Launcher/runtime/dialog/images/downloader/blured.png
new file mode 100644
index 00000000..b174accc
Binary files /dev/null and b/Launcher/runtime/dialog/images/downloader/blured.png differ
diff --git a/Launcher/runtime/dialog/images/downloader/line.png b/Launcher/runtime/dialog/images/downloader/line.png
index 8ff25253..d71d2382 100644
Binary files a/Launcher/runtime/dialog/images/downloader/line.png and b/Launcher/runtime/dialog/images/downloader/line.png differ
diff --git a/Launcher/runtime/dialog/images/icons/back.png b/Launcher/runtime/dialog/images/icons/back.png
index 9c261d9f..942b63ce 100644
Binary files a/Launcher/runtime/dialog/images/icons/back.png and b/Launcher/runtime/dialog/images/icons/back.png differ
diff --git a/Launcher/runtime/dialog/images/icons/close.png b/Launcher/runtime/dialog/images/icons/close.png
index b3ddaa56..a56b49b2 100644
Binary files a/Launcher/runtime/dialog/images/icons/close.png and b/Launcher/runtime/dialog/images/icons/close.png differ
diff --git a/Launcher/runtime/dialog/images/icons/console.png b/Launcher/runtime/dialog/images/icons/console.png
index 4da168ba..aa295cd8 100644
Binary files a/Launcher/runtime/dialog/images/icons/console.png and b/Launcher/runtime/dialog/images/icons/console.png differ
diff --git a/Launcher/runtime/dialog/images/icons/discord.png b/Launcher/runtime/dialog/images/icons/discord.png
index f55666a5..f3cd15c7 100644
Binary files a/Launcher/runtime/dialog/images/icons/discord.png and b/Launcher/runtime/dialog/images/icons/discord.png differ
diff --git a/Launcher/runtime/dialog/images/icons/hide.png b/Launcher/runtime/dialog/images/icons/hide.png
index 4cccaf23..674aa0cf 100644
Binary files a/Launcher/runtime/dialog/images/icons/hide.png and b/Launcher/runtime/dialog/images/icons/hide.png differ
diff --git a/Launcher/runtime/dialog/images/icons/list.png b/Launcher/runtime/dialog/images/icons/list.png
index be11c6fb..f1e29f1d 100644
Binary files a/Launcher/runtime/dialog/images/icons/list.png and b/Launcher/runtime/dialog/images/icons/list.png differ
diff --git a/Launcher/runtime/dialog/images/icons/logo.png b/Launcher/runtime/dialog/images/icons/logo.png
index 7a4e2540..c735c6c6 100644
Binary files a/Launcher/runtime/dialog/images/icons/logo.png and b/Launcher/runtime/dialog/images/icons/logo.png differ
diff --git a/Launcher/runtime/dialog/images/icons/settings.png b/Launcher/runtime/dialog/images/icons/settings.png
index 2811cd09..44d04a5e 100644
Binary files a/Launcher/runtime/dialog/images/icons/settings.png and b/Launcher/runtime/dialog/images/icons/settings.png differ
diff --git a/Launcher/runtime/dialog/images/servers/bg-example.png b/Launcher/runtime/dialog/images/servers/bg-example.png
new file mode 100644
index 00000000..ab4ac056
Binary files /dev/null and b/Launcher/runtime/dialog/images/servers/bg-example.png differ
diff --git a/Launcher/runtime/dialog/images/servers/example.png b/Launcher/runtime/dialog/images/servers/example.png
index a233b839..20864ad3 100644
Binary files a/Launcher/runtime/dialog/images/servers/example.png and b/Launcher/runtime/dialog/images/servers/example.png differ
diff --git a/Launcher/runtime/dialog/overlay/debug/debug.css b/Launcher/runtime/dialog/overlay/debug/debug.css
index 61a3ffe1..66654e94 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.css
+++ b/Launcher/runtime/dialog/overlay/debug/debug.css
@@ -1,4 +1,4 @@
-/*-- DrLeonardo Design --*/
+/*-- JCat Design XD --*/
Button {
-fx-cursor: hand;
}
@@ -6,7 +6,7 @@ Button {
/* Outputs */
#overlay>#output,
#background>#output {
- -fx-background-color: white;
+ -fx-background-color: #191919;
-fx-background-radius: 0;
-fx-font-family: monospace;
-fx-font-size: 8pt;
@@ -14,7 +14,7 @@ #background>#output {
#overlay>#output .content,
#background>#output .content {
- -fx-background-color: white;
+ -fx-background-color: #191919;
-fx-background-radius: 0;
}
@@ -24,7 +24,8 @@ #overlay>#action.close {
-fx-background-radius: 0;
-fx-text-fill: white;
-fx-background-position: center;
- -fx-background-color: #2d83ce;
+ -fx-background-color: transparent;
+ -fx-border-color: rgba(33, 150, 243, 0.75);
-fx-pref-width: 150px;
-fx-pref-height: 25px;
}
@@ -35,7 +36,7 @@ #overlay>#action.close:hover,
#overlay>#action.close:focused,
#overlay>#copy:pressed,
#overlay>#action.close:pressed {
- -fx-background-color: #1568ce;
+ -fx-background-color: rgba(33, 150, 243, 0.75);
}
/* Kill button */
@@ -43,7 +44,8 @@ #overlay>#action.kill {
-fx-background-radius: 0;
-fx-text-fill: white;
-fx-background-position: center;
- -fx-background-color: #CE5757;
+ -fx-background-color: transparent;
+ -fx-border-color: rgba(244, 67, 54, 0.75);
-fx-pref-width: 150px;
-fx-pref-height: 25px;
}
@@ -51,7 +53,7 @@ #overlay>#action.kill {
#overlay>#action.kill:hover,
#overlay>#action.kill:focused,
#overlay>#action.kill:pressed {
- -fx-background-color: #DB5252;
+ -fx-background-color: rgba(244, 67, 54, 0.75);
}
-/*-- DrLeonardo Design --*/
\ No newline at end of file
+/*-- JCat Design XD --*/
\ No newline at end of file
diff --git a/Launcher/runtime/dialog/overlay/debug/debug.fxml b/Launcher/runtime/dialog/overlay/debug/debug.fxml
index fbc61fc0..4eb21df7 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.fxml
+++ b/Launcher/runtime/dialog/overlay/debug/debug.fxml
@@ -21,8 +21,8 @@
-
+
-
-
+
+
diff --git a/Launcher/runtime/dialog/overlay/debug/debug.js b/Launcher/runtime/dialog/overlay/debug/debug.js
index edaa0716..2142297c 100644
--- a/Launcher/runtime/dialog/overlay/debug/debug.js
+++ b/Launcher/runtime/dialog/overlay/debug/debug.js
@@ -75,7 +75,7 @@ var debug = {
var alive = !forceClose &&
process !== null && process.isAlive();
- var text = alive ? "Убить" : "Закрыть";
+ var text = alive ? "Убить процесс" : "Закрыть окно";
var addClass = alive ? "kill" : "close";
var removeClass = alive ? "close" : "kill";
diff --git a/Launcher/runtime/dialog/overlay/processing/processing.css b/Launcher/runtime/dialog/overlay/processing/processing.css
index dc405dc0..383acaf4 100644
--- a/Launcher/runtime/dialog/overlay/processing/processing.css
+++ b/Launcher/runtime/dialog/overlay/processing/processing.css
@@ -9,4 +9,8 @@ #overlay>#description.error {
-fx-text-fill: red;
}
+.progress-indicator:indeterminate *.segment {
+ -fx-background-color: rgba(33, 150, 243, 0.8);
+}
+
/*-- DrLeonardo Design --*/
\ No newline at end of file
diff --git a/Launcher/runtime/dialog/overlay/settings/settings.css b/Launcher/runtime/dialog/overlay/settings/settings.css
index 0e18cf86..c2433847 100644
--- a/Launcher/runtime/dialog/overlay/settings/settings.css
+++ b/Launcher/runtime/dialog/overlay/settings/settings.css
@@ -1,7 +1,7 @@
-/*-- DrLeonardo Design --*/
+/*-- JCat Design XD --*/
#holder {
- -fx-background-color: #fff;
+ -fx-background-color: rgba(0, 0, 0, 0.8);
}
#holder>#transferDialog {
@@ -28,35 +28,31 @@ #holder #dirChange {
/* RAM slider */
#holder>#ramSlider>.track {
- -fx-background-color: #909090;
+ -fx-background-color: #fff;
+}
+
+#holder>#ramSlider>.axis {
+ -fx-tick-label-fill: #fff;
}
#holder>#ramSlider>.thumb {
- -fx-background-color: #5fd97a;
-}
-
-#holder>#ramSlider>.colored-track {
- -fx-background-color: #5fd97a;
-}
-
-#holder>#ramSlider>.animated-thumb {
- -fx-background-color: #5fd97a;
+ -fx-background-color: #4a5;
}
#holder>#ramSlider>.slider-value {
- -fx-fill: white;
- -fx-stroke: white;
+ -fx-fill: #fff;
+ -fx-stroke: #fff;
}
-
/* Dir options */
#holder>#deleteDir,
#cancelTransfer {
-fx-background-radius: 0;
- -fx-text-fill: white;
+ -fx-text-fill: #fff;
-fx-background-position: center;
- -fx-background-color: #CE5757;
+ -fx-border-color: rgba(244, 67, 54, 0.75);
+ -fx-background-color: transparent;
-fx-pref-width: 150px;
-fx-pref-height: 25px;
}
@@ -65,12 +61,12 @@ #holder>#deleteDir:hover,
#cancelTransfer:hover,
#holder>#deleteDir:focused,
#cancelTransfer:focused {
- -fx-background-color: #DB5252;
+ -fx-background-color: rgba(244, 67, 54, 0.75);
}
#holder>#changeDir {
-fx-background-color: transparent;
- -fx-text-fill: #909090;
+ -fx-text-fill: #fff;
-fx-background-radius: 0;
}
@@ -81,9 +77,10 @@ #holder>#changeDir:pressed {
#holder>#apply,
#applyTransfer {
- -fx-background-color: #5fd97a;
+ -fx-border-color: rgba(76, 175, 80, 0.75);
+ -fx-background-color: transparent;
-fx-background-radius: 0;
- -fx-text-fill: white;
+ -fx-text-fill: #fff;
-fx-background-position: center;
-fx-pref-width: 150px;
-fx-pref-height: 25px;
@@ -93,8 +90,8 @@ #holder>#apply:hover,
#applyTransfer:hover,
#holder>#apply:focused,
#applyTransfer:focused {
- -fx-background-color: #75e18c;
+ -fx-background-color: rgba(76, 175, 80, 0.75);
}
-/*-- DrLeonardo Design --*/
\ No newline at end of file
+/*-- JCat Design XD --*/
\ No newline at end of file
diff --git a/Launcher/runtime/dialog/overlay/settings/settings.fxml b/Launcher/runtime/dialog/overlay/settings/settings.fxml
index b58950e2..ad7542c6 100644
--- a/Launcher/runtime/dialog/overlay/settings/settings.fxml
+++ b/Launcher/runtime/dialog/overlay/settings/settings.fxml
@@ -18,26 +18,26 @@
-
+
-
+
-
+
-
+
- Выделение памяти:
+ Выделение памяти:
@@ -50,17 +50,17 @@
-
-
+
+
-
+
-
-
diff --git a/Launcher/runtime/dialog/scenes/login/login.fxml b/Launcher/runtime/dialog/scenes/login/login.fxml
index 43f83937..a9a3acc1 100644
--- a/Launcher/runtime/dialog/scenes/login/login.fxml
+++ b/Launcher/runtime/dialog/scenes/login/login.fxml
@@ -32,7 +32,7 @@
-
+
@@ -57,7 +57,7 @@
-