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

Compare commits

base: MAM:ede28ae4a7b0f4c9d8ad52dc89192f78e6c6993c
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

7 Commits
ede28ae4a7 ... 136ead454d

Author SHA1 Message Date
Alex Rechtin
136ead454d Refactor the create-event.css 2022-02-07 12:34:24 +01:00
Alex Rechtin
0f4ad96dc0 Refactor the login.css 2022-02-07 12:13:08 +01:00
Alex Rechtin
33f8c326d1 Refactor the create-user.css and fixed the option-view.css 2022-02-07 12:07:42 +01:00
Alex Rechtin
de4811ee12 Refactor the option-view.css 2022-02-07 11:48:53 +01:00
Alex Rechtin
f3a7ce21cc Refactor the main-view.css 2022-02-07 11:42:03 +01:00
Alex Rechtin
a29f6d204f Merge branch 'merge' into CSS-Refactor 
# Conflicts:
#	client/app/src/main/resources/main/main-view.css
#	client/app/src/main/resources/main/main-view.fxml
 2022-02-07 11:22:31 +01:00
Alex Rechtin
7e3bd66571 Improvement of the main-view.fxml and main-view.css 2021-12-13 12:46:01 +01:00
5 changed files with 85 additions and 57 deletions
Expand all files Collapse all files

35
client/app/src/main/resources/main/create-event.css
View File

@@ -1,25 +1,38 @@
/*Marco Kühn*/
* {
-fx-dark-background-color: #3E415F;
-fx-darkest-background-color: #2B2D42;
-fx-bright-background-color: #8D99AE;
-fx-brighter-background-color: #ff5555;
-fx-brightest-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
}
GridPane{
-fx-background-color: #3E415F;
-fx-background-color: -fx-dark-background-color;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: #B0B0B0;
-fx-border-color: -fx-bright-border-color;
-fx-border-style: solid;
-fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
}
Label{
-fx-text-fill: white;
-fx-text-fill: -fx-brighter-text-color;
-fx-max-width: 150px;
-fx-min-width: 150px;
}
.mainLabel{
-fx-background-color: #8D99AE;
-fx-background-color: -fx-bright-background-color;
-fx-padding: 10px;
-fx-max-width: 200px;
-fx-min-width: 200px;
@@ -29,22 +42,22 @@ Label{
.inputField{
-fx-padding: 10px;
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}
.mainButton{
-fx-font-weight: bold;
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}
JFXButton{
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}
#labelError{
-fx-font-weight: bold;
-fx-max-width: 1000px;
-fx-text-fill: #ff5555;
-fx-text-fill: -fx-brighter-background-color;
-fx-padding: 16px;
-fx-min-height: 140px;
-fx-max-height: 400px;
@@ -53,15 +66,15 @@ JFXButton{
}
.inputDate{
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}
.comboBox{
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}
.timePicker{
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}
.jfx-time-picker .date-picker-popup{

40
client/app/src/main/resources/main/main-view.css
View File

@@ -1,66 +1,70 @@
/*Alex Rechtin, Marco Kühn*/
* {
-fx-base-background-color: #2B2D42;
-fx-base1-background-color: #525E74;
-fx-dark-background-color: #525E74;
-fx-darkest-background-color: #2B2D42;
-fx-main-border-color: #B0B0B0;
-fx-main-text-color: #ffffff;
-fx-bright-background-color: #77859E;
-fx-brighter-background-color: #282C34 ;
-fx-brightest-background-color: #333333 ;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
}
GridPane{
-fx-background-color: -fx-base-background-color;
-fx-background-color: -fx-darkest-background-color;
}
.main-panel{
-fx-background-color: #282C34;
-fx-background-color: -fx-brighter-background-color;
}
.vbox-main{
-fx-background-color: #333333;
-fx-background-color: -fx-brightest-background-color;
-fx-alignment: top-center;
}
.gridCalendar Line{
-fx-stroke: -fx-main-border-color;
-fx-stroke: -fx-bright-border-color;
}
.gridCalender{
-fx-background-color: -fx-base-background-color;
-fx-background-color: -fx-darkest-background-color;
-fx-min-height: 80px;
-fx-max-height: 80px;
}
.labelMonth{
-fx-padding: 0 0 0 20;
-fx-background-color: #77859E;
-fx-background-color: -fx-bright-background-color;
-fx-font-size: 35px;
-fx-font-weight: bold;
}
.scrollDays{
-fx-background-color: -fx-base-background-color;
-fx-border-color: -fx-main-border-color;
-fx-background-color: -fx-darkest-background-color;
-fx-border-color: -fx-bright-border-color;
}
.vBoxDays{
-fx-background-color: -fx-base-background-color;
-fx-background-color: -fx-darkest-background-color;
}
.labelDays{
-fx-alignment: center;
-fx-background-color: -fx-base1-background-color;
-fx-background-color: -fx-dark-background-color;
-fx-font-size: 25px;
-fx-border-color: -fx-main-border-color;
-fx-border-color: -fx-bright-border-color;
}
Label{
-fx-text-fill: -fx-main-text-color;
-fx-text-fill: -fx-brighter-text-color;
}
.event{
-fx-background-color: -fx-base1-background-color;
-fx-background-color: -fx-dark-background-color;
}
.main-btn{
@@ -77,7 +81,7 @@ Label{
}
.buttonBox{
-fx-background-color: #77859E;
-fx-background-color: -fx-bright-background-color;
}
.navBtn{

26
client/app/src/main/resources/main/option-view.css
View File

@@ -1,25 +1,35 @@
/* Marco Kühn */
* {
-fx-dark-background-color: #3E415F;
-fx-bright-background-color: #ff5555;
-fx-brighter-background-color: #8D99AE;
-fx-brightest-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
}
GridPane{
-fx-background-color: #3E415F;
-fx-background-color: -fx-dark-background-color;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: #B0B0B0;
-fx-border-color: -fx-bright-border-color;
-fx-border-style: solid;
-fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
}
Label{
-fx-text-fill: white;
-fx-text-fill: -fx-brighter-text-color;
-fx-max-width: 200px;
-fx-min-width: 200px;
}
.mainLabel{
-fx-background-color: #8D99AE;
-fx-background-color: -fx-brighter-background-color;
-fx-padding: 10px;
-fx-max-width: 200px;
-fx-min-width: 200px;
@@ -29,17 +39,17 @@ Label{
.mainButton{
-fx-font-weight: bold;
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}
JFXButton{
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}
#labelError{
-fx-font-weight: bold;
-fx-max-width: 1000px;
-fx-text-fill: #ff5555;
-fx-text-fill: -fx-bright-background-color;
-fx-padding: 16px;
-fx-min-height: 140px;
-fx-max-height: 400px;
@@ -48,7 +58,7 @@ JFXButton{
}
.comboBox{
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
-fx-max-width: 200px;
-fx-min-width: 200px;
}

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

@@ -1,21 +1,19 @@
/*Alex Rechtin*/
* {
-fx-base-background-color: #2B2D42;
-fx-base1-background-color: #525E74;
-fx-main-border-color: #B0B0B0;
-fx-main-text-color: #ffffff;
-fx-dark-background-color: #3E415F;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
}
GridPane{
-fx-background-color: #3E415F;
-fx-background-color: -fx-dark-background-color;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: #B0B0B0;
-fx-border-color: -fx-bright-border-color;
-fx-border-style: solid;
-fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
@@ -31,7 +29,7 @@ GridPane{
Label{
-fx-text-fill: white;
-fx-text-fill: -fx-brighter-text-color;
-fx-max-width: 150px;
-fx-min-width: 150px;
}

27
client/app/src/main/resources/users/login.css
View File

@@ -1,27 +1,30 @@
/* Marco Kühn*/
* {
-fx-base-background-color: #2B2D42;
-fx-base1-background-color: #525E74;
-fx-dark-background-color: #3E415F;
-fx-main-border-color: #B0B0B0;
-fx-main-text-color: #ffffff;
-fx-brightest-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-bright-text-color: ##ff5555;
-fx-brighter-text-color: #ffffff;
}
GridPane{
-fx-background-color: #3E415F;
-fx-background-color: -fx-dark-background-color;
-fx-padding: 20px;
-fx-font-size: 20px;
-fx-font-family: Segoe UI;
-fx-border-insets: 1;
-fx-border-color: #B0B0B0;
-fx-border-color: -fx-bright-border-color;
-fx-border-style: solid;
-fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
}
Label{
-fx-text-fill: white;
-fx-text-fill: -fx-brighter-text-color;
-fx-max-width: 150px;
-fx-min-width: 150px;
}
@@ -29,7 +32,7 @@ Label{
.errorLbl{
-fx-font-weight: bold;
-fx-max-width: 200px;
-fx-text-fill: #ff5555;
-fx-text-fill: -fx-bright-text-color;
-fx-padding: 16px;
-fx-min-height: 140px;
-fx-max-height: 400px;
@@ -38,17 +41,17 @@ Label{
}
.userField{
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}
.passField{
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}
.quitBtn{
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}
.loginBtn{
-fx-background-color: white;
-fx-background-color: -fx-brightest-background-color;
}