From 47477604eee40669c49b3a743a04e50035e74569 Mon Sep 17 00:00:00 2001
From: Michael-Jouanneau <tacomundu12@gmail.com>
Date: Mon, 14 Nov 2016 19:55:39 +0100
Subject: [PATCH] Changed Things

---
 src/assets/layout/home.fxml                   |  2 +-
 src/assets/layout/instance.fxml               |  2 +-
 src/assets/layout/instance_userinfo.fxml      |  2 +-
 src/assets/layout/main.fxml                   |  8 ++--
 src/assets/layout/modpacks.fxml               |  2 +-
 src/assets/layout/settings.fxml               |  2 +-
 src/assets/layout/settings_generic.fxml       |  2 +-
 src/assets/layout/settings_minecraft.fxml     |  2 +-
 src/assets/style/dark-theme.css               | 39 +++++++++++++++++++
 .../style/{nav.css => default-theme.css}      |  9 ++++-
 10 files changed, 57 insertions(+), 13 deletions(-)
 create mode 100644 src/assets/style/dark-theme.css
 rename src/assets/style/{nav.css => default-theme.css} (85%)

diff --git a/src/assets/layout/home.fxml b/src/assets/layout/home.fxml
index b896070..f2e8df0 100644
--- a/src/assets/layout/home.fxml
+++ b/src/assets/layout/home.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.text.Font?>
 
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
       <Label layoutX="34.0" layoutY="5.0" text="Home" textFill="WHITE">
diff --git a/src/assets/layout/instance.fxml b/src/assets/layout/instance.fxml
index 02bb405..040dde5 100644
--- a/src/assets/layout/instance.fxml
+++ b/src/assets/layout/instance.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
         <Label layoutX="34.0" layoutY="5.0" text="Instances" textFill="WHITE">
diff --git a/src/assets/layout/instance_userinfo.fxml b/src/assets/layout/instance_userinfo.fxml
index 1bddfc2..2e3a367 100644
--- a/src/assets/layout/instance_userinfo.fxml
+++ b/src/assets/layout/instance_userinfo.fxml
@@ -2,4 +2,4 @@
 
 <?import javafx.scene.layout.Pane?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1" />
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1" />
diff --git a/src/assets/layout/main.fxml b/src/assets/layout/main.fxml
index 7170aeb..16f5991 100644
--- a/src/assets/layout/main.fxml
+++ b/src/assets/layout/main.fxml
@@ -7,18 +7,18 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Rectangle id="rectangle" arcHeight="5.0" arcWidth="5.0" fill="white" height="50.0" strokeType="INSIDE" width="900.0" />
-      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../style/nav.css" text="X" textFill="WHITE" />
-       <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../style/nav.css" text="-" textFill="WHITE" />
+      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" text="X" textFill="WHITE" />
+       <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" text="-" textFill="WHITE" />
        <ImageView id="icon" fitHeight="30" fitWidth="30" layoutX="26.0" layoutY="11.0" />
        <Label layoutX="75.0" layoutY="11.0" text="Team-Avion Launcher" textFill="WHITE">
          <font>
             <Font name="Centaur" size="24.0" />
          </font>
       </Label>
-      <Rectangle id="nav" arcHeight="5.0" arcWidth="5.0" fill="#101e38" height="450.0" layoutY="50.0" stroke="TRANSPARENT" strokeType="INSIDE" width="150.0" />
+       <Rectangle id="rectangle-1" arcHeight="5.0" arcWidth="5.0" height="450.0" layoutY="50.0" styleClass="nav-bar" width="150.0" />
       <Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="selected" text="Home" textFill="WHITE" textOverrun="CLIP">
          <font>
             <Font name="Centaur" size="16.0" />
diff --git a/src/assets/layout/modpacks.fxml b/src/assets/layout/modpacks.fxml
index 5e3cef6..070d27d 100644
--- a/src/assets/layout/modpacks.fxml
+++ b/src/assets/layout/modpacks.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
         <Label layoutX="34.0" layoutY="5.0" text="Modpacks" textFill="WHITE">
diff --git a/src/assets/layout/settings.fxml b/src/assets/layout/settings.fxml
index 464349a..f5a4162 100644
--- a/src/assets/layout/settings.fxml
+++ b/src/assets/layout/settings.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="50.0" strokeType="INSIDE" width="750.0" />
         <Label layoutX="34.0" layoutY="5.0" text="Settings" textFill="WHITE">
diff --git a/src/assets/layout/settings_generic.fxml b/src/assets/layout/settings_generic.fxml
index b39a4f7..0a0b3ea 100644
--- a/src/assets/layout/settings_generic.fxml
+++ b/src/assets/layout/settings_generic.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Label layoutX="22.0" layoutY="14.0" text="General Settings">
          <font>
diff --git a/src/assets/layout/settings_minecraft.fxml b/src/assets/layout/settings_minecraft.fxml
index 71de4a6..f14b7d1 100644
--- a/src/assets/layout/settings_minecraft.fxml
+++ b/src/assets/layout/settings_minecraft.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Label layoutX="22.0" layoutY="14.0" text="Minecraft Settings">
             <font>
diff --git a/src/assets/style/dark-theme.css b/src/assets/style/dark-theme.css
new file mode 100644
index 0000000..dfcd99c
--- /dev/null
+++ b/src/assets/style/dark-theme.css
@@ -0,0 +1,39 @@
+#pane {
+    -fx-background-color: rgb(62, 62, 62);
+}
+#rectangle {
+    -fx-fill: #1a1a1a;
+}
+#Modpack-back {
+    -fx-fill: #424242;
+}
+#exit, #min{
+    -fx-background-color: rgba(30, 25, 25, 0);
+}
+#min:hover, #exit:hover{
+    -fx-background-color: #bf0000;
+}
+#search-modpacks {
+    -fx-text-inner-color: white;
+    -fx-background-color: rgb(82, 82, 82);
+    -fx-padding: 10px;
+}
+
+.tab {
+    -fx-background-color: rgba(0, 0, 0, 0);
+    -fx-background-radius: 0em;
+}
+
+.tab:hover{
+    -fx-background-color: #898989;
+
+}
+
+.selected {
+    -fx-background-color: #535353;
+    -fx-background-radius: 0em;
+}
+
+.selected:hover {
+    -fx-background-color: #898989;
+}
\ No newline at end of file
diff --git a/src/assets/style/nav.css b/src/assets/style/default-theme.css
similarity index 85%
rename from src/assets/style/nav.css
rename to src/assets/style/default-theme.css
index 435225c..0785794 100644
--- a/src/assets/style/nav.css
+++ b/src/assets/style/default-theme.css
@@ -4,8 +4,13 @@
 #rectangle {
     -fx-fill: #031128;
 }
+
+#rectangle-1 {
+    -fx-fill: #080920;
+}
+
 #Modpack-back {
-    -fx-fill: #042344;
+    -fx-fill: #0a0e2e;
 }
 #exit, #min{
     -fx-background-color: rgba(30, 25, 25, 0);
@@ -35,5 +40,5 @@
 }
 
 .selected:hover {
-    -fx-background-color: #050b14;
+    -fx-background-color: #0c182d;
 }
\ No newline at end of file