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

Compare commits

base: 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
..
compare: 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

No commits in common. "136ead454da73c3425a9bc92e98287708ac8ad7e" and "ede28ae4a7b0f4c9d8ad52dc89192f78e6c6993c" have entirely different histories.
136ead454d ... ede28ae4a7

5 changed files with 57 additions and 85 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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