Merge remote-tracking branch 'origin/Max' into Max

# Conflicts:
#	src/main/java/de/subway_surfers/vpr_app/EssensverwaltungMitarbeiterView.java
This commit is contained in:
2024-01-19 08:09:37 +01:00
5 changed files with 4 additions and 46 deletions

View File

@@ -18,7 +18,7 @@
-fx-padding: 20;
}
.hauptmenue_buttons_links, .gerichterstellung_felder, .filter, .main, .filter_unten{
.hauptmenue_buttons_links{
-fx-spacing: 20;
}
@@ -73,13 +73,6 @@
-fx-vgap: 10;
-fx-hgap: 10;
}
.test {
-fx-padding: 10 20;
}
.essensuebersicht_gridlines {
-fx-grid-lines-visible: true;
}
.accounterstellung_links {
-fx-spacing: 20;
@@ -88,25 +81,4 @@
.falscheEingabe {
-fx-background-color: #FFDCDC;
-fx-text-fill: #FFDCDC;
}
.essensuebersicht_gridlines > * {
-fx-alignment: center;
}
.pfeil{
-fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
-fx-background-insets: 0 0 -1 0, 0;
-fx-padding: 0.25em;
-fx-shape: "M 0 -3.5 v 7 l 4 -3.5 z";
-fx-pref-width: 25;
}
.links {
-fx-rotate: 180;
}
.titledPaneUeberschrift > .title {
-fx-pref-height: 50;
-fx-padding: 10 10 16 10;
-fx-font-size: 15;
-fx-font-weight: bold;
}