From 555168cc27885756cf40b4d1682281f4cc34ca90 Mon Sep 17 00:00:00 2001
From: Michael-Jouanneau <tacomundu12@gmail.com>
Date: Thu, 23 Feb 2017 16:36:04 +0100
Subject: [PATCH] Added things

---
 src/assets/layout/instance_userinfo.fxml | 11 +++-------
 src/assets/layout/modpacks.fxml          | 12 +++++------
 src/assets/style/default-theme.css       | 27 +++++++++---------------
 3 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/assets/layout/instance_userinfo.fxml b/src/assets/layout/instance_userinfo.fxml
index fced882..9c64cbd 100644
--- a/src/assets/layout/instance_userinfo.fxml
+++ b/src/assets/layout/instance_userinfo.fxml
@@ -12,16 +12,11 @@
 
 <Pane id="dragbar-1" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="308.0" prefWidth="300.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <ImageView fitHeight="308.0" fitWidth="306.0" layoutX="-5.0" pickOnBounds="true">
-         <image>
-            <Image url="@../icons/Minecraft-Wallpaper.png" />
-         </image>
-      </ImageView>
       <Button id="minecraft-login" layoutX="120.0" layoutY="253.0" mnemonicParsing="false" text="Login">
          <font>
             <Font name="Century" size="15.0" />
          </font></Button>
-      <CheckBox layoutX="88.0" layoutY="217.0" mnemonicParsing="false" text="Remember Me" textFill="WHITE">
+      <CheckBox layoutX="88.0" layoutY="217.0" mnemonicParsing="false" text="Remember Me">
          <font>
             <Font name="Century" size="14.0" />
          </font></CheckBox>
@@ -33,12 +28,12 @@
          </image>
       </ImageView>
       <Button id="close-minecraft-login-window" layoutX="259.0" layoutY="14.0" mnemonicParsing="false" prefHeight="19.0" prefWidth="28.0" text="X" />
-      <Label layoutX="14.0" layoutY="134.0" text="Username :" textFill="WHITE">
+      <Label layoutX="14.0" layoutY="134.0" text="Username :">
          <font>
             <Font name="Century" size="15.0" />
          </font>
       </Label>
-      <Label layoutX="14.0" layoutY="178.0" prefHeight="19.0" prefWidth="80.0" text="Password :" textFill="WHITE">
+      <Label layoutX="14.0" layoutY="178.0" prefHeight="19.0" prefWidth="80.0" text="Password :">
          <font>
             <Font name="Century" size="15.0" />
          </font>
diff --git a/src/assets/layout/modpacks.fxml b/src/assets/layout/modpacks.fxml
index b950109..bb4bc60 100644
--- a/src/assets/layout/modpacks.fxml
+++ b/src/assets/layout/modpacks.fxml
@@ -2,7 +2,6 @@
 
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.ScrollBar?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
@@ -10,7 +9,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/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="536.0" prefWidth="750.0" stylesheets="@../style/default-theme.css" xmlns="http://javafx.com/javafx/8.0.112" xmlns:fx="http://javafx.com/fxml/1">
     <children>
         <Rectangle id="Modpack-back" height="40.0" strokeType="INSIDE" width="750.0" />
         <Label id="lable" layoutX="40.0" layoutY="1.0" text="Modpacks">
@@ -19,7 +18,7 @@
             </font>
         </Label>
       <TextField id="search-modpacks" layoutX="475.0" layoutY="2.0" prefHeight="37.0" prefWidth="261.0" promptText="Search Modpacks" />
-      <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="50.0" width="720.0" />
+      <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="50.0" width="728.0" />
       <ImageView fitHeight="119.0" fitWidth="138.0" layoutX="30.0" layoutY="61.0" pickOnBounds="true" preserveRatio="true">
          <image>
             <Image url="@../icons/modpack-default-img.png" />
@@ -30,11 +29,11 @@
             <Font name="Centaur" size="20.0" />
          </font>
       </Label>
-      <Button id="view-modpack" layoutX="644.0" layoutY="145.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="47.0" text="View" />
+      <Button id="view-modpack" layoutX="644.0" layoutY="145.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="View" />
       <Button id="download-modpack" layoutX="553.0" layoutY="145.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="Download" />
       <Label id="lable" layoutX="205.0" layoutY="86.0" prefHeight="25.0" prefWidth="480.0" text="Some random text. " wrapText="true" />
 
-        <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="200.0" width="720.0" />
+        <Rectangle id="rectangle-3" height="140.0" layoutX="10.0" layoutY="200.0" width="728.0" />
         <ImageView fitHeight="119.0" fitWidth="138.0" layoutX="30.0" layoutY="211.0" pickOnBounds="true" preserveRatio="true">
             <image>
                 <Image url="@../icons/Modpack-modded.png" />
@@ -45,9 +44,8 @@
                 <Font name="Centaur" size="20.0" />
             </font>
         </Label>
-        <Button id="view-modpack-a" layoutX="644.0" layoutY="295.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="47.0" text="View" />
+        <Button id="view-modpack-a" layoutX="644.0" layoutY="295.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="View" />
         <Button id="download-modpack-a" layoutX="553.0" layoutY="295.0" mnemonicParsing="false" prefHeight="37.0" prefWidth="77.0" text="Download" />
         <Label id="lable" layoutX="205.0" layoutY="246.0" prefHeight="25.0" prefWidth="480.0" text="Some random text. " wrapText="true" />
-      <ScrollBar layoutX="736.0" layoutY="40.0" orientation="VERTICAL" prefHeight="410.0" prefWidth="14.0" />
     </children>
 </Pane>
diff --git a/src/assets/style/default-theme.css b/src/assets/style/default-theme.css
index f9c3b0b..a74ee9d 100644
--- a/src/assets/style/default-theme.css
+++ b/src/assets/style/default-theme.css
@@ -135,42 +135,35 @@
 .selected:hover {
     -fx-background-color: #05030c;
 }
+
 #minecraftuser, #minecraftpass{
-    -fx-prompt-text-fill: white;
-    -fx-text-fill: white;
+    -fx-prompt-text-fill: #000000;
+    -fx-text-fill: #000000;
     -fx-background-color: transparent;
     -fx-padding: 5px;
 }
 #minecraftuser:hover, #minecraftpass:hover, #minecraftuser:focused, #minecraftpass:focused{
     -fx-border-style: solid;
-    -fx-border-color: white;
+    -fx-border-color: #444444;
     -fx-border-width: 0px 0px 2px 0px;
 }
 #minecraft-login {
-    -fx-background-color: #251606;
+    -fx-background-color: #292929;
     -fx-background-radius: 2px;
-    -fx-border-width: 1px;
-    -fx-border-color: white;
-    -fx-text-fill: white;
+    -fx-text-fill: #ffffff;
 }
 #minecraft-login:hover, #close-minecraft-login-window:hover{
-    -fx-background-color: #46231c;
+    -fx-background-color: #575757;
     -fx-background-radius: 2px;
-    -fx-border-width: 1px;
-    -fx-border-color: white;
-    -fx-text-fill: white;
+    -fx-text-fill: #e4e4e4;
 }
 #close-minecraft-login-window {
-    -fx-background-color: #0d250c;
+    -fx-background-color: #2c0004;
     -fx-background-radius: 2px;
-    -fx-border-width: 1px;
-    -fx-border-color: white;
     -fx-text-fill: white;
 }
 #close-minecraft-login-window:hover{
-    -fx-background-color: #0c4422;
+    -fx-background-color: #6e0003;
     -fx-background-radius: 2px;
-    -fx-border-width: 1px;
-    -fx-border-color: white;
     -fx-text-fill: white;
 }
\ No newline at end of file