Merge pull request #276 from GravitLauncher/feature/design

Fix #275 bug, added featureStore in settings overlay, fix download ov…
This commit is contained in:
Gravit 2019-05-28 20:09:59 +07:00 committed by GitHub
commit 8640a7c013
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 100 additions and 175 deletions

View file

@ -1,14 +1,11 @@
/*-- DrLeonardo Design --*/ /*-- DrLeonardo Design --*/
#overlay > #description {
#overlay>#description {
-fx-font-size: 12pt; -fx-font-size: 12pt;
-fx-text-fill: #fff; -fx-text-fill: #fff;
-fx-wrap-text: true; -fx-wrap-text: true;
} }
#overlay>#description.error { #overlay > #description.error {
-fx-text-fill: #CE5757; -fx-text-fill: red;
} }
/*-- DrLeonardo Design --*/ /*-- DrLeonardo Design --*/

View file

@ -13,60 +13,44 @@
<!-- DrLeonardo Design --> <!-- DrLeonardo Design -->
<Pane fx:id="overlay" prefHeight="450.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.201" <Pane fx:id="overlay" prefHeight="450.0" prefWidth="693.0" xmlns="http://javafx.com/javafx/8.0.201" xmlns:fx="http://javafx.com/fxml/1">
xmlns:fx="http://javafx.com/fxml/1">
<children> <children>
<Pane id="holder" prefHeight="450.0" prefWidth="694.0"> <Pane id="holder" prefHeight="450.0" prefWidth="694.0">
<children> <children>
<JFXCheckBox fx:id="autoEnter" checkedColor="#5fd97a" layoutX="14.0" layoutY="137.0" <JFXCheckBox fx:id="autoEnter" checkedColor="#5fd97a" layoutX="14.0" layoutY="137.0" text="Автовход на сервер" unCheckedColor="#909090" />
text="Автовход на сервер" unCheckedColor="#909090"/> <Text fill="#8c8c8c" layoutX="40.0" layoutY="153.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" wrappingWidth="636.9999872148037" y="15.0" />
<Text fill="#8c8c8c" layoutX="40.0" layoutY="153.0" strokeType="OUTSIDE" strokeWidth="0.0" <JFXCheckBox fx:id="fullScreen" checkedColor="#5fd97a" layoutX="13.0" layoutY="244.0" text="Клиент в полный экран" unCheckedColor="#909090" />
text="Включение авто-входа означает что вы сразу после загрузки клиента попадете на сервер" <Text fill="#8c8c8c" layoutX="40.0" layoutY="261.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме" wrappingWidth="636.9999872148037" y="15.0" />
wrappingWidth="636.9999872148037" y="15.0"/> <JFXCheckBox id="debug" checkedColor="#5fd97a" layoutX="13.0" layoutY="183.0" text="Режим Отладки" unCheckedColor="#909090" />
<JFXCheckBox fx:id="fullScreen" checkedColor="#5fd97a" layoutX="13.0" layoutY="260.0" <Text fill="#8c8c8c" layoutX="40.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации" wrappingWidth="637.0000016447157" y="15.0" />
text="Клиент в полный экран" unCheckedColor="#909090"/>
<Text fill="#8c8c8c" layoutX="40.0" layoutY="277.0" strokeType="OUTSIDE" strokeWidth="0.0"
text="Включение данной функции позволяет запустить игру сразу в полноэкранном режиме"
wrappingWidth="636.9999872148037" y="15.0"/>
<JFXCheckBox id="debug" checkedColor="#5fd97a" layoutX="13.0" layoutY="193.0" text="Режим Отладки"
unCheckedColor="#909090"/>
<Text fill="#8c8c8c" layoutX="40.0" layoutY="208.0" strokeType="OUTSIDE" strokeWidth="0.0"
text="Режим отладки позволяет просмотреть лог запуска и работы программы в реальном времени прямо из лаунчера, что упрощает поиск нужной информации"
wrappingWidth="637.0000016447157" y="15.0"/>
<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" />
</TextFlow> </TextFlow>
<JFXButton fx:id="deleteDir" layoutX="370.0" layoutY="380.0" prefHeight="25.0" prefWidth="245.0" <JFXButton fx:id="deleteDir" layoutX="370.0" layoutY="380.0" prefHeight="25.0" prefWidth="245.0" text="Удалить клиенты" textAlignment="CENTER" wrapText="true" />
text="Удалить клиенты" textAlignment="CENTER" wrapText="true"/> <JFXButton fx:id="changeDir" layoutY="419.0" prefHeight="30.0" prefWidth="200.0" text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true" />
<JFXButton fx:id="changeDir" layoutY="419.0" prefHeight="30.0" prefWidth="200.0" <Hyperlink id="dirLabel" alignment="BASELINE_LEFT" layoutX="201.0" layoutY="420.0" prefHeight="30.0" prefWidth="493.0" text="C:/Users" />
text="Сменить директорию загрузки" textAlignment="CENTER" wrapText="true"/> <JFXButton fx:id="apply" defaultButton="true" layoutX="530.0" layoutY="380.0" prefHeight="23.0" prefWidth="100.0" text="Применить" />
<Hyperlink id="dirLabel" alignment="BASELINE_LEFT" layoutX="201.0" layoutY="420.0" prefHeight="30.0"
prefWidth="493.0" text="C:/Users"/>
<JFXButton 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 layoutX="16.0" layoutY="28.0">Выделение памяти:</Text>
<JFXSlider fx:id="ramSlider" layoutX="14.0" layoutY="76.0" prefHeight="14.0" prefWidth="663.0"/> <JFXSlider 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>
<Text fill="WHITE" layoutX="147.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0" <Text fill="WHITE" layoutX="147.0" layoutY="198.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Перенести все данные в новую директорию?" wrappingWidth="400.13671875">
text="Перенести все данные в новую директорию?" wrappingWidth="400.13671875">
<font> <font>
<Font size="19.0"/> <Font size="19.0" />
</font> </font>
</Text> </Text>
<JFXButton fx:id="applyTransfer" layoutX="165.0" layoutY="226.0" mnemonicParsing="false" <JFXButton fx:id="applyTransfer" layoutX="165.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Да, перенести!" />
prefHeight="25.0" prefWidth="124.0" text="Да, перенести!"/> <JFXButton fx:id="cancelTransfer" layoutX="379.0" layoutY="226.0" mnemonicParsing="false" prefHeight="25.0" prefWidth="124.0" text="Нет, не нужно." />
<JFXButton 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" <Line endX="594.0" layoutX="100.0" layoutY="420.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead" />
styleClass="lineHead"/> <JFXCheckBox fx:id="featureStore" checkedColor="#5fd97a" layoutX="13.0" layoutY="292.0" text="Поиск файлов в других клиентах" unCheckedColor="#909090" />
<Text fill="#8c8c8c" layoutX="40.0" layoutY="309.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Используется для экономии вашего трафика, аналогичные файлы будут скопированы с других игровых клиентов" wrappingWidth="636.9999872148037" y="15.0" />
</children> </children>
</Pane> </Pane>
</children> </children>
<stylesheets> <stylesheets>
<URL value="@settings.css"/> <URL value="@settings.css" />
<URL value="@../../styles.css"/> <URL value="@../../styles.css" />
</stylesheets> </stylesheets>
</Pane> </Pane>

View file

@ -33,6 +33,11 @@ var settingsOverlay = {
} }
}); });
var featureStore = holder.lookup("#featureStore");
featureStore.setSelected(settings.featureStore);
featureStore.selectedProperty()["addListener(javafx.beans.value.ChangeListener)"](
function(o, ov, nv) settings.featureStore = nv);
var fullScreenBox = holder.lookup("#fullScreen"); var fullScreenBox = holder.lookup("#fullScreen");
fullScreenBox.setSelected(settings.fullScreen); fullScreenBox.setSelected(settings.fullScreen);
fullScreenBox.selectedProperty()["addListener(javafx.beans.value.ChangeListener)"]( fullScreenBox.selectedProperty()["addListener(javafx.beans.value.ChangeListener)"](
@ -145,7 +150,7 @@ LogHelper.debug("Dir: %s", DirBridge.dir);
var cliParams = { var cliParams = {
login: null, password: null, profile: -1, autoLogin: false, login: null, password: null, profile: -1, autoLogin: false,
updatesDir: null, autoEnter: null, fullScreen: null, ram: -1, updatesDir: null, autoEnter: null, fullScreen: null, ram: -1,
offline: false, offline: false, featureStore: null,
init: function(params) { init: function(params) {
var named = params.getNamed(); var named = params.getNamed();
@ -167,6 +172,10 @@ var cliParams = {
if (autoEnter !== null) { if (autoEnter !== null) {
cliParams.autoEnter = java.lang.Boolean.parseBoolean(autoEnter); cliParams.autoEnter = java.lang.Boolean.parseBoolean(autoEnter);
} }
var featureStore = named.get("featureStore");
if (featureStore !== null) {
cliParams.featureStore = java.lang.Boolean.parseBoolean(featureStore);
}
var fullScreen = named.get("fullScreen"); var fullScreen = named.get("fullScreen");
if (fullScreen !== null) { if (fullScreen !== null) {
cliParams.fullScreen = java.lang.Boolean.parseBoolean(fullScreen); cliParams.fullScreen = java.lang.Boolean.parseBoolean(fullScreen);
@ -175,7 +184,6 @@ var cliParams = {
if (ram !== null) { if (ram !== null) {
cliParams.ram = java.lang.Integer.parseInt(ram); cliParams.ram = java.lang.Integer.parseInt(ram);
} }
var offline = named.get("offline"); var offline = named.get("offline");
if (offline !== null) { if (offline !== null) {
cliParams.offline = java.lang.Boolean.parseBoolean(offline); cliParams.offline = java.lang.Boolean.parseBoolean(offline);
@ -192,19 +200,20 @@ var cliParams = {
if (cliParams.profile >= 0) { if (cliParams.profile >= 0) {
settings.profile = cliParams.profile; settings.profile = cliParams.profile;
} }
if (cliParams.updatesDir !== null) { if (cliParams.updatesDir !== null) {
} }
if (cliParams.autoEnter !== null) { if (cliParams.autoEnter !== null) {
settings.autoLogin = cliParams.autoEnter; settings.autoLogin = cliParams.autoEnter;
} }
if (cliParams.featureStore !== null) {
settings.featureStore = cliParams.featureStore;
}
if (cliParams.fullScreen !== null) { if (cliParams.fullScreen !== null) {
settings.fullScreen = cliParams.fullScreen; settings.fullScreen = cliParams.fullScreen;
} }
if (cliParams.ram >= 0) { if (cliParams.ram >= 0) {
settingsOverlay.setRAM(cliParams.ram); settingsOverlay.setRAM(cliParams.ram);
} }
if (cliParams.offline !== null) { if (cliParams.offline !== null) {
settings.offline = cliParams.offline; settings.offline = cliParams.offline;
} }

View file

@ -20,7 +20,7 @@ #overlay > #description.error {
} }
.downloadPane { .downloadPane {
-fx-background-color: rgba(0, 0, 0, 0.1); -fx-background-color: rgba(0, 0, 0, 0.2);
} }
/* Progress bar */ /* Progress bar */

View file

@ -18,9 +18,9 @@
<Pane id="optionsPane" prefHeight="450.0" prefWidth="692.0" styleClass="optionsPane"> <Pane id="optionsPane" prefHeight="450.0" prefWidth="692.0" styleClass="optionsPane">
<children> <children>
<Line endX="595.0" layoutX="100.0" layoutY="46.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead" /> <Line endX="595.0" layoutX="100.0" layoutY="46.0" startX="-100.0" stroke="#5b3636" styleClass="lineHead" />
<ScrollPane id="modlist" layoutY="46.0" prefHeight="402.0" prefWidth="693.0"> <ScrollPane id="modlist" layoutY="46.0" prefHeight="404.0" prefWidth="693.0">
<content> <content>
<VBox prefHeight="397.0" prefWidth="678.0"> <VBox prefHeight="394.0" prefWidth="678.0">
<children> <children>
</children> </children>
<padding> <padding>

View file

@ -129,7 +129,7 @@ var options = {
profile.unmarkOptional(modFile); profile.unmarkOptional(modFile);
LogHelper.debug("Unselected mod %s", modFile.name); LogHelper.debug("Unselected mod %s", modFile.name);
} }
options.update(); //options.update();
}); });
checkBoxList.add(testMod); checkBoxList.add(testMod);
testMod.getStyleClass().add("modname"); testMod.getStyleClass().add("modname");
@ -137,11 +137,11 @@ var options = {
textDescr = new javafx.scene.text.Text(modDescription); textDescr = new javafx.scene.text.Text(modDescription);
if(subLevel > 1) { if(subLevel > 1) {
for(var i = 1; i < subLevel; i++){ for(var i = 1; i < subLevel; i++){
textDescr.setWrappingWidth(630-(25*i)); textDescr.setWrappingWidth(620-(25*i));
textDescr.setTranslateX(25+(25*i)); textDescr.setTranslateX(25+(25*i));
} }
} else { } else {
textDescr.setWrappingWidth(630); textDescr.setWrappingWidth(620);
textDescr.setTranslateX(25); textDescr.setTranslateX(25);
} }
textDescr.setTextAlignment(javafx.scene.text.TextAlignment.JUSTIFY); textDescr.setTextAlignment(javafx.scene.text.TextAlignment.JUSTIFY);

View file

@ -1,15 +1,10 @@
/*-- DrLeonardo Design --*/ /*-- DrLeonardo Design --*/
Button, CheckBox, ComboBox, RadioButton {
Button, -fx-cursor: hand;
CheckBox,
ComboBox,
RadioButton {
-fx-cursor: hand;
} }
/* Backgrounds */ /* Backgrounds */
#layout { #layout {
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-background-size: cover; -fx-background-size: cover;
@ -17,61 +12,48 @@ #layout {
-fx-pref-height: 450px; -fx-pref-height: 450px;
-fx-background-image: url('images/background.jpg'); -fx-background-image: url('images/background.jpg');
} }
#background { #background {
-fx-background-color: #fff; -fx-background-color: #fff;
} }
/** Labels **/ /** Labels **/
#background > #settingsTitle {
#background>#settingsTitle {
-fx-font-size: 14pt; -fx-font-size: 14pt;
-fx-alignment: baseline-center; -fx-alignment: baseline-center;
} }
#serverLabel { #serverLabel{
-fx-text-fill: #323232; -fx-text-fill: #323232;
} }
#serverStatus { #serverStatus{
-fx-text-fill: #323232; -fx-text-fill: #323232;
-fx-pref-width: 120px; -fx-pref-width: 120px;
-fx-pref-height: 25px; -fx-pref-height: 25px;
} }
/* Mask */ /* Mask */
#mask { #mask {
-fx-effect: DropShadow( gaussian, rgba(255, 255, 255, 0.5), 0, 0, 0, 1); -fx-effect: DropShadow( gaussian , rgba(255,255,255,0.5) , 0,0,0,1 );
} }
/** Errors **/ /** Errors **/
#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: #CE5757;
} }
.error { .error{
-fx-text-fill: #CE5757; -fx-text-fill: #CE5757;
} }
/* bars */ /* bars */
#bar { #bar {
-fx-background-color: #323232; -fx-background-color: #323232;
-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-position: center;
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
@ -80,12 +62,7 @@ #close {
-fx-pref-width: 46px; -fx-pref-width: 46px;
-fx-pref-height: 45px; -fx-pref-height: 45px;
} }
#hide, #back, #goConsole, #settings, #discord {
#hide,
#back,
#goConsole,
#settings,
#discord {
-fx-background-position: center; -fx-background-position: center;
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
-fx-background-radius: 0; -fx-background-radius: 0;
@ -93,23 +70,21 @@ #discord {
-fx-pref-height: 45px; -fx-pref-height: 45px;
} }
#logout { #logout{
-fx-text-fill: #323232; -fx-text-fill:#323232;
-fx-font-size: 12; -fx-font-size:12;
-fx-font-weight: normal; -fx-font-weight:normal;
-fx-border-color: #CE5757; -fx-border-color:#CE5757;
-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 { #logout:focus{
-fx-text-fill: #ff6a5e; -fx-text-fill:#ff6a5e;
} }
#logout:pressed{
#logout:pressed { -fx-border-color:#cb4d43;
-fx-border-color: #cb4d43;
} }
#send { #send {
@ -122,13 +97,9 @@ #send {
-fx-pref-height: 30px; -fx-pref-height: 30px;
} }
#send:pressed { #send:pressed { -fx-background-color: #d8d8d8; }
-fx-background-color: #d8d8d8;
}
/* LoginMenu */ /* LoginMenu */
#authPane { #authPane {
-fx-background-color: rgba(255, 255, 255, 0.71); -fx-background-color: rgba(255, 255, 255, 0.71);
-fx-pref-width: 270px; -fx-pref-width: 270px;
@ -142,9 +113,7 @@ #logo {
-fx-pref-height: 32px; -fx-pref-height: 32px;
} }
/** Buttons & textarea**/ /** Buttons & textarea**/
.auth { .auth {
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
-fx-font-weight: bold; -fx-font-weight: bold;
@ -154,22 +123,18 @@ .auth {
-fx-text-fill: #ffffff; -fx-text-fill: #ffffff;
-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);
} }
.auth:hover, .auth:hover, .auth:pressed { -fx-background-color: #75e18c; }
.auth:pressed {
-fx-background-color: #75e18c;
}
#password, #password, #login {
#login {
-fx-background-radius: 0; -fx-background-radius: 0;
-fx-pref-width: 200px; -fx-pref-width: 200px;
-fx-pref-height: 30px; -fx-pref-height: 30px;
} }
.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: #909090;
@ -180,9 +145,7 @@ .text-input {
-fx-font-weight: bold; -fx-font-weight: bold;
} }
/** Hyperlink **/ /** Hyperlink **/
#link { #link {
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-font-size: 7pt; -fx-font-size: 7pt;
@ -192,28 +155,21 @@ #link {
-fx-pref-height: 17px; -fx-pref-height: 17px;
} }
#link:hover, #link:hover, #link:pressed { -fx-opacity: 0.8; }
#link:pressed {
-fx-opacity: 0.8;
}
/** CheckBox & ComboBox**/ /** CheckBox & ComboBox**/
#rememberchb{
#rememberchb {
-fx-font-size: 13; -fx-font-size: 13;
-fx-text-fill: #909090; -fx-text-fill: #909090;
-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: #909090;
-fx-prompt-text-fill: #909090; -fx-prompt-text-fill: #909090;
-fx-pref-width: 200px; -fx-pref-width: 200px;
-fx-pref-height: 30px; -fx-pref-height: 30px;
} }
.combologin, .combologin,
.combologin { .combologin {
-fx-font-size: 13px; -fx-font-size: 13px;
@ -231,7 +187,7 @@ .combologin .list-cell {
.combologin-popup .list-view { .combologin-popup .list-view {
-fx-background-color: white, white; -fx-background-color: white, white;
-fx-background-insets: 0, 1; -fx-background-insets: 0, 1;
-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 .list-cell:filled:selected .text,
@ -244,44 +200,40 @@ .combologin .arrow {
-fx-background-color: #5fd97a; -fx-background-color: #5fd97a;
} }
.combologin-popup .list-view .list-cell { .combologin-popup .list-view .list-cell
{
-fx-background-color: white; -fx-background-color: white;
} }
.combologin-popup .list-view .list-cell:filled:selected, .combologin-popup .list-view .list-cell:filled:selected, .combologin-popup .list-view .list-cell:filled:selected:hover
.combologin-popup .list-view .list-cell:filled:selected:hover { {
-fx-background: -fx-accent; -fx-background: -fx-accent;
-fx-background-color: -fx-selection-bar; -fx-background-color: -fx-selection-bar;
-fx-text-fill: #909090; -fx-text-fill: #909090;
} }
.combologin-popup .list-view .list-cell:filled:hover { .combologin-popup .list-view .list-cell:filled:hover
{
-fx-background-color: white; -fx-background-color: white;
-fx-text-fill: #909090; -fx-text-fill: #909090;
} }
/** web**/ /** web**/
#news { #news {
-fx-background-color: transparent; -fx-background-color: transparent;
-fx-pref-width: 423px; -fx-pref-width: 423px;
-fx-pref-height: 450px; -fx-pref-height: 450px;
} }
/* MenuPane */ /* MenuPane */
.serverentrance { .serverentrance {
-fx-background-color: rgba(255, 255, 255, 0.71); -fx-background-color: rgba(255, 255, 255, 0.71);
-fx-pref-width: 386px; -fx-pref-width: 386px;
-fx-pref-height: 450px; -fx-pref-height: 450px;
} }
/** buttons **/ /** buttons **/
.clientLaunch{
.clientLaunch {
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-font-size: 16pt; -fx-font-size: 16pt;
@ -289,25 +241,17 @@ .clientLaunch {
-fx-background-color: #5fd97a; -fx-background-color: #5fd97a;
-fx-text-fill: #ffffff; -fx-text-fill: #ffffff;
} }
.clientSettings{
.clientSettings {
-fx-background-position: center; -fx-background-position: center;
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
-fx-background-color: #5fd97a; -fx-background-color: #5fd97a;
-fx-background-radius: 0; -fx-background-radius: 0;
} }
.clientLaunch:hover, .clientLaunch:hover, .clientLaunch:pressed { -fx-background-color: #75e18c; }
.clientLaunch:pressed {
-fx-background-color: #75e18c;
}
/* Pressets options */ /* Pressets options */
.pressetLight, .pressetMedium, .pressetHigh {
.pressetLight,
.pressetMedium,
.pressetHigh {
-jfx-toggle-color: #5fd97a; -jfx-toggle-color: #5fd97a;
-jfx-untoggle-color: #FAFAFA; -jfx-untoggle-color: #FAFAFA;
-jfx-toggle-line-color: rgba(116, 192, 133, 0.79); -jfx-toggle-line-color: rgba(116, 192, 133, 0.79);
@ -316,9 +260,7 @@ .pressetHigh {
-jfx-disable-visual-focus: false; -jfx-disable-visual-focus: false;
} }
/* Scrolls */ /* Scrolls */
.scroll-pane { .scroll-pane {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
@ -356,14 +298,12 @@ .scroll-pane>.corner {
-fx-background-color: rgba(0, 0, 0, 0.19); -fx-background-color: rgba(0, 0, 0, 0.19);
} }
/* OptionsPane */ /* OptionsPane */
#optionsPane > #modlist {
#optionsPane>#modlist {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#optionsPane>#modlist>.viewport { #optionsPane > #modlist > .viewport {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
@ -392,44 +332,39 @@ .separator *.line {
-fx-border-width: 0 0 10 0; -fx-border-width: 0 0 10 0;
} }
#serverlist { #serverlist{
-fx-background-color: transparent;
}
#serverlist > .viewport {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#serverlist>.viewport { #serverdesc{
-fx-background-color: transparent;
}
#serverdesc > .viewport {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#serverdesc { #serverinfo{
-fx-background-color: transparent;
}
#serverinfo > .viewport {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#serverdesc>.viewport { #servercontainer{
-fx-background-color: transparent;
}
#serverinfo {
-fx-background-color: transparent;
}
#serverinfo>.viewport {
-fx-background-color: transparent;
}
#servercontainer {
-fx-background-color: transparent; -fx-background-color: transparent;
-jfx-button-type: FLAT; -jfx-button-type: FLAT;
-fx-pref-width: 282px; -fx-pref-width: 282px;
-fx-pref-height: 75px; -fx-pref-height: 75px;
} }
.toggle-button:disabled { .toggle-button:disabled{
-fx-opacity: 1.0; -fx-opacity: 1.0;
} }
.heading { .heading{
-fx-text-fill: #555555; -fx-text-fill: #555555;
} }
/*-- DrLeonardo Design --*/ /*-- DrLeonardo Design --*/