Merge branch 'max_dev' of Software_Engineering_I/greenvironment-frontend into master

master
Max_ES 5 years ago committed by Gitea
commit 65900cdeaa

@ -36,8 +36,10 @@
max-height: 100vh max-height: 100vh
#headerbar #headerbar
height: 10vh
@include gridPosition(1, 1, 1, 4) @include gridPosition(1, 1, 1, 4)
display: grid display: grid
grid-template: 100% /30% 10% 10% 10% 10% 10% 15% 5% grid-template: 100% /30% 10% 10% 10% 10% 10% 15% 5%
background-color: $cHeadPrimaryBackground background-color: $cHeadPrimaryBackground
color: $cHeadFontColor color: $cHeadFontColor

@ -5,8 +5,8 @@
background-color: $cSecondaryBackground background-color: $cSecondaryBackground
grid-template: 15% 70% 15% / 15% 70% 15% grid-template: 15% 70% 15% / 15% 70% 15%
display: grid display: grid
min-height: 100vh min-height: 90vh
max-height: 100vh max-height: 90vh
#aboutcontainer #aboutcontainer
@include gridPosition(2, 2,2,2) @include gridPosition(2, 2,2,2)

@ -30,4 +30,8 @@ export class ChatlistComponent implements OnInit {
this.showChatEvent.emit(this.selectedChat) this.showChatEvent.emit(this.selectedChat)
} }
newChat() {
console.error("not implemented")
}
} }

@ -27,4 +27,8 @@ export class ChatcontactsComponent implements OnInit {
this.goBack() this.goBack()
} }
contactList() {
console.error("Not Imlemented!")
}
} }

@ -4,8 +4,8 @@
#content #content
grid-template: 100%/ 25% 50% 25% grid-template: 100%/ 25% 50% 25%
display: grid display: grid
min-height: 100vh min-height: 90vh
max-height: 100vh max-height: 90vh
#chatcontainer #chatcontainer
@include gridPosition(1, 3, 1, 2) @include gridPosition(1, 3, 1, 2)

@ -5,8 +5,7 @@
background-color: $cSecondaryBackground background-color: $cSecondaryBackground
grid-template: 15% 70% 15% / 15% 70% 15% grid-template: 15% 70% 15% / 15% 70% 15%
display: grid display: grid
min-height: 100vh height: 90vh
max-height: 100vh
#imprintcontainer #imprintcontainer
@include gridPosition(2, 2,2,2) @include gridPosition(2, 2,2,2)

@ -1,6 +1,7 @@
<div id="login"> <div id="login">
<div id="logincontainer"> <div id="logincontainer">
<h1>Login</h1>
<table style="width:100%" (keyup.enter)="onClickSubmit(email.value,password.value)"> <table style="width:100%" (keyup.enter)="onClickSubmit(email.value,password.value)">
<tr> <tr>
<td>email: </td> <td>email: </td>

@ -5,8 +5,7 @@
background-color: $cSecondaryBackground background-color: $cSecondaryBackground
grid-template: 8% 77% 15% / 15% 70% 15% grid-template: 8% 77% 15% / 15% 70% 15%
display: grid display: grid
min-height: 100vh height: 90vh
max-height: 100vh
#logincontainer #logincontainer
@include gridPosition(2, 2,2,2) @include gridPosition(2, 2,2,2)

@ -5,8 +5,8 @@
background-color: $cSecondaryBackground background-color: $cSecondaryBackground
grid-template: 3% 94% 3% / 10% 80% 10% grid-template: 3% 94% 3% / 10% 80% 10%
display: grid display: grid
min-height: 100vh min-height: 90vh
max-height: 100vh max-height: 90vh
#profilecontainer #profilecontainer
@include gridPosition(2, 2,2,2) @include gridPosition(2, 2,2,2)

@ -1,5 +1,6 @@
<div id="register"> <div id="register">
<div id="registercontainer"> <div id="registercontainer">
<h1>Register</h1>
<table style="width:100%" (keyup.enter)="onClickSubmit(username.value,email.value,password.value, repeatpassword.value)"> <table style="width:100%" (keyup.enter)="onClickSubmit(username.value,email.value,password.value, repeatpassword.value)">
<tr> <tr>
<td>username: </td> <td>username: </td>

@ -5,8 +5,8 @@
background-color: $cSecondaryBackground background-color: $cSecondaryBackground
grid-template: 8% 77% 15% / 15% 70% 15% grid-template: 8% 77% 15% / 15% 70% 15%
display: grid display: grid
min-height: 100vh min-height: 90vh
max-height: 100vh max-height: 90vh
#registercontainer #registercontainer
@include gridPosition(2, 2,2,2) @include gridPosition(2, 2,2,2)

Loading…
Cancel
Save