From 1a011e80019c946e0c70ed83b5f461f2373586d2 Mon Sep 17 00:00:00 2001
From: Michael-Jouanneau <tacomundu12@gmail.com>
Date: Wed, 16 Nov 2016 14:26:26 +0100
Subject: [PATCH] Changed Things

---
 src/assets/layout/dialog_update.fxml    | 12 +++-
 src/assets/layout/modpacks.fxml         | 17 +++++
 src/assets/layout/settings_generic.fxml |  7 +-
 src/assets/style/dark-theme.css         | 94 +++++++++++++++++++++++++
 src/assets/style/default-theme.css      |  7 +-
 src/assets/style/light-theme.css        | 20 +++---
 6 files changed, 138 insertions(+), 19 deletions(-)

diff --git a/src/assets/layout/dialog_update.fxml b/src/assets/layout/dialog_update.fxml
index 21501b0..9d61b62 100644
--- a/src/assets/layout/dialog_update.fxml
+++ b/src/assets/layout/dialog_update.fxml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.Cursor?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
 <Pane id="dialog" prefHeight="109.0" prefWidth="432.0" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
    <Label prefHeight="56.0" prefWidth="432.0" text="Launching TAL..." textAlignment="CENTER">
       <font>
-         <Font size="40.0" />
+         <Font name="Centaur" size="44.0" />
       </font>
       <padding>
          <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
@@ -16,8 +18,12 @@
    </Label>
    <Label layoutX="23.0" layoutY="70.0" text="Looking for updates...">
       <font>
-         <Font size="17.0" />
+         <Font name="Centaur" size="17.0" />
       </font>
    </Label>
-   <Label id="i" layoutX="202.0" layoutY="75.0" text="$i" />
+   <Label id="i" layoutX="202.0" layoutY="75.0" />
+   <ProgressIndicator layoutX="331.0" layoutY="28.0" mouseTransparent="true" nodeOrientation="LEFT_TO_RIGHT">
+      <cursor>
+         <Cursor fx:constant="WAIT" />
+      </cursor></ProgressIndicator>
 </Pane>
diff --git a/src/assets/layout/modpacks.fxml b/src/assets/layout/modpacks.fxml
index fdbc253..aa76685 100644
--- a/src/assets/layout/modpacks.fxml
+++ b/src/assets/layout/modpacks.fxml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
@@ -15,5 +18,19 @@
             </font>
         </Label>
       <TextField id="search-modpacks" layoutX="518.0" layoutY="2.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" />
+      <Rectangle fill="#100839" height="140.0" layoutX="10.0" layoutY="50.0" stroke="BLACK" strokeType="INSIDE" width="720.0" />
+      <ImageView fitHeight="119.0" fitWidth="138.0" layoutX="30.0" layoutY="61.0" pickOnBounds="true" preserveRatio="true">
+         <image>
+            <Image url="@../icons/app.png" />
+         </image>
+      </ImageView>
+      <Label id="lable" layoutX="205.0" layoutY="61.0" text="Example Modpack Layout">
+         <font>
+            <Font name="Centaur" size="20.0" />
+         </font>
+      </Label>
+      <Button layoutX="644.0" layoutY="155.0" mnemonicParsing="false" text="View" />
+      <Button layoutX="553.0" layoutY="155.0" mnemonicParsing="false" text="Download" />
+      <Label id="lable" layoutX="205.0" layoutY="86.0" prefHeight="25.0" prefWidth="480.0" text="Some random text. " wrapText="true" />
     </children>
 </Pane>
diff --git a/src/assets/layout/settings_generic.fxml b/src/assets/layout/settings_generic.fxml
index 916642f..315fe90 100644
--- a/src/assets/layout/settings_generic.fxml
+++ b/src/assets/layout/settings_generic.fxml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
@@ -12,9 +13,9 @@
             <Font name="Centaur" size="25.0" />
          </font>
       </Label>
-      <Button id="light-theme" layoutX="242.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" text="light" />
-      <Button id="dark-theme" layoutX="172.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" text="dark" />
-      <Button id="default-theme" layoutX="100.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" text="default" />
+      <Button id="light-theme" layoutX="242.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" styleClass="selected" text="light" />
+      <Button id="dark-theme" layoutX="172.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" styleClass="tab" text="dark" />
+      <Button id="default-theme" layoutX="100.0" layoutY="71.0" prefHeight="30.0" prefWidth="62.0" styleClass="tab" text="default" />
       <Label id="lable" layoutX="35.0" layoutY="75.0" text="Theme:">
          <font>
             <Font name="Centaur" size="17.0" />
diff --git a/src/assets/style/dark-theme.css b/src/assets/style/dark-theme.css
index e69de29..24ad058 100644
--- a/src/assets/style/dark-theme.css
+++ b/src/assets/style/dark-theme.css
@@ -0,0 +1,94 @@
+#pane {
+    -fx-background-color: #060606;
+}
+#rectangle {
+    -fx-fill: #0f0f0f;
+    -fx-text-fill: white;
+}
+
+#rectangle-1 {
+    -fx-fill: #171717;
+    -fx-text-fill: white;
+}
+
+#rectangle-2 {
+    -fx-fill: #0f0f0f;
+    -fx-text-fill: white;
+}
+
+#default-theme,#dark-theme, #light-theme {
+    -fx-background-color: #252525;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#default-theme:hover {
+    -fx-background-color: #0d0c39;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#dark-theme:hover {
+    -fx-background-color: #1c1c1c;
+    -fx-background-radius: 0em;
+    -fx-text-fill: white;
+}
+
+#light-theme:hover {
+    -fx-background-color: #bcbcbc;
+    -fx-background-radius: 0em;
+    -fx-text-fill: black;
+}
+
+#lable {
+    -fx-text-fill: white;
+}
+
+#Modpack-back {
+    -fx-fill: #1d1d1d;
+    -fx-text-fill: white;
+}
+#exit, #min{
+    -fx-background-color: rgba(30, 25, 25, 0);
+    -fx-text-fill: white;
+}
+#min:hover, #exit:hover{
+    -fx-background-color: #8d0000;
+    -fx-text-fill: white;
+}
+#search-modpacks {
+    -fx-prompt-text-fill: white;
+    -fx-text-fill: white;
+    -fx-background-color: #1d1d1d;
+    -fx-padding: 10px;
+}
+
+#Home-btn, #Modpacks-btn, #Instance-btn, #Settings-btn {
+    -fx-text-fill: white;
+}
+#version {
+    -fx-text-fill: white;
+}
+
+#Settings-Gen-btn, #Settings-Mine-btn {
+    -fx-text-fill: white;
+}
+
+.tab {
+    -fx-background-color: rgba(0, 0, 0, 0);
+    -fx-background-radius: 0em;
+}
+
+.tab:hover{
+    -fx-background-color: #191919;
+
+}
+
+.selected {
+    -fx-background-color: #303030;
+    -fx-background-radius: 0em;
+}
+
+.selected:hover {
+    -fx-background-color: #303030;
+}
\ No newline at end of file
diff --git a/src/assets/style/default-theme.css b/src/assets/style/default-theme.css
index 4444fe6..b02d606 100644
--- a/src/assets/style/default-theme.css
+++ b/src/assets/style/default-theme.css
@@ -12,7 +12,7 @@
 }
 
 #rectangle-2 {
-    -fx-fill: #0d0d39;
+    -fx-fill: #050517;
     -fx-text-fill: white;
 }
 
@@ -57,8 +57,9 @@
     -fx-text-fill: white;
 }
 #search-modpacks {
-    -fx-text-inner-color: white;
-    -fx-background-color: rgba(0, 0, 0, 0.17);
+    -fx-prompt-text-fill: white;
+    -fx-text-fill: white;
+    -fx-background-color: #0a0e2e;
     -fx-padding: 10px;
 }
 
diff --git a/src/assets/style/light-theme.css b/src/assets/style/light-theme.css
index 84134eb..e88ee38 100644
--- a/src/assets/style/light-theme.css
+++ b/src/assets/style/light-theme.css
@@ -1,23 +1,23 @@
 #pane {
-    -fx-background-color: #b6b6b6;
+    -fx-background-color: #ffffff;
 }
 #rectangle {
-    -fx-fill: #626262;
+    -fx-fill: #7d7d7d;
     -fx-text-fill: black;
 }
 
 #rectangle-1 {
-    -fx-fill: #6c6c6c;
+    -fx-fill: #8e8e8e;
     -fx-text-fill: black;
 }
 
 #rectangle-2 {
-    -fx-fill: #969696;
+    -fx-fill: #7d7d7d;
     -fx-text-fill: black;
 }
 
 #default-theme,#dark-theme, #light-theme {
-    -fx-background-color: #5c5c5c;
+    -fx-background-color: #7d7d7d;
     -fx-background-radius: 0em;
     -fx-text-fill: black;
 }
@@ -57,9 +57,9 @@
     -fx-text-fill: white;
 }
 #search-modpacks {
-    -fx-text-inner-color: black;
+    -fx-prompt-text-fill: black;
     -fx-text-fill: black;
-    -fx-background-color: rgba(130, 130, 130, 0.23);
+    -fx-background-color: #9b9b9b;
     -fx-padding: 10px;
 }
 
@@ -80,15 +80,15 @@
 }
 
 .tab:hover{
-    -fx-background-color: #7d7d7d;
+    -fx-background-color: #858585;
 
 }
 
 .selected {
-    -fx-background-color: #989898;
+    -fx-background-color: #e2e2e2;
     -fx-background-radius: 0em;
 }
 
 .selected:hover {
-    -fx-background-color: #989898;
+    -fx-background-color: #e2e2e2;
 }
\ No newline at end of file