MAM/VPR-Frontend
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: MAM:af441656deb3771a9fae2a26d2606d3700f63145
Branches Tags
MAM:master
MAM:merge
MAM:1720-UI-User-anlegen
MAM:CSS-Refactor
MAM:Comments
MAM:1800-UI-User-bearbeiten
MAM:utf-8_refactor
MAM:option-ui
MAM:2410-develop
MAM:Add-SVGs
MAM:Update-components-to-JFoenix
MAM:Update_create_and_edit_event_ui
MAM:0610-Timepicker
MAM:1210-UI-Termine-bearbeiten
MAM:2310-Login
MAM:0410-Switch-weeks
MAM:0510-Validierung
MAM:1710-UI-anmelden
MAM:refactor
MAM:0120-UI-Termine-erstellen
MAM:0300-Kalender
MAM:0100-Termine_anzeigen
..
compare: MAM:136ead454da73c3425a9bc92e98287708ac8ad7e
Branches Tags
MAM:master
MAM:merge
MAM:1720-UI-User-anlegen
MAM:CSS-Refactor
MAM:Comments
MAM:1800-UI-User-bearbeiten
MAM:utf-8_refactor
MAM:option-ui
MAM:2410-develop
MAM:Add-SVGs
MAM:Update-components-to-JFoenix
MAM:Update_create_and_edit_event_ui
MAM:0610-Timepicker
MAM:1210-UI-Termine-bearbeiten
MAM:2310-Login
MAM:0410-Switch-weeks
MAM:0510-Validierung
MAM:1710-UI-anmelden
MAM:refactor
MAM:0120-UI-Termine-erstellen
MAM:0300-Kalender
MAM:0100-Termine_anzeigen

No commits in common. "af441656deb3771a9fae2a26d2606d3700f63145" and "136ead454da73c3425a9bc92e98287708ac8ad7e" have entirely different histories.
af441656de ... 136ead454d

3 changed files with 4 additions and 7 deletions
Show Stats Expand all files Collapse all files

6
client/app/src/main/resources/users/create-user.css
View File

@ -2,8 +2,7 @@
* {
-fx-dark-background-color: #3E415F;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ff5555;
-fx-brightest-text-color: #ffffff;
-fx-brighter-text-color: #ffffff;
}
@ -30,7 +29,7 @@ GridPane{
Label{
-fx-text-fill: -fx-brightest-text-color;
-fx-text-fill: -fx-brighter-text-color;
-fx-max-width: 150px;
-fx-min-width: 150px;
}
@ -43,7 +42,6 @@ Label{
.errorMessage{
-fx-max-width: 400px;
-fx-min-width: 400px;
-fx-text-fill: -fx-brighter-text-color;
}
Button{

2
client/app/src/main/resources/users/create-user.fxml
View File

@ -33,7 +33,7 @@
<Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
<Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>

3
client/app/src/main/resources/users/edit-user.fxml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Alex Rechtin-->
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?>
@ -32,7 +31,7 @@
<Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
<Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
<Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>