Skip to content

Commit 9cd0a37

Browse files
committed
styling a bit the interface
1 parent 0dea780 commit 9cd0a37

File tree

3 files changed

+47
-12
lines changed

3 files changed

+47
-12
lines changed

public/css/styles.css

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,43 @@
11
#content {
2+
width: 750px;
3+
height: 500px;
4+
margin: 0 auto;
5+
}
6+
7+
#content #chat #messages {
28
width: 500px;
3-
height: 300px;
9+
}
10+
11+
#content #users {
12+
width: 200px;
13+
height: 300px;
14+
padding:0;
15+
margin:0 0 0 20px;
16+
list-style:none;
17+
border:1px solid black;
18+
}
19+
20+
#content #users li {
21+
padding-left:10px;
22+
width:95%;
23+
height:20px;
24+
}
25+
26+
#content #users li.odd {
27+
background-color:#ccc;
28+
}
29+
30+
#content #chat #messages {
31+
min-height: 300px;
432
margin: 0 0 20px 0;
533
border: solid 1px #999;
634
overflow-y: scroll;
735
}
836

9-
input.field {
10-
width:350px;
37+
#content #chat, #content #users {
38+
float:left;
39+
}
40+
41+
.controls input#field {
42+
width: 86%;
1143
}

socket.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ var users = [];
55
module.exports = function (socket) {
66

77
socket.on('disconnect', function () {
8-
socket.broadcast.emit('send:message', {message : new_user.name + ' a quitté la discussion'});
8+
socket.broadcast.emit('send:message', {message : new_user.name + ' left the conversation'});
99
deleteUser(new_user);
1010
});
1111

1212
var new_user = addUser();
13-
socket.emit('send:message', {message : '*** Bienvenue sur le chat ' + new_user.name + ' ***' });
13+
socket.emit('send:message', {message : '*** Welcome ' + new_user.name + ' ! ***' });
1414

15-
socket.broadcast.emit('send:message', {message : new_user.name + ' a rejoint la discussion'});
15+
socket.broadcast.emit('send:message', {message : new_user.name + ' join the conversation'});
1616

1717
socket.emit('user:join', {list : users, new_one : new_user});
1818
socket.broadcast.emit('user:join', {list : users});

views/page.jade

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ html(ng-app="tchat")
1010
script(src='/socket.io/socket.io.js')
1111
body(ng-controller='TchatCtrl')
1212
#content
13-
div(ng-repeat="msg in messages") {{msg}}
14-
.controls
15-
input#field(ng-model='message')
16-
input#send(type='button', value='Envoyer', ng-click='sendMessage()')
17-
#users
18-
div(ng-repeat="user in users") {{user}}
13+
#chat
14+
#messages
15+
div(ng-repeat="msg in messages") {{msg}}
16+
div.clearer
17+
.controls
18+
input#field(ng-model='message')
19+
input#send(type='button', value='Envoyer', ng-click='sendMessage()')
20+
ul#users
21+
li(ng-repeat="user in users" ng-class-odd="'odd'") {{user.name}}

0 commit comments

Comments
 (0)