Commit Graph

216 Commits

Author SHA1 Message Date
Lars van Hijfte
fc0b801d7d Added groups to the menu.
It also now has an animation to hide and show more or less items in the menu.
2017-01-11 13:06:09 +01:00
Kevin Nobel
019a89c865 Merge branch 'master' into kevin-prototype 2017-01-11 11:30:04 +01:00
Kevin Nobel
ee7a91a6aa Commit before merge 2017-01-11 11:26:42 +01:00
Marijn Jansen
5b4d773d93 Merge branch 'master' into marijn-chat 2017-01-11 11:15:03 +01:00
Marijn Jansen
17d1f96a02 Merge with current master 2017-01-11 11:14:07 +01:00
Lars van Hijfte
c354bdb330 fixed merge 2017-01-11 11:13:04 +01:00
Lars van Hijfte
e90ecda436 Added a menu
It contains a list of friends and a "more" button.
This also offsets the content to the right.
2017-01-11 11:10:32 +01:00
Marijn Jansen
8b74917b21 New Logo 2017-01-11 10:56:03 +01:00
Marijn Jansen
b973e666da Fixed spacing on the chat page. 2017-01-10 20:58:56 +01:00
Marijn Jansen
81e4d1e874 Fixed for merge 2017-01-10 17:12:16 +01:00
Kevin Nobel
40ce3d57b3 Added profile view. (WIP) 2017-01-10 17:09:11 +01:00
Marijn Jansen
cf240ca656 Almost a chatpage! 2017-01-10 17:08:40 +01:00
Marijn Jansen
ac369b5705 Almost a chatpage! 2017-01-10 17:06:52 +01:00
Lars van Hijfte
f8d66720bd Added a header
Logo, searchbar without functionality and a profile picture. Also gave the content a margin downward because of the header.
2017-01-10 16:43:16 +01:00
Lars van Hijfte
aebb9faefa Fixed the css import 2017-01-10 15:15:37 +01:00
Lars van Hijfte
4da39d5bab This inserts the map structure we will use for the project. 2017-01-10 14:35:56 +01:00