* [ANY] fix background image

* [ANY] Added MacOS XstartOnFirstThread fix and Changelog 🥳

* [ANY] Fixed position of Discord button

* [ANY] Compressed image

* [ANY] Small redesign

* [ANY] Update changelog

* [ANY Good night sweet prince

* [FEATURE] Кастомный serverImage для каждого игрового сервера

Фича бекпорнутая с 5.1 XD

* [ANY] Забыл пример пикчи на фон

* [ANY] Фикс фонов

* [ANY] Fix bg AGAIN!

* [ANY] Fix bg finally!
This commit is contained in:
Andrew Molchanov 2020-06-04 09:30:59 +03:00 committed by GitHub
parent c06257dbc6
commit 7ba5172e1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 179 additions and 161 deletions

View file

@ -529,6 +529,8 @@ var serverHolder = {
set: function(btn) { set: function(btn) {
pingServer(btn); pingServer(btn);
serverEntrance.getStyleClass().clear();
serverEntrance.getStyleClass().add("server-bg-" + profilesList[btn]);
serverLabel.setText(profilesList[btn]); serverLabel.setText(profilesList[btn]);
serverDescription.setText(profilesList[btn].info); serverDescription.setText(profilesList[btn].info);
btn.setSelected(true); btn.setSelected(true);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 98 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 263 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 132 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 436 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 738 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 452 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

View file

@ -1,4 +1,4 @@
/*-- DrLeonardo Design --*/ /*-- JCat Design XD --*/
Button { Button {
-fx-cursor: hand; -fx-cursor: hand;
} }
@ -6,7 +6,7 @@ Button {
/* Outputs */ /* Outputs */
#overlay>#output, #overlay>#output,
#background>#output { #background>#output {
-fx-background-color: white; -fx-background-color: #191919;
-fx-background-radius: 0; -fx-background-radius: 0;
-fx-font-family: monospace; -fx-font-family: monospace;
-fx-font-size: 8pt; -fx-font-size: 8pt;
@ -14,7 +14,7 @@ #background>#output {
#overlay>#output .content, #overlay>#output .content,
#background>#output .content { #background>#output .content {
-fx-background-color: white; -fx-background-color: #191919;
-fx-background-radius: 0; -fx-background-radius: 0;
} }
@ -24,7 +24,8 @@ #overlay>#action.close {
-fx-background-radius: 0; -fx-background-radius: 0;
-fx-text-fill: white; -fx-text-fill: white;
-fx-background-position: center; -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-width: 150px;
-fx-pref-height: 25px; -fx-pref-height: 25px;
} }
@ -35,7 +36,7 @@ #overlay>#action.close:hover,
#overlay>#action.close:focused, #overlay>#action.close:focused,
#overlay>#copy:pressed, #overlay>#copy:pressed,
#overlay>#action.close:pressed { #overlay>#action.close:pressed {
-fx-background-color: #1568ce; -fx-background-color: rgba(33, 150, 243, 0.75);
} }
/* Kill button */ /* Kill button */
@ -43,7 +44,8 @@ #overlay>#action.kill {
-fx-background-radius: 0; -fx-background-radius: 0;
-fx-text-fill: white; -fx-text-fill: white;
-fx-background-position: center; -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-width: 150px;
-fx-pref-height: 25px; -fx-pref-height: 25px;
} }
@ -51,7 +53,7 @@ #overlay>#action.kill {
#overlay>#action.kill:hover, #overlay>#action.kill:hover,
#overlay>#action.kill:focused, #overlay>#action.kill:focused,
#overlay>#action.kill:pressed { #overlay>#action.kill:pressed {
-fx-background-color: #DB5252; -fx-background-color: rgba(244, 67, 54, 0.75);
} }
/*-- DrLeonardo Design --*/ /*-- JCat Design XD --*/

View file

@ -21,8 +21,8 @@
<Insets left="10.0" right="10.0" /> <Insets left="10.0" right="10.0" />
</padding> </padding>
</TextArea> </TextArea>
<Pane layoutY="405.0" prefHeight="45.0" prefWidth="693.0" style="-fx-background-color: #ffffff;" /> <Pane layoutY="405.0" prefHeight="45.0" prefWidth="693.0" style="-fx-background-color: #222;" />
<Button fx:id="copy" defaultButton="true" layoutX="373.0" layoutY="415.0" prefHeight="30.0" prefWidth="100.0" text="Загрузить на Hastebin" /> <Button fx:id="copy" defaultButton="true" layoutX="373.0" layoutY="415.0" prefHeight="30.0" prefWidth="100.0" text="Загрузить на Hastebin" />
<Button fx:id="action" layoutX="533.0" layoutY="415.0" prefHeight="25.0" prefWidth="150.0" text="Убить" /> <Button fx:id="action" layoutX="533.0" layoutY="415.0" prefHeight="25.0" prefWidth="150.0" text="Убить процесс" textFill="WHITE" />
<Label fx:id="version" layoutX="14.0" layoutY="419.0" text="GravitLauncher" /> <Label fx:id="version" layoutX="14.0" layoutY="419.0" text="GravitLauncher" textFill="WHITE" />
</Pane> </Pane>

View file

@ -75,7 +75,7 @@ var debug = {
var alive = !forceClose && var alive = !forceClose &&
process !== null && process.isAlive(); process !== null && process.isAlive();
var text = alive ? "Убить" : "Закрыть"; var text = alive ? "Убить процесс" : "Закрыть окно";
var addClass = alive ? "kill" : "close"; var addClass = alive ? "kill" : "close";
var removeClass = alive ? "close" : "kill"; var removeClass = alive ? "close" : "kill";

View file

@ -9,4 +9,8 @@ #overlay>#description.error {
-fx-text-fill: red; -fx-text-fill: red;
} }
.progress-indicator:indeterminate *.segment {
-fx-background-color: rgba(33, 150, 243, 0.8);
}
/*-- DrLeonardo Design --*/ /*-- DrLeonardo Design --*/

View file

@ -1,7 +1,7 @@
/*-- DrLeonardo Design --*/ /*-- JCat Design XD --*/
#holder { #holder {
-fx-background-color: #fff; -fx-background-color: rgba(0, 0, 0, 0.8);
} }
#holder>#transferDialog { #holder>#transferDialog {
@ -28,35 +28,31 @@ #holder #dirChange {
/* RAM slider */ /* RAM slider */
#holder>#ramSlider>.track { #holder>#ramSlider>.track {
-fx-background-color: #909090; -fx-background-color: #fff;
}
#holder>#ramSlider>.axis {
-fx-tick-label-fill: #fff;
} }
#holder>#ramSlider>.thumb { #holder>#ramSlider>.thumb {
-fx-background-color: #5fd97a; -fx-background-color: #4a5;
}
#holder>#ramSlider>.colored-track {
-fx-background-color: #5fd97a;
}
#holder>#ramSlider>.animated-thumb {
-fx-background-color: #5fd97a;
} }
#holder>#ramSlider>.slider-value { #holder>#ramSlider>.slider-value {
-fx-fill: white; -fx-fill: #fff;
-fx-stroke: white; -fx-stroke: #fff;
} }
/* Dir options */ /* Dir options */
#holder>#deleteDir, #holder>#deleteDir,
#cancelTransfer { #cancelTransfer {
-fx-background-radius: 0; -fx-background-radius: 0;
-fx-text-fill: white; -fx-text-fill: #fff;
-fx-background-position: center; -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-width: 150px;
-fx-pref-height: 25px; -fx-pref-height: 25px;
} }
@ -65,12 +61,12 @@ #holder>#deleteDir:hover,
#cancelTransfer:hover, #cancelTransfer:hover,
#holder>#deleteDir:focused, #holder>#deleteDir:focused,
#cancelTransfer:focused { #cancelTransfer:focused {
-fx-background-color: #DB5252; -fx-background-color: rgba(244, 67, 54, 0.75);
} }
#holder>#changeDir { #holder>#changeDir {
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-text-fill: #909090; -fx-text-fill: #fff;
-fx-background-radius: 0; -fx-background-radius: 0;
} }
@ -81,9 +77,10 @@ #holder>#changeDir:pressed {
#holder>#apply, #holder>#apply,
#applyTransfer { #applyTransfer {
-fx-background-color: #5fd97a; -fx-border-color: rgba(76, 175, 80, 0.75);
-fx-background-color: transparent;
-fx-background-radius: 0; -fx-background-radius: 0;
-fx-text-fill: white; -fx-text-fill: #fff;
-fx-background-position: center; -fx-background-position: center;
-fx-pref-width: 150px; -fx-pref-width: 150px;
-fx-pref-height: 25px; -fx-pref-height: 25px;
@ -93,8 +90,8 @@ #holder>#apply:hover,
#applyTransfer:hover, #applyTransfer:hover,
#holder>#apply:focused, #holder>#apply:focused,
#applyTransfer:focused { #applyTransfer:focused {
-fx-background-color: #75e18c; -fx-background-color: rgba(76, 175, 80, 0.75);
} }
/*-- DrLeonardo Design --*/ /*-- JCat Design XD --*/

View file

@ -18,26 +18,26 @@
<children> <children>
<Pane id="holder" prefHeight="450.0" prefWidth="694.0"> <Pane id="holder" prefHeight="450.0" prefWidth="694.0">
<children> <children>
<CheckBox fx:id="autoEnter" layoutX="28.0" layoutY="169.0" text="Автовход на сервер"> <CheckBox fx:id="autoEnter" layoutX="28.0" layoutY="169.0" text="Автовход на сервер" textFill="WHITE">
<font> <font>
<Font size="13.0" /> <Font size="13.0" />
</font></CheckBox> </font></CheckBox>
<CheckBox fx:id="fullScreen" layoutX="28.0" layoutY="229.0" text="Клиент в полный экран"> <CheckBox fx:id="fullScreen" layoutX="28.0" layoutY="229.0" text="Клиент в полный экран" textFill="WHITE">
<font> <font>
<Font size="13.0" /> <Font size="13.0" />
</font></CheckBox> </font></CheckBox>
<CheckBox id="debug" layoutX="28.0" layoutY="199.0" text="Режим Отладки"> <CheckBox id="debug" layoutX="28.0" layoutY="199.0" text="Режим Отладки" textFill="WHITE">
<font> <font>
<Font size="13.0" /> <Font size="13.0" />
</font></CheckBox> </font></CheckBox>
<TextFlow layoutX="126.0" layoutY="15.0" prefHeight="16.0" prefWidth="112.0"> <TextFlow layoutX="126.0" layoutY="15.0" prefHeight="16.0" prefWidth="112.0">
<Text fx:id="ramLabel" /> <Text fx:id="ramLabel" fill="WHITE" />
</TextFlow> </TextFlow>
<Button fx:id="deleteDir" layoutX="370.0" layoutY="380.0" prefHeight="25.0" prefWidth="245.0" text="Удалить клиенты" textAlignment="CENTER" wrapText="true" /> <Button fx:id="deleteDir" layoutX="370.0" layoutY="380.0" prefHeight="25.0" prefWidth="245.0" text="Удалить клиенты" textAlignment="CENTER" wrapText="true" />
<Button fx:id="changeDir" layoutY="419.0" prefHeight="30.0" prefWidth="200.0" text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true" /> <Button fx:id="changeDir" layoutY="419.0" prefHeight="30.0" prefWidth="200.0" text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true" />
<Hyperlink id="dirLabel" alignment="BASELINE_LEFT" layoutX="201.0" layoutY="420.0" prefHeight="30.0" prefWidth="493.0" text="C:/Users" /> <Hyperlink id="dirLabel" alignment="BASELINE_LEFT" layoutX="201.0" layoutY="420.0" prefHeight="30.0" prefWidth="493.0" text="C:/Users" />
<Button fx:id="apply" defaultButton="true" layoutX="530.0" layoutY="380.0" prefHeight="23.0" prefWidth="100.0" text="Применить" /> <Button fx:id="apply" defaultButton="true" layoutX="530.0" layoutY="380.0" prefHeight="23.0" prefWidth="100.0" text="Применить" />
<Text layoutX="16.0" layoutY="28.0">Выделение памяти:</Text> <Text fill="WHITE" layoutX="16.0" layoutY="28.0">Выделение памяти:</Text>
<Slider fx:id="ramSlider" layoutX="14.0" layoutY="76.0" prefHeight="14.0" prefWidth="663.0" /> <Slider fx:id="ramSlider" layoutX="14.0" layoutY="76.0" prefHeight="14.0" prefWidth="663.0" />
<Pane fx:id="transferDialog" prefHeight="425.0" prefWidth="694.0" visible="false"> <Pane fx:id="transferDialog" prefHeight="425.0" prefWidth="694.0" visible="false">
<children> <children>
@ -50,17 +50,17 @@
<Button fx:id="cancelTransfer" layoutX="379.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Нет, не нужно." /> <Button fx:id="cancelTransfer" layoutX="379.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Нет, не нужно." />
</children> </children>
</Pane> </Pane>
<Line endX="594.0" layoutX="100.0" layoutY="420.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead" /> <Line endX="694.0" layoutY="420.0" stroke="#5b3636" styleClass="lineHead" />
<CheckBox fx:id="featureStore" layoutX="28.0" layoutY="259.0" text="Поиск файлов в других клиентах"> <CheckBox fx:id="featureStore" layoutX="28.0" layoutY="259.0" text="Поиск файлов в других клиентах" textFill="WHITE">
<font> <font>
<Font size="13.0" /> <Font size="13.0" />
</font></CheckBox> </font></CheckBox>
<Text fx:id="description" layoutX="317.0" layoutY="208.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации" wrappingWidth="260.888671875"> <Text fx:id="description" fill="WHITE" layoutX="317.0" layoutY="208.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации" wrappingWidth="260.888671875">
<font> <font>
<Font size="13.0" /> <Font size="13.0" />
</font> </font>
</Text> </Text>
<Label fx:id="descLabel" layoutX="317.0" layoutY="169.0" text="Режим отладки"> <Label fx:id="descLabel" layoutX="317.0" layoutY="169.0" text="Режим отладки" textFill="WHITE">
<font> <font>
<Font name="System Bold" size="14.0" /> <Font name="System Bold" size="14.0" />
</font> </font>

View file

@ -3,7 +3,7 @@
#overlay { #overlay {
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-background-size: cover; -fx-background-size: cover;
-fx-background-image: url('../../images/downloader/blured.jpg'); -fx-background-image: url('../../images/downloader/blured.png');
} }
#overlay>#utitle { #overlay>#utitle {
@ -29,12 +29,8 @@ .progress-bar {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
.progress-indicator { .progress-indicator:indeterminate *.segment {
-fx-background-color: transparent; -fx-background-color: rgba(33, 150, 243, 0.8);
}
.progress-indicator .indicator {
-fx-background-color: transparent;
} }
.progress-bar>.bar { .progress-bar>.bar {

View file

@ -8,7 +8,6 @@
<?import javafx.scene.image.Image?> <?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?> <?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.Pane?>
<?import javafx.scene.shape.Line?>
<!-- DrLeonardo Design --> <!-- DrLeonardo Design -->
@ -23,7 +22,8 @@
<Image url="@../../images/icons/hide.png" /> <Image url="@../../images/icons/hide.png" />
</image> </image>
</ImageView> </ImageView>
</graphic></Button> </graphic>
</Button>
<Button id="close" alignment="CENTER" contentDisplay="CENTER" minHeight="-Infinity" minWidth="-Infinity" text="" textAlignment="CENTER"> <Button id="close" alignment="CENTER" contentDisplay="CENTER" minHeight="-Infinity" minWidth="-Infinity" text="" textAlignment="CENTER">
<graphic> <graphic>
<ImageView> <ImageView>
@ -31,24 +31,28 @@
<Image url="@../../images/icons/close.png" /> <Image url="@../../images/icons/close.png" />
</image> </image>
</ImageView> </ImageView>
</graphic></Button> </graphic>
</Button>
</children> </children>
</Pane> </Pane>
<TextArea fx:id="output" prefHeight="419.0" prefWidth="692.0"> <TextArea fx:id="output" prefHeight="405.0" prefWidth="693.0">
<padding> <padding>
<Insets left="10.0" top="10.0" /> <Insets left="10.0" top="10.0" />
</padding> </padding>
</TextArea> </TextArea>
<TextField fx:id="textField" layoutY="420.0" prefHeight="30.0" prefWidth="543.0" promptText="Введите команду..."> <Pane layoutY="405.0" prefHeight="45.0" prefWidth="693.0" style="-fx-background-color: #222;">
<opaqueInsets> <children>
<Insets /> <TextField fx:id="textField" layoutX="14.0" layoutY="8.0" prefHeight="30.0" prefWidth="500.0" promptText="Введите команду...">
</opaqueInsets> <opaqueInsets>
<padding> <Insets />
<Insets left="10.0" /> </opaqueInsets>
</padding> <padding>
</TextField> <Insets left="10.0" />
<Button fx:id="send" defaultButton="true" layoutX="542.0" layoutY="420.0" prefHeight="30.0" prefWidth="147.0" text="Выполнить" /> </padding>
<Line endX="594.0" layoutX="98.0" layoutY="420.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead" /> </TextField>
<Button fx:id="send" defaultButton="true" layoutX="528.0" layoutY="8.0" prefHeight="30.0" prefWidth="147.0" text="Выполнить" />
</children>
</Pane>
</children> </children>
<stylesheets> <stylesheets>
<URL value="@../../styles.css" /> <URL value="@../../styles.css" />

View file

@ -32,7 +32,7 @@
<String fx:value="combologin-popup" /> <String fx:value="combologin-popup" />
</styleClass> </styleClass>
</ComboBox> </ComboBox>
<Hyperlink id="link_link" fx:id="link" layoutX="94.0" layoutY="422.0" prefHeight="19.0" prefWidth="81.0" textAlignment="CENTER" /> <Hyperlink id="link_link" fx:id="link" alignment="CENTER" layoutX="94.0" layoutY="422.0" prefHeight="19.0" prefWidth="81.0" text="Ссылка" textAlignment="CENTER" />
</children> </children>
</Pane> </Pane>
<Pane fx:id="news" prefHeight="432.0" prefWidth="423.0" styleClass="news" /> <Pane fx:id="news" prefHeight="432.0" prefWidth="423.0" styleClass="news" />
@ -57,7 +57,7 @@
</image> </image>
</ImageView> </ImageView>
</graphic></Button> </graphic></Button>
<Button id="link_discord" alignment="CENTER" contentDisplay="CENTER" layoutY="370.0" minHeight="-Infinity" minWidth="-Infinity" text="" textAlignment="CENTER"> <Button id="link_discord" alignment="CENTER" contentDisplay="CENTER" layoutY="405.0" minHeight="-Infinity" minWidth="-Infinity" text="" textAlignment="CENTER">
<graphic> <graphic>
<ImageView> <ImageView>
<image> <image>

View file

@ -41,12 +41,12 @@
<Insets bottom="10.0" left="15.0" top="7.0" /> <Insets bottom="10.0" left="15.0" top="7.0" />
</padding> </padding>
<children> <children>
<Label id="serverDescription" alignment="TOP_LEFT" contentDisplay="LEFT" nodeOrientation="LEFT_TO_RIGHT" prefHeight="274.0" prefWidth="349.0" text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla convallis magna tellus, in bibendum tortor dignissim non. Phasellus vel tincidunt nulla, eu convallis ligula. Suspendisse ut diam vestibulum, tincidunt neque ut, posuere risus. Pellentesque posuere molestie eros, quis laoreet ante ornare quis. Morbi eu tortor fermentum, iaculis risus sit amet, fringilla augue. Aenean nulla purus, rutrum non sapien et, convallis tincidunt purus. Vivamus a eros pulvinar, dignissim leo lacinia, sodales nulla. Aliquam tortor augue, cursus a rutrum viverra, consequat non tellus. Donec porta nisl sed quam dictum commodo. Sed et vulputate dolor. Morbi ultrices justo vitae convallis semper. Donec sodales velit vel velit faucibus, et scelerisque felis finibus. Sed rutrum lacinia mauris, porta cursus mauris tempor eu. Duis turpis nulla, dictum vitae commodo rhoncus, pretium in turpis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos." textAlignment="JUSTIFY" textFill="#141414" wrapText="true" /> <Label id="serverDescription" alignment="TOP_LEFT" contentDisplay="LEFT" nodeOrientation="LEFT_TO_RIGHT" prefHeight="274.0" prefWidth="349.0" text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla convallis magna tellus, in bibendum tortor dignissim non. Phasellus vel tincidunt nulla, eu convallis ligula. Suspendisse ut diam vestibulum, tincidunt neque ut, posuere risus. Pellentesque posuere molestie eros, quis laoreet ante ornare quis. Morbi eu tortor fermentum, iaculis risus sit amet, fringilla augue. Aenean nulla purus, rutrum non sapien et, convallis tincidunt purus. Vivamus a eros pulvinar, dignissim leo lacinia, sodales nulla. Aliquam tortor augue, cursus a rutrum viverra, consequat non tellus. Donec porta nisl sed quam dictum commodo. Sed et vulputate dolor. Morbi ultrices justo vitae convallis semper. Donec sodales velit vel velit faucibus, et scelerisque felis finibus. Sed rutrum lacinia mauris, porta cursus mauris tempor eu. Duis turpis nulla, dictum vitae commodo rhoncus, pretium in turpis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos." textAlignment="JUSTIFY" textFill="WHITE" wrapText="true" />
</children> </children>
</FlowPane> </FlowPane>
</content> </content>
</ScrollPane> </ScrollPane>
<Button id="clientLaunch" layoutX="19.0" layoutY="380.0" prefHeight="51.0" prefWidth="285.0" styleClass="clientLaunch" text="ИГРАТЬ"> <Button id="clientLaunch" layoutX="19.0" layoutY="380.0" prefHeight="51.0" prefWidth="275.0" styleClass="clientLaunch" text="ИГРАТЬ">
<font> <font>
<Font size="22.0" /> <Font size="22.0" />
</font> </font>
@ -94,7 +94,7 @@
</image> </image>
</ImageView> </ImageView>
</graphic></Button> </graphic></Button>
<Button id="link_discord" alignment="CENTER" contentDisplay="CENTER" layoutY="380.0" minHeight="-Infinity" minWidth="-Infinity" text="" textAlignment="CENTER"> <Button id="link_discord" alignment="CENTER" contentDisplay="CENTER" layoutY="405.0" minHeight="-Infinity" minWidth="-Infinity" text="" textAlignment="CENTER">
<graphic> <graphic>
<ImageView> <ImageView>
<image> <image>

View file

@ -30,7 +30,7 @@
</VBox> </VBox>
</content> </content>
</ScrollPane> </ScrollPane>
<Text fill="#393939" layoutX="15.0" layoutY="28.0" strokeType="OUTSIDE" strokeWidth="0.0" text="ОПЦИОНАЛЬНЫЕ МОДИФИКАЦИИ" wrappingWidth="265.904296875"> <Text fill="WHITE" layoutX="15.0" layoutY="28.0" strokeType="OUTSIDE" strokeWidth="0.0" text="ОПЦИОНАЛЬНЫЕ МОДИФИКАЦИИ" wrappingWidth="265.904296875">
<font> <font>
<Font name="System Bold" size="13.0" /> <Font name="System Bold" size="13.0" />
</font> </font>

View file

@ -1,22 +1,22 @@
/*-- DrLeonardo Design --*/
/* Server buttons */ /* Server buttons */
.server-button { .server-button {
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-font-size: 16pt; -fx-font-size: 16pt;
-fx-background-color: transparent; -fx-background-color: rgba(0, 0, 0, 0.4);
-fx-background-size: cover; -fx-background-size: cover;
-fx-background-radius: 0; -fx-background-radius: 0;
-fx-background-insets: 0;
-fx-alignment: CENTER-LEFT; -fx-alignment: CENTER-LEFT;
-fx-padding: 0 0 0 75; -fx-padding: 0 0 0 75;
-fx-font-family: "Segoe UI"; -fx-font-family: "Segoe UI";
-fx-text-fill: #323232; -fx-text-fill: #fff;
-fx-pref-width: 282px; -fx-pref-width: 282px;
-fx-pref-height: 75px; -fx-pref-height: 75px;
} }
.server-button:selected { .server-button:selected {
-fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15, 0, 0, 3); -fx-background-color: rgba(0, 0, 0, 0.5);
} }
@ -26,4 +26,14 @@ .server-button-Example {
-fx-background-image: url('images/servers/example.png'); -fx-background-image: url('images/servers/example.png');
} }
/*-- DrLeonardo Design --*/
/* Раскоментить при использовании кастомных фонов */
/*.serverentrance {
-fx-background-color: transparent;
}*/
/** server-bg-<your profile name> **/
.server-bg-Example {
-fx-background-image: url('images/servers/bg-example.png');
}

View file

@ -19,15 +19,15 @@ CheckBox:indeterminate:selected .box {
-fx-background-color: TRANSPARENT; -fx-background-color: TRANSPARENT;
-fx-background-radius: 2; -fx-background-radius: 2;
-fx-border-color: #909090; -fx-border-color: #fff;
-fx-border-style: solid; -fx-border-style: solid;
-fx-border-radius: 2; -fx-border-radius: 2;
-fx-border-width: 2; -fx-border-width: 2;
} }
CheckBox:selected .box { CheckBox:selected .box {
-fx-border-color: #5fd97a; -fx-border-color: rgba(76, 175, 80, 0.75);
-fx-background-color: #5fd97a; -fx-background-color: rgba(76, 175, 80, 0.75);
} }
CheckBox .mark { CheckBox .mark {
@ -47,7 +47,7 @@ CheckBox:selected .mark {
} }
CheckBox .indeterminate-mark { CheckBox .indeterminate-mark {
-fx-background-color: #5fd97a; -fx-background-color: rgba(76, 175, 80, 0.75);
-fx-background-radius: 2; -fx-background-radius: 2;
-fx-border-width: 0; -fx-border-width: 0;
-fx-max-width: 10; -fx-max-width: 10;
@ -55,7 +55,7 @@ CheckBox .indeterminate-mark {
} }
/*-- DrLeonardo Design --*/ /*-- JCat Design XD --*/
Button, Button,
CheckBox, CheckBox,
ComboBox, ComboBox,
@ -70,11 +70,11 @@ #layout {
-fx-background-size: cover; -fx-background-size: cover;
-fx-pref-width: 738px; -fx-pref-width: 738px;
-fx-pref-height: 450px; -fx-pref-height: 450px;
-fx-background-image: url('images/background.jpg'); -fx-background-image: url('images/background.png');
} }
#background { #background {
-fx-background-color: #fff; -fx-background-color: #222;
} }
/** Labels **/ /** Labels **/
@ -84,11 +84,11 @@ #background>#settingsTitle {
} }
#serverLabel { #serverLabel {
-fx-text-fill: #323232; -fx-text-fill: #fff;
} }
#serverStatus { #serverStatus {
-fx-text-fill: #323232; -fx-text-fill: #fff;
-fx-pref-width: 120px; -fx-pref-width: 120px;
-fx-pref-height: 25px; -fx-pref-height: 25px;
} }
@ -102,29 +102,22 @@ #mask {
#errormessage { #errormessage {
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-text-alignment: center; -fx-text-alignment: center;
-fx-text-fill: #CE5757; -fx-text-fill: rgba(244, 67, 54, 0.75);
} }
.error { .error {
-fx-text-fill: #CE5757; -fx-text-fill: rgba(244, 67, 54, 0.75);
} }
/* bars */ /* bars */
#bar { #bar {
-fx-background-color: #323232; -fx-background-color: #111;
-fx-pref-width: 46px; -fx-pref-width: 46px;
-fx-pref-height: 450px; -fx-pref-height: 450px;
} }
/** buttons in bar **/ /** buttons in bar **/
#close { #close,
-fx-background-position: center;
-fx-background-radius: 0;
-fx-background-color: #CE5757;
-fx-pref-width: 46px;
-fx-pref-height: 45px;
}
#hide, #hide,
#back, #back,
#goConsole, #goConsole,
@ -136,41 +129,45 @@ #link_discord {
-fx-pref-height: 45px; -fx-pref-height: 45px;
} }
#close:hover {
-fx-background-color: rgba(244, 67, 54, 0.75);
}
#hide:hover {
-fx-background-color: rgba(33, 150, 243, 0.75);
}
#logout { #logout {
-fx-text-fill: #323232; -fx-text-fill: #fff;
-fx-font-size: 12; -fx-font-size: 12;
-fx-font-weight: normal; -fx-font-weight: normal;
-fx-border-color: #CE5757; -fx-border-color: rgba(244, 67, 54, 0.75);
-fx-border-width: 1; -fx-border-width: 1;
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-padding: 0; -fx-padding: 0;
} }
#logout:hover, #logout:hover {
#logout:focus { -fx-background-color: rgba(244, 67, 54, 0.75);
-fx-text-fill: #ff6a5e;
}
#logout:pressed {
-fx-border-color: #cb4d43;
} }
#send { #send {
-fx-background-radius: 0; -fx-background-radius: 0;
-fx-text-fill: black; -fx-text-fill: #fff;
-fx-background-position: center; -fx-background-position: center;
-fx-background-color: #ffffff; -fx-background-color: transparent;
-fx-border-color: rgba(33, 150, 243, 0.75);
-fx-pref-width: 150px; -fx-pref-width: 150px;
-fx-pref-height: 30px; -fx-pref-height: 30px;
} }
#send:hover,
#send:pressed { #send:pressed {
-fx-background-color: #d8d8d8; -fx-background-color: rgba(33, 150, 243, 0.75);
} }
/* LoginMenu */ /* LoginMenu */
#authPane { #authPane {
-fx-background-color: rgba(255, 255, 255, 0.71); -fx-background-color: rgba(0, 0, 0, 0.25);
-fx-pref-width: 270px; -fx-pref-width: 270px;
-fx-pref-height: 450px; -fx-pref-height: 450px;
} }
@ -187,8 +184,10 @@ .auth {
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-font-size: 13pt; -fx-font-size: 13pt;
-fx-background-radius: 0; -fx-background-radius: 0;
-fx-background-color: #5fd97a; -fx-background-color: transparent;
-fx-text-fill: #ffffff; -fx-border-color: #fff;
-fx-border-width: 1;
-fx-text-fill: #fff;
-fx-pref-width: 200px; -fx-pref-width: 200px;
-fx-pref-height: 45px; -fx-pref-height: 45px;
-fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15, 0, 0, 3); -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15, 0, 0, 3);
@ -196,7 +195,8 @@ .auth {
.auth:hover, .auth:hover,
.auth:pressed { .auth:pressed {
-fx-background-color: #75e18c; -fx-border-color: rgba(76, 175, 80, 0.75);
-fx-background-color: rgba(76, 175, 80, 0.75);
} }
#password, #password,
@ -209,8 +209,8 @@ #login {
.text-input { .text-input {
-fx-focus-color: transparent; -fx-focus-color: transparent;
-fx-background-repeat: no-repeat; -fx-background-repeat: no-repeat;
-fx-text-fill: #909090; -fx-text-fill: #fff;
-fx-prompt-text-fill: #909090; -fx-prompt-text-fill: #fff;
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-font-family: "Segoe UI"; -fx-font-family: "Segoe UI";
-fx-font-size: 13px; -fx-font-size: 13px;
@ -222,7 +222,7 @@ #link_link {
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-font-size: 7pt; -fx-font-size: 7pt;
-fx-opacity: 0.5; -fx-opacity: 0.5;
-fx-text-fill: #323232; -fx-text-fill: #fff;
-fx-pref-width: 80px; -fx-pref-width: 80px;
-fx-pref-height: 17px; -fx-pref-height: 17px;
} }
@ -235,62 +235,49 @@ #link_link:pressed {
/** CheckBox & ComboBox**/ /** CheckBox & ComboBox**/
#rememberchb { #rememberchb {
-fx-font-size: 13; -fx-font-size: 13;
-fx-text-fill: #909090; -fx-text-fill: #fff;
-fx-pref-width: 145px; -fx-pref-width: 145px;
-fx-pref-height: 30px; -fx-pref-height: 30px;
} }
#combologin { #combologin {
-fx-text-fill: #909090; -fx-text-fill: #fff;
-fx-prompt-text-fill: #909090; -fx-prompt-text-fill: #fff;
-fx-pref-width: 200px; -fx-pref-width: 200px;
-fx-pref-height: 30px; -fx-pref-height: 30px;
} }
.combologin,
.combologin { .combologin {
-fx-font-size: 13px; -fx-font-size: 13px;
-fx-prompt-text-fill: #909090; -fx-prompt-text-fill: #fff;
-fx-text-fill: #909090; -fx-text-fill: #fff;
-fx-background-color: transparent; -fx-background-color: transparent;
} }
.combologin .list-cell { .combologin .list-cell {
-fx-background: white;
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-text-fill: -fx-text-base-color; -fx-text-fill: #fff;
}
.combologin .arrow {
-fx-background-color: rgba(76, 175, 80, 0.8);
} }
.combologin-popup .list-view { .combologin-popup .list-view {
-fx-background-color: white, white; -fx-background-color: rgba(0, 0, 0, 0.75);
-fx-background-insets: 0, 1; -fx-background-radius: 0;
-fx-background-insets: 0;
-fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.6), 8, 0.0, 0, 0); -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.6), 8, 0.0, 0, 0);
} }
.combologin .list-cell:filled:selected .text, .combologin-popup .list-view .list-cell:selected {
.combologin .list-cell:filled:selected .text { -fx-background-color: #fff;
-fx-fill: #323232; -fx-text-fill: #111;
} }
.combologin .arrow, .combologin-popup .list-view .list-cell:hover {
.combologin .arrow { -fx-background-color: rgba(255, 255, 255, 0.75);
-fx-background-color: #5fd97a; -fx-text-fill: #333;
}
.combologin-popup .list-view .list-cell {
-fx-background-color: white;
}
.combologin-popup .list-view .list-cell:filled:selected,
.combologin-popup .list-view .list-cell:filled:selected:hover {
-fx-background: -fx-accent;
-fx-background-color: -fx-selection-bar;
-fx-text-fill: #909090;
}
.combologin-popup .list-view .list-cell:filled:hover {
-fx-background-color: white;
-fx-text-fill: #909090;
} }
/** web**/ /** web**/
@ -302,7 +289,7 @@ #news {
/* MenuPane */ /* MenuPane */
.serverentrance { .serverentrance {
-fx-background-color: rgba(255, 255, 255, 0.71); -fx-background-color: rgba(0, 0, 0, 0.5);
-fx-pref-width: 386px; -fx-pref-width: 386px;
-fx-pref-height: 450px; -fx-pref-height: 450px;
} }
@ -310,21 +297,26 @@ .serverentrance {
/** buttons **/ /** buttons **/
.clientLaunch { .clientLaunch {
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-font-size: 16pt; -fx-font-size: 14pt;
-fx-background-radius: 0; -fx-text-fill: #fff;
-fx-background-color: #5fd97a;
-fx-text-fill: #ffffff;
} }
.clientSettings { .clientSettings {
-fx-background-position: center; -fx-background-position: center;
-fx-background-color: #5fd97a; }
-fx-background-radius: 0;
.clientLaunch,
.clientSettings {
-fx-border-color: #fff;
-fx-border-width: 1;
} }
.clientLaunch:hover, .clientLaunch:hover,
.clientLaunch:pressed { .clientLaunch:pressed,
-fx-background-color: #75e18c; .clientSettings:hover,
.clientSettings:pressed {
-fx-border-color: rgba(76, 175, 80, 0.75);
-fx-background-color: rgba(76, 175, 80, 0.75);
} }
/* Scrolls */ /* Scrolls */
@ -376,16 +368,17 @@ #optionsPane>#modlist>.viewport {
.description-text { .description-text {
-fx-font-smoothing-type: lcd; -fx-font-smoothing-type: lcd;
-fx-fill: #8c8c8c; -fx-fill: #ccc;
-fx-font-size: 12px; -fx-font-size: 12px;
} }
.modname { .modname {
-fx-text-fill: #323232; -fx-text-fill: #fff;
-fx-font-size: 13px;
} }
.lineHead { .lineHead {
-fx-stroke: #d8d8d8; -fx-stroke: #333;
-fx-stroke-width: 1; -fx-stroke-width: 1;
} }
@ -429,7 +422,13 @@ .toggle-button:disabled {
} }
.heading { .heading {
-fx-text-fill: #555555; -fx-text-fill: #555;
} }
/*-- DrLeonardo Design --*/ #textField {
-fx-font-size: 12px;
-fx-border-width: 1;
-fx-border-color: rgba(255, 255, 255, 0.1);
}
/*-- JCat Design XD --*/

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

View file

@ -230,6 +230,10 @@ private static void addClientArgs(Collection<String> args, ClientProfile profile
if (version.compareTo(ClientProfile.Version.MC194) >= 0) if (version.compareTo(ClientProfile.Version.MC194) >= 0)
Collections.addAll(args, "--versionType", "Launcher v" + Version.getVersion().getVersionString()); Collections.addAll(args, "--versionType", "Launcher v" + Version.getVersion().getVersionString());
// Fix `-XstartOnFirstThread` in MacOS
if (version.compareTo(ClientProfile.Version.MC114) >= 0 && JVMHelper.OS_TYPE == OS.MACOSX)
Collections.addAll(args, "-XstartOnFirstThread");
// Add server args // Add server args
if (params.autoEnter) { if (params.autoEnter) {
Collections.addAll(args, "--server", profile.getServerAddress()); Collections.addAll(args, "--server", profile.getServerAddress());