Compare commits

...

4 Commits

Author SHA1 Message Date
58fc25c27e Bugfix create-user 2022-01-31 13:32:18 +01:00
65d96bbd81 Merge branch 'merge' into 1800-UI-User-bearbeiten 2022-01-31 12:43:25 +01:00
3f41005d84 Merge branch 'merge' into 1800-UI-User-bearbeiten
# Conflicts:
#	client/app/src/main/java/users/EditUserController.java
#	client/app/src/main/resources/users/edit-user.fxml
2022-01-31 12:40:03 +01:00
4db6bd1c66 created and completed the edit-user.fxml, css and the controller 2022-01-24 12:16:05 +01:00
3 changed files with 61 additions and 1 deletions

View File

@ -43,6 +43,7 @@ Label{
.errorMessage{ .errorMessage{
-fx-max-width: 400px; -fx-max-width: 400px;
-fx-min-width: 400px; -fx-min-width: 400px;
-fx-text-fill: red;
} }
Button{ Button{

View File

@ -8,7 +8,7 @@
xmlns:fx="http://javafx.com/fxml" xmlns:fx="http://javafx.com/fxml"
fx:controller="users.CreateUserController"> fx:controller="users.CreateUserController">
<columnConstraints> <columnConstraints>
<ColumnConstraints minWidth="100"/> <ColumnConstraints minWidth="50"/>
<ColumnConstraints minWidth="100"/> <ColumnConstraints minWidth="100"/>
<ColumnConstraints minWidth="100"/> <ColumnConstraints minWidth="100"/>
</columnConstraints> </columnConstraints>

View File

@ -0,0 +1,59 @@
* {
-fx-base-background-color: #2B2D42;
-fx-base1-background-color: #525E74;
-fx-main-border-color: #B0B0B0;
-fx-main-text-color: #ffffff;
}
GridPane{
-fx-background-color: #3E415F;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: #B0B0B0;
-fx-border-style: solid;
-fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
}
.mainLabel{
-fx-padding: 10px;
-fx-max-width: 400px;
-fx-min-width: 400px;
-fx-font-weight: bold;
-fx-alignment: top-center;
}
Label{
-fx-text-fill: white;
-fx-max-width: 150px;
-fx-min-width: 150px;
}
.textField{
-fx-max-width: 400px;
-fx-min-width: 400px;
}
.errorMessage{
-fx-font-weight: bold;
-fx-max-width: 200px;
-fx-text-fill: #ff5555;
-fx-font-size: 16px;
-fx-max-width: 400px;
-fx-min-width: 400px;
}
Button{
-fx-max-width: 150px;
-fx-min-width: 150px;
}
.btnLogin{
-fx-font-weight: bold;
}