Commit Graph

12 Commits

Author SHA1 Message Date
Lars van Hijfte
2434ffc675 Added filter on the search page. 2017-01-12 12:20:47 +01:00
Kevin Nobel
69d1ee9cd8 Merge branch 'master' into kevin-prototype 2017-01-11 14:04:51 +01:00
Lars van Hijfte
8761c89f75 Added a footer.
This also sets the default height of the page to 100% so that the footer is always on the bottom
2017-01-11 13:07:52 +01:00
Kevin Nobel
019a89c865 Merge branch 'master' into kevin-prototype 2017-01-11 11:30:04 +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
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
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