diff options
4 files changed, 53 insertions, 19 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java index b575699..a5f4d15 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/ui/vehiclepane/VehiclePaneController.java @@ -94,7 +94,7 @@ public class VehiclePaneController { public void setSelected(boolean selected) { rootElement.getStyleClass().clear(); - if (selected) rootElement.getStyleClass().add("shadowed-yellow"); - else rootElement.getStyleClass().add("shadowed-white"); + if (selected) rootElement.getStyleClass().add("bg-yellow, shadowed"); + else rootElement.getStyleClass().add("bg-white, shadowed"); } } diff --git a/src/main/resources/fxml/CreateOperationController.fxml b/src/main/resources/fxml/CreateOperationController.fxml index 9fe887c..3958872 100644 --- a/src/main/resources/fxml/CreateOperationController.fxml +++ b/src/main/resources/fxml/CreateOperationController.fxml @@ -5,11 +5,9 @@ <?import javafx.scene.control.Label?> <?import javafx.scene.control.ListView?> <?import javafx.scene.control.TextField?> -<?import javafx.scene.effect.DropShadow?> <?import javafx.scene.layout.AnchorPane?> <?import javafx.scene.layout.FlowPane?> <?import javafx.scene.text.Font?> - <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" @@ -18,7 +16,7 @@ <AnchorPane prefHeight="182.0" style="-fx-background-color: #2D75B6;" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" AnchorPane.rightAnchor="0.0"/> <AnchorPane fx:id="apCreateOperation" layoutX="40.0" layoutY="71.0" prefHeight="151.0" prefWidth="920.0" - styleClass="shadowed-white"> + styleClass="bg-white, shadowed"> <Label layoutX="14.0" layoutY="14.0" prefHeight="30.0" prefWidth="62.0" text="Code" styleClass="text-medium"/> <Label layoutX="185.0" layoutY="14.0" prefHeight="30.0" prefWidth="94.0" text="Adresse" styleClass="text-medium"/> @@ -64,13 +62,13 @@ <!--<AnchorPane fx:id="apActiveOperations" layoutX="968.0" layoutY="71.0" prefHeight="315.0" prefWidth="207.0" style="-fx-background-color: white; -fx-effect: dropshadow(gaussian, rgba(0.5,0.5,0.5,0.8), 5, 0, 0, 3);">--> <AnchorPane fx:id="apActiveOperations" layoutX="968.0" layoutY="71.0" prefHeight="315.0" prefWidth="207.0" - styleClass="shadowed-white"> + styleClass="bg-white, shadowed"> <ListView fx:id="lvActiveOperations" layoutX="4.0" layoutY="74.0" prefHeight="242.0" prefWidth="200.0" style="-fx-background-color: white;"/> <Label layoutX="10.0" layoutY="6.0" text="Aktive Einsätze" styleClass="text-big"> </Label> - <Label layoutY="12.0" text="Archiv" styleClass="text-medium" AnchorPane.rightAnchor="12"> + <Label layoutY="12.0" text="Archiv" styleClass="text-medium" AnchorPane.rightAnchor="12"> <!--TODO: Underline--> </Label> </AnchorPane> <FlowPane fx:id="fpVehicles" hgap="12" layoutX="40.0" layoutY="228.0" prefHeight="388.0" diff --git a/src/main/resources/fxml/vehiclePane.fxml b/src/main/resources/fxml/vehiclePane.fxml index 79cfaf9..a9efaa6 100644 --- a/src/main/resources/fxml/vehiclePane.fxml +++ b/src/main/resources/fxml/vehiclePane.fxml @@ -10,7 +10,7 @@ <?import javafx.scene.text.Text?> <?import javafx.scene.text.TextFlow?> -<GridPane hgap="6.0" stylesheets="@/styles/main.css" styleClass="shadowed-white" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.ui.vehiclepane.VehiclePaneController"> +<GridPane hgap="6.0" stylesheets="@/styles/main.css" styleClass="bg-white, shadowed" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.ui.vehiclepane.VehiclePaneController"> <columnConstraints> <ColumnConstraints /> <ColumnConstraints /> diff --git a/src/main/resources/styles/main.css b/src/main/resources/styles/main.css index fbacc41..886e756 100644 --- a/src/main/resources/styles/main.css +++ b/src/main/resources/styles/main.css @@ -1,19 +1,52 @@ -.shadowed-white { - -fx-background-color: white; +/* === shadow === */ +.shadowed { -fx-effect: dropshadow(gaussian, rgba(100,100,100,0.8), 5, 0, 0, 3); } -.shadowed-yellow { +/* === background === */ +/* -- basic -- */ +.bg-white { + -fx-background-color: white; +} +/* -- vehiclePane -- */ +.bg-yellow { -fx-background-color: #FFE699; - -fx-effect: dropshadow(gaussian, rgba(100,100,100,0.8), 5, 0, 0, 3); } - -.border-sw { - -fx-background-color: white; - -fx-effect: dropshadow(gaussian, rgba(100,100,100,0.8), 5, 0, 0, 3); - -fx-border-color: black; +.bg-status-green { + -fx-background-color: #C5E0B4; +} +.bg-status-orange { + -fx-background-color: #F8CBAD; +} +/* -- header areas -- */ +.bg-blue { + -fx-background-color: #2E75B6; +} +.bg-green { + -fx-background-color: #548235; +} +.bg-light-orange { + -fx-background-color: #BF9000; +} +.bg-dark-orange { + -fx-background-color: #C55A11; +} +/* -- content areas -- */ +.bg-gray-blue { + -fx-background-color: #E8EAEF; +} +.bg-gray-green { + -fx-background-color: #EBEFE8; +} +.bg-gray-orange { + -fx-background-color: #EFEBE8; +} +/* -- edit area -- */ +.bg-edit-area-orange { + -fx-background-color: #FBE5D6; } +/* === text === */ .text-big { -fx-font-size: 18px; } @@ -26,13 +59,14 @@ -fx-font-size: 14px; } +/* === button === */ .button { -fx-background-radius: 0em; -fx-border-color: black; } .button-main { - -fx-background-color: darkgreen; + -fx-background-color: #548235; -fx-text-fill: white; -fx-font-weight: bold; } @@ -45,6 +79,7 @@ -fx-background-color: #F8CBAD; } +/* === menu item === */ .mi-free { -fx-background-color: #C5E0B4; } @@ -56,4 +91,5 @@ .menu-item:focused .label { -fx-text-fill: black; -fx-font-weight: bold; -}
\ No newline at end of file +} + |