From 39868a2866b8974a408e6adbdbd7231da4305f90 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Fri, 15 Jun 2018 15:46:37 +0200
Subject: Change scrollbar-top-padding, use styles from main.css, format
 [#28618]

---
 .../controller/EmployeeListController.java         |  2 +-
 src/main/resources/fxml/employeeList.fxml          | 11 +++-
 src/main/resources/fxml/manageEmployees.fxml       | 68 +++++++++++++++-------
 3 files changed, 57 insertions(+), 24 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
index 843145c..f7496c7 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListController.java
@@ -31,7 +31,7 @@ public class EmployeeListController {
     private final SpringFXMLLoader fxmlLoader;
     private Node rootElement;
     private List<EmployeeListItemController> employeeListItemControllers;
-    private Insets listItemMargins = new Insets(0, 5, 10, 5);
+    private Insets listItemMargins = new Insets(10, 5, 0, 5);
 
     public EmployeeListController(SpringFXMLLoader fxmlLoader) {
         this.fxmlLoader = fxmlLoader;
diff --git a/src/main/resources/fxml/employeeList.fxml b/src/main/resources/fxml/employeeList.fxml
index 4131125..5bcce1c 100644
--- a/src/main/resources/fxml/employeeList.fxml
+++ b/src/main/resources/fxml/employeeList.fxml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.layout.FlowPane?>
-<FlowPane xmlns="http://javafx.com/javafx"
-  xmlns:fx="http://javafx.com/fxml"
+<FlowPane
+  xmlns="http://javafx.com/javafx/9.0.1"
+  xmlns:fx="http://javafx.com/fxml/1"
   fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.EmployeeListController"
   fx:id="flowPaneEmployeeList"
   stylesheets="@/styles/main.css"
   prefWidth="${flowPaneEmployeeList.parent.width}"
   prefHeight="${flowPaneEmployeeList.parent.height}"
-  style="-fx-background-color: #EFEBE8;">
+  styleClass="bg-gray-orange">
+  <padding>
+    <Insets bottom="10.0"/>
+  </padding>
 </FlowPane>
diff --git a/src/main/resources/fxml/manageEmployees.fxml b/src/main/resources/fxml/manageEmployees.fxml
index 4a7312f..05e729d 100644
--- a/src/main/resources/fxml/manageEmployees.fxml
+++ b/src/main/resources/fxml/manageEmployees.fxml
@@ -4,38 +4,66 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.AnchorPane?>
-<AnchorPane fx:id="listEmployeesAP" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
-  minWidth="-Infinity" prefHeight="536.0" prefWidth="702.0" style="-fx-background-color: #EFEBE8;"
-  visible="false" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1"
-  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.ManageEmployeesController">
+<AnchorPane
+  fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.ManageEmployeesController"
+  fx:id="listEmployeesAP"
+  prefHeight="536.0"
+  prefWidth="702.0"
+  stylesheets="@/styles/main.css"
+  visible="false"
+  styleClass="bg-gray-orange"
+  xmlns="http://javafx.com/javafx/9.0.1"
+  xmlns:fx="http://javafx.com/fxml/1">
   <children>
     <AnchorPane prefHeight="120.0"
       styleClass="bg-dark-orange"
-      AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      AnchorPane.leftAnchor="0.0"
+      AnchorPane.rightAnchor="0.0"
+      AnchorPane.topAnchor="0.0">
       <children>
-        <Label text="Personen" textFill="WHITE"
-          AnchorPane.leftAnchor="25.0" AnchorPane.topAnchor="20.0"
-          styleClass="text-bold, text-big">
+        <Label
+          text="Personen"
+          AnchorPane.leftAnchor="25.0"
+          AnchorPane.topAnchor="20.0"
+          styleClass="text-bold, text-big, text-white">
         </Label>
-        <Hyperlink onAction="#backToMain" text="Zurück"
-          textFill="WHITE" AnchorPane.rightAnchor="25.0" AnchorPane.topAnchor="20.0"
-          styleClass="text-big, text-bold">
+        <Hyperlink
+          onAction="#backToMain"
+          text="Zurück"
+          AnchorPane.rightAnchor="25.0"
+          AnchorPane.topAnchor="30.0"
+          styleClass="text-medium, text-white">
         </Hyperlink>
       </children>
     </AnchorPane>
-    <AnchorPane AnchorPane.bottomAnchor="0.0"
-      AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="60.0">
+    <AnchorPane
+      AnchorPane.bottomAnchor="0.0"
+      AnchorPane.leftAnchor="20.0"
+      AnchorPane.rightAnchor="20.0"
+      AnchorPane.topAnchor="60.0">
       <children>
-        <ScrollPane fitToHeight="true" fitToWidth="true" hbarPolicy="NEVER" vbarPolicy="NEVER"
-          AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
-          AnchorPane.topAnchor="86.0">
+        <ScrollPane
+          fitToHeight="true"
+          fitToWidth="true"
+          hbarPolicy="NEVER"
+          vbarPolicy="NEVER"
+          AnchorPane.bottomAnchor="0.0"
+          AnchorPane.leftAnchor="0.0"
+          AnchorPane.rightAnchor="0.0"
+          AnchorPane.topAnchor="80.0">
           <content>
-            <fx:include fx:id="employeeList" source="employeeList.fxml"/>
+            <fx:include
+              fx:id="employeeList"
+              source="employeeList.fxml"/>
           </content>
         </ScrollPane>
-        <AnchorPane fx:id="containerHeader"
-          minHeight="80.0" styleClass="shadowed" AnchorPane.leftAnchor="5.0"
-          AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="0.0"/>
+        <AnchorPane
+          fx:id="containerHeader"
+          minHeight="80.0"
+          styleClass="shadowed"
+          AnchorPane.leftAnchor="5.0"
+          AnchorPane.rightAnchor="5.0"
+          AnchorPane.topAnchor="0.0"/>
       </children>
     </AnchorPane>
   </children>
-- 
cgit v1.2.3-70-g09d2