From 2371df5ba99bfb4563f3cb3ebf8c596d4790dc49 Mon Sep 17 00:00:00 2001
From: Michael-Jouanneau <tacomundu12@gmail.com>
Date: Wed, 16 Nov 2016 07:39:59 +0100
Subject: [PATCH] Changed Things

---
 src/assets/layout/main.fxml        | 12 +++---
 src/assets/style/dark-theme.css    | 48 ----------------------
 src/assets/style/default-theme.css |  7 ++++
 src/assets/style/light-theme.css   | 66 +++++++++++++++++++++++++-----
 4 files changed, 69 insertions(+), 64 deletions(-)

diff --git a/src/assets/layout/main.fxml b/src/assets/layout/main.fxml
index e90d716..edd86f4 100644
--- a/src/assets/layout/main.fxml
+++ b/src/assets/layout/main.fxml
@@ -19,29 +19,29 @@
          </font>
       </Label>
        <Rectangle id="rectangle-1" 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">
+      <Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="selected" text="Home" textOverrun="CLIP">
          <font>
             <Font name="Centaur" size="16.0" />
          </font>
       </Button>
-      <Button id="Modpacks-btn" layoutY="90.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="tab" text="Modpack" textAlignment="CENTER" textFill="WHITE" textOverrun="CLIP">
+      <Button id="Modpacks-btn" layoutY="90.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="tab" text="Modpack" textAlignment="CENTER" textOverrun="CLIP">
           <font>
               <Font name="Centaur" size="16.0" />
           </font>
       </Button>
-       <Button id="Instance-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="tab" text="Instances" textFill="WHITE" textOverrun="CLIP">
+       <Button id="Instance-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="tab" text="Instances" textOverrun="CLIP">
            <font>
                <Font name="Centaur" size="16.0" />
            </font>
        </Button>
-       <Button id="Settings-btn" layoutY="170.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="tab" text="Settings" textFill="WHITE" textOverrun="CLIP">
+       <Button id="Settings-btn" layoutY="170.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="tab" text="Settings" textOverrun="CLIP">
            <font>
                <Font name="Centaur" size="16.0" />
            </font>
        </Button>
       <Pane id="tab" layoutX="150.0" layoutY="50.0" prefHeight="450.0" prefWidth="750.0" />
-      <Label id="version" layoutX="17.0" layoutY="455.0" text="Version : $v" textFill="white" />
-      <Label id="lable" layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE">
+      <Label id="version" layoutX="17.0" layoutY="455.0" text="Version : $v" />
+      <Label id="lable" layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion">
          <font>
             <Font size="11.0" />
          </font>
diff --git a/src/assets/style/dark-theme.css b/src/assets/style/dark-theme.css
index 34b9003..e69de29 100644
--- a/src/assets/style/dark-theme.css
+++ b/src/assets/style/dark-theme.css
@@ -1,48 +0,0 @@
-#pane {
-    -fx-background-color: rgba(7, 4, 20, 0.85);
-}
-#rectangle {
-    -fx-fill: #050517;
-}
-
-#rectangle-1 {
-    -fx-fill: #080920;
-}
-
-#rectangle-2 {
-    -fx-fill: #0d0d39;
-}
-
-#Modpack-back {
-    -fx-fill: #0a0e2e;
-}
-#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: rgba(0, 0, 0, 0.17);
-    -fx-padding: 10px;
-}
-
-.tab {
-    -fx-background-color: rgba(0, 0, 0, 0);
-    -fx-background-radius: 0em;
-}
-
-.tab:hover{
-    -fx-background-color: #0c182d;
-
-}
-
-.selected {
-    -fx-background-color: #0c182d;
-    -fx-background-radius: 0em;
-}
-
-.selected:hover {
-    -fx-background-color: #0c182d;
-}
\ No newline at end of file
diff --git a/src/assets/style/default-theme.css b/src/assets/style/default-theme.css
index d4f7e8a..4444fe6 100644
--- a/src/assets/style/default-theme.css
+++ b/src/assets/style/default-theme.css
@@ -62,6 +62,13 @@
     -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;
 }
diff --git a/src/assets/style/light-theme.css b/src/assets/style/light-theme.css
index fb08e2e..84134eb 100644
--- a/src/assets/style/light-theme.css
+++ b/src/assets/style/light-theme.css
@@ -1,48 +1,94 @@
 #pane {
-    -fx-background-color: rgba(206, 206, 206, 0.85);
+    -fx-background-color: #b6b6b6;
 }
 #rectangle {
-    -fx-fill: #898989;
+    -fx-fill: #626262;
+    -fx-text-fill: black;
 }
 
 #rectangle-1 {
-    -fx-fill: #bfbfbf;
+    -fx-fill: #6c6c6c;
+    -fx-text-fill: black;
 }
 
 #rectangle-2 {
-    -fx-fill: #909090;
+    -fx-fill: #969696;
+    -fx-text-fill: black;
+}
+
+#default-theme,#dark-theme, #light-theme {
+    -fx-background-color: #5c5c5c;
+    -fx-background-radius: 0em;
+    -fx-text-fill: black;
+}
+
+#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: black;
 }
 
 #Modpack-back {
-    -fx-fill: #9f9f9f;
+    -fx-fill: #9b9b9b;
+    -fx-text-fill: black;
 }
 #exit, #min{
     -fx-background-color: rgba(30, 25, 25, 0);
+    -fx-text-fill: black;
 }
 #min:hover, #exit:hover{
-    -fx-background-color: #bf0000;
+    -fx-background-color: #8d0000;
+    -fx-text-fill: white;
 }
 #search-modpacks {
     -fx-text-inner-color: black;
-    -fx-background-color: rgba(0, 0, 0, 0.17);
+    -fx-text-fill: black;
+    -fx-background-color: rgba(130, 130, 130, 0.23);
     -fx-padding: 10px;
 }
 
+#Home-btn, #Modpacks-btn, #Instance-btn, #Settings-btn {
+    -fx-text-fill: black;
+}
+#version {
+    -fx-text-fill: black;
+}
+
+#Settings-Gen-btn, #Settings-Mine-btn {
+    -fx-text-fill: black;
+}
+
 .tab {
     -fx-background-color: rgba(0, 0, 0, 0);
     -fx-background-radius: 0em;
 }
 
 .tab:hover{
-    -fx-background-color: #d5d5d5;
+    -fx-background-color: #7d7d7d;
 
 }
 
 .selected {
-    -fx-background-color: #6e6e6e;
+    -fx-background-color: #989898;
     -fx-background-radius: 0em;
 }
 
 .selected:hover {
-    -fx-background-color: #6e6e6e;
+    -fx-background-color: #989898;
 }
\ No newline at end of file