Merge remote-tracking branch 'origin/stefan'
# Conflicts: # src/main/resources/de/subway_surfers/vpr_app/layout.css
This commit is contained in:
@@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.geometry.*?>
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
<!-- Erstellt von Stefan Groß -->
|
||||
|
||||
<VBox prefHeight="400.0" prefWidth="600.0" stylesheets="@layout.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.subway_surfers.vpr_app.BestelluebersichtMitarbeiter">
|
||||
|
||||
<BorderPane styleClass="kopfzeile">
|
||||
<left>
|
||||
<Button fx:id="zurueck" text="Zurück"/>
|
||||
</left>
|
||||
<right>
|
||||
<Button fx:id="abmelden" text="Abmelden" onAction="#onAbmelden"/>
|
||||
</right>
|
||||
</BorderPane>
|
||||
|
||||
<ScrollPane fx:id="scrollPane" fitToWidth="true" VBox.vgrow="ALWAYS">
|
||||
<padding>
|
||||
<Insets bottom="30.0" left="30.0" right="30.0" top="30.0" />
|
||||
</padding>
|
||||
<Accordion fx:id="accordion">
|
||||
</Accordion>
|
||||
</ScrollPane>
|
||||
|
||||
</VBox>
|
@@ -29,6 +29,7 @@
|
||||
|
||||
.hauptmenue_wochenuebersicht{
|
||||
-fx-grid-lines-visible: true;
|
||||
-fx-grid-lines-visible: true;
|
||||
}
|
||||
|
||||
.hauptmenue_wochenuebersicht > *{
|
||||
@@ -102,4 +103,10 @@
|
||||
|
||||
.links {
|
||||
-fx-rotate: 180;
|
||||
}
|
||||
.titledPaneUeberschrift > .title {
|
||||
-fx-pref-height: 50;
|
||||
-fx-padding: 10 10 16 10;
|
||||
-fx-font-size: 15;
|
||||
-fx-font-weight: bold;
|
||||
}
|
Reference in New Issue
Block a user