Compare commits

..

No commits in common. "19610477035a857cbbb037b5e18fb45dcee9604b" and "980a66fb4794a99ded961c7e27a848eb3be89c43" have entirely different histories.

6 changed files with 26 additions and 35 deletions

View File

@ -9,4 +9,4 @@
margin-right: auto; margin-right: auto;
margin-top: 90px; margin-top: 90px;
border: 15px black solid; border: 15px black solid;
} }

View File

@ -1,7 +1,7 @@
body { body {
margin: 20px; margin: 1vh;
font-family: 'Quicksand', sans-serif; font-family: 'Quicksand', sans-serif;
font-size: 60px; font-size: 3vh;
} }
a { a {

View File

@ -15,4 +15,4 @@
#app #main .profile #app #main .profile
{ {
background-color: green; background-color: green;
} }

View File

@ -1,13 +1,13 @@
#app img #app img
{ {
max-height: 3em; max-height: 10vh;
max-width: 3em; max-width: 10vh;
} }
#app ul #app ul
{ {
font-size: 0.75em; font-size: 2vh;
margin: 0.25em 0 0 0; margin: 1vh 0 0 0;
padding: 0 0 0 0; padding: 0 0 0 0;
list-style-type: none; list-style-type: none;
max-height: 80vh; max-height: 80vh;
@ -16,7 +16,7 @@
#app li #app li
{ {
margin: 0.25em 0.25em 0 0; margin: 1vh 1vh 0 0;
} }
#app #chats { #app #chats {
@ -25,41 +25,37 @@
text-align: left; text-align: left;
} }
#app #users { #app #users {
margin: 0em 1.0em 0em 0.05em; margin: 0vh 5vh 0vh 0.1vh;
} }
#app #chat { #app #chat {
position: relative; position: relative;
max-height: 86vh; max-height: 80vh;
width: 100vh; width: 80vh;
/*border: 2px solid green;*/ /*border: 2px solid green;*/
overflow: hidden; overflow: hidden;
} }
#app #members {
font-size: 1em;
}
#app #add_chat_off { #app #add_chat_off {
text-decoration: underline; text-decoration: underline;
} }
#app #messages { #app #messages {
max-height: 50em; max-height: 50vh;
overflow: scroll; overflow: scroll;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
font-size: 0.6em; font-size: 2vh;
} }
#app #input_user{ #app #input_user{
color: green; color: green;
width: 8.5em; width: 20vh;
height: 1.1em; height: 2.5vh;
font-size: 0.75em; font-size: 2vh;
border: none; border: none;
outline: none; outline: none;
border-bottom: 0.15em solid green; border-bottom: 0.25vh solid green;
} }
#app #input_chat{ #app #input_chat{
@ -69,18 +65,18 @@
width: 100%; width: 100%;
border: none; border: none;
outline: none; outline: none;
border-bottom: 0.2em solid green; border-bottom: 0.25vh solid green;
caret-color: green; caret-color: green;
color: green; color: green;
font-size: 0.65em; font-size: 2vh;
} }
#app #you { #app #you {
text-align: left; text-align: left;
position: relative; position: relative;
max-width: 48%; max-width: 48%;
left: 0.5em; left: 2vh;
margin: 0.5em 0 0 0; margin: 1vh 0 0 0;
color: green; color: green;
word-wrap: break-word; word-wrap: break-word;
@ -90,8 +86,8 @@
text-align: right; text-align: right;
position: relative; position: relative;
max-width: 48%; max-width: 48%;
margin: 0.5em 0 0 auto; margin: 1vh 0 0 auto;
right: 0.5em; right: 2vh;
color: red; color: red;
/* permet le retour à la ligne à la place de dépasser*/ /* permet le retour à la ligne à la place de dépasser*/

View File

@ -8,13 +8,10 @@ class Channels {
async createChannel(users_id, reload) { async createChannel(users_id, reload) {
let null_id = false;
users_id.forEach(user_id => { users_id.forEach(user_id => {
if (user_id == null) if (user_id == null)
null_id = true; return console.log("createChannel error, null id;");
}); });
if (null_id)
return console.log(users_id, "createChannel error, null id;");
let response = await this.client._post("/api/chat/", { let response = await this.client._post("/api/chat/", {
users_id:users_id users_id:users_id

View File

@ -185,9 +185,6 @@ export default class extends AbstractView {
messages.appendChild(text); messages.appendChild(text);
}); });
// Scroll to the bottom of messages
messages.scrollTop = messages.scrollHeight;
} }
async hideChat() { async hideChat() {
@ -215,6 +212,7 @@ export default class extends AbstractView {
</ul> </ul>
</div> </div>
</div> </div>
`; `;
} }
} }