Commit graph

1211 commits

Author SHA1 Message Date
Wout Schellaert
e740458add oeps 2016-10-04 01:15:32 +02:00
Wout Schellaert
0364af926a Change hydra picture, align links botright 2016-10-04 01:11:15 +02:00
Lorin Werthen
ed87b9120c contentstuffs 2016-10-03 23:27:58 +02:00
Lorin Werthen
a7c47c885b right i was actually gonna fix this 2016-10-03 22:54:54 +02:00
Lorin Werthen
f9c2fcc41d minor fix 2016-10-03 22:53:58 +02:00
Lorin Werthen
f3ff3cdb8d Merge remote-tracking branch 'origin/master' into wemadeitboyz 2016-10-03 22:42:50 +02:00
Lorin Werthen
367b2a6a17 we're getting there 2016-10-03 22:33:52 +02:00
Eloïse Piret
b1dad5bca8 not so much 2016-10-03 22:18:33 +02:00
Wout Schellaert
ea5d1ebce7 Replace mehmet by a template 2016-10-03 21:56:08 +02:00
Lorin Werthen
6b5cfa3916 so much css 2016-10-03 20:52:01 +02:00
Lorin Werthen
059b827ad0 selected 2016-10-03 20:21:17 +02:00
Lorin Werthen
21dc9929f6 tetten 2016-10-03 19:21:29 +02:00
Eloïse Piret
0cea9e4069 moar content 2016-10-03 18:32:24 +02:00
Lorin Werthen
2c6018bb8b improvements 2016-10-03 16:56:56 +02:00
Lorin Werthen
3220b7548f Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be 2016-10-03 16:37:33 +02:00
Lorin Werthen
0f245d57a9 re-add projects 2016-10-03 16:35:44 +02:00
Lorin Werthen
4170632700 Merge remote-tracking branch 'origin/master' into indexpage 2016-10-03 16:32:34 +02:00
Eloïse Piret
c8a8ebfd04 Merge branch 'master' into indexpage 2016-10-03 15:35:03 +02:00
Eloïse Piret
086ea4eeb7 httpS 2016-10-03 15:30:48 +02:00
Eloïse Piret
54077996cf Merge branch 'indexpage' of github.com:ZeusWPI/zeus.ugent.be into indexpage 2016-10-03 15:25:38 +02:00
Eloïse Piret
67b56ad2e3 links en content ofzo 2016-10-03 15:24:17 +02:00
Lorin Werthen
ca02911990 Merge branch 'indexpage' of github.com:ZeusWPI/zeus.ugent.be into indexpage 2016-10-03 15:17:55 +02:00
Lorin Werthen
7b8ba0b95c many stuffs 2016-10-03 15:15:48 +02:00
Eloïse Piret
5b57603d2c fix image 2016-10-03 14:47:31 +02:00
Lorin Werthen
2613659774 fix mixed content 2016-10-03 14:45:31 +02:00
lorin
e940f483b2 Merge pull request #61 from ZeusWPI/indexpage
Indexpage
2016-10-03 14:42:30 +02:00
Lorin Werthen
2f5ab79ff1 Merge branch 'indexpage' of github.com:ZeusWPI/zeus.ugent.be into indexpage 2016-10-03 14:42:09 +02:00
Lorin Werthen
06cc8a514a fix some more stuff 2016-10-03 14:41:36 +02:00
Eloïse Piret
3e738e1216 hopefully fix stuff 2016-10-03 14:34:35 +02:00
Eloïse Piret
7cc771d8be fix slash 2016-10-03 14:19:19 +02:00
Eloïse Piret
92f7b845d0 catify home page 2016-09-27 23:17:38 +02:00
Wout Schellaert
78a381dea1 Merge pull request #56 from ZeusWPI/blogposts
Blogposts
2016-09-27 21:29:01 +02:00
Wout Schellaert
c32a965667 Fix broken links 2016-09-27 19:39:41 +02:00
Wout Schellaert
2944160e81 Remove trash files 2016-09-27 19:18:52 +02:00
Wout Schellaert
c7221bc543 Merge branch 'master' into wemadeitboyz 2016-09-27 19:13:54 +02:00
72229dc833 mimo pls 2016-09-27 19:04:17 +02:00
Mehmet Köse
e6318bbbe2 fixed missing ; 2016-09-27 18:11:32 +02:00
Mehmet Köse
cf0694d1ec all projects are in the projects page, todo some small layout fixes 2016-09-27 10:09:24 +02:00
Eloïse Piret
c219735145 fix info links 2016-09-23 18:14:18 +02:00
Eloïse Piret
252d796993 fix img 2016-09-22 21:28:01 +02:00
Eloïse Piret
de0b47e4df bibi archive 2016-09-22 21:23:40 +02:00
Eloïse Piret
91b64afaa1 blog enzo 2016-09-22 21:13:46 +02:00
Mehmet Köse
082ceb8a27 commiting what I have before I format 2016-09-20 23:32:54 +02:00
Eloïse Piret
4561a858c3 finish proposed styling 2016-09-14 16:11:48 +02:00
Eloïse Piret
80fd52b4e4 moar styling events page 2016-09-13 19:56:55 +02:00
Eloïse Piret
d15104e767 styling events page 2016-09-13 19:26:17 +02:00
Eloïse Piret
ab72313db2 generalize maps 2016-09-13 18:12:52 +02:00
Eloïse Piret
3bd6424aac add test-LAN event 2016-09-13 17:28:14 +02:00
Eloïse Piret
ec7bc435b1 add img to events 2016-09-13 17:13:43 +02:00
Lorin Werthen
d4e45a3b21 use ZINC: Zeus In Numerous Colours 2016-09-04 01:39:03 +02:00
Lorin Werthen
2ecc518665 more examples of ease of developing 2016-09-03 23:38:59 +02:00
Lorin Werthen
a53ee4dd2a lato is rly pretty as well 2016-09-03 21:37:00 +02:00
Lorin Werthen
3aed7ec99b add footer to eventpage, make sticky 2016-09-03 16:51:25 +02:00
Lorin Werthen
7dcf1433e0 pretty firefox font 2016-09-03 16:42:58 +02:00
Lorin Werthen
ab41a9b500 fixes #52 2016-09-02 00:22:01 +02:00
Lorin Werthen
f21f8a9a1c Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be 2016-09-02 00:08:48 +02:00
Lorin Werthen
d2feb99446 improve navbar and eventpage styling 2016-09-02 00:05:38 +02:00
Mehmet Köse
f0cc739bc3 trying out some different layouts 2016-09-01 22:47:28 +02:00
Mehmet Köse
4deef88948 fixing projects page 2016-08-31 15:56:09 +02:00
David Vandorpe
4ca8db7d0f Use buttons for absolute navigation
Fixes #49
2016-08-30 23:53:43 +02:00
Lorin Werthen
d9da84fdca fix internal links 2016-08-30 23:42:36 +02:00
Lorin Werthen
dda4155be4 fix #48 2016-08-30 23:20:15 +02:00
Lorin Werthen
564d71285e degeneralize box 2016-08-30 22:48:58 +02:00
lorin
5f65118621 Merge pull request #44 from ZeusWPI/events
first iteration event preview
2016-08-30 22:26:44 +02:00
Felix Van der Jeugt
af3e893821 prettier index 2016-08-30 22:07:46 +02:00
Lorin Werthen
62115f72ec simplify stuff 2016-08-30 21:45:27 +02:00
David Vandorpe
9f553db2c6 Border radius on absolute controls 2016-08-30 18:30:19 +02:00
David Vandorpe
25faaaf01a Coffeescript for absolute controls 2016-08-30 18:28:14 +02:00
David Vandorpe
58a85c72b0 Three fixed buttons 2016-08-30 18:17:39 +02:00
David Vandorpe
8d5e5d79f9 Cammie arrows 2016-08-29 15:49:27 +02:00
David Vandorpe
6408c84f69 Fix cammie feed 2016-08-29 15:37:50 +02:00
David Vandorpe
dfdf87d2ac Put cammie controls in separate div 2016-08-29 15:10:08 +02:00
David Vandorpe
57873aeafb Fix up button 2016-08-29 15:03:14 +02:00
David Vandorpe
80f1602a14 Cammie controls 2016-08-29 00:43:21 +02:00
David Vandorpe
a2c7746161 Only show cammie controls when moving mouse 2016-08-29 00:13:58 +02:00
David Vandorpe
38f735e7af Reworked cammie grid 2016-08-29 00:13:02 +02:00
Lorin Werthen
aa20bbf8d6 styling and markup 2016-08-27 20:15:00 +02:00
Lorin Werthen
d3a569588d Merge branch 'master' of github.com:ZeusWPI/zeus.ugent.be 2016-08-27 19:07:10 +02:00
Lorin Werthen
35aeaaabba add github link, fixes #17 2016-08-27 19:07:03 +02:00
myncke
875d2c6321 spaces 2016-08-27 04:31:55 +02:00
myncke
5fb12c99fc potentiele oplossing grouped events 2016-08-27 04:26:18 +02:00
myncke
7d74313176 partial event preview 2016-08-27 03:50:40 +02:00
Lorin Werthen
61ea230e83 improvements to tiles 2016-08-27 02:16:35 +02:00
myncke
cdb214cc23 unsure about divider 2016-08-27 01:23:22 +02:00
lorin
5142808069 Merge pull request #41 from ZeusWPI/404
404
2016-08-27 00:40:44 +02:00
myncke
8b56070d1f httpS 2016-08-27 00:38:12 +02:00
myncke
5249c1d5fa first iteration event preview 2016-08-27 00:36:10 +02:00
Lorin Werthen
57733198e3 eventstuff 2016-08-26 23:21:58 +02:00
Lorin Werthen
ec990ac755
events a bit more 2016-08-24 01:01:17 +02:00
myncke
e1499eb074 bulma supports text-center 2016-08-23 22:12:51 +02:00
myncke
f66e534cde basic 404 2016-08-23 22:04:58 +02:00
myncke
e6d2e6d209 basic 404 2016-08-23 22:04:48 +02:00
Lorin Werthen
bc5da5b81e
loadsa werk 2016-08-23 20:21:02 +02:00
Lorin Werthen
55c9184d35
post command, cammie 2016-08-14 10:12:19 +02:00
Lorin Werthen
7fc1bf0049
cleaning up sorta 2016-08-04 20:57:25 +02:00
Lorin Werthen
6e945579e9
mailto icons, fixes #35 2016-08-04 19:17:45 +02:00
Lorin Werthen
de36420195
helpers 2016-08-04 19:06:36 +02:00
Lorin Werthen
235c30cf2f
prettier bestuur' 2016-08-04 00:35:49 +02:00
Lorin Werthen
ca36e9b3ff
small edit 2016-08-02 20:40:08 +02:00
Lorin Werthen
3b9f63b3f0
add data helper 2016-08-02 20:20:22 +02:00
Lorin Werthen
b493627d6a
remove old 2016-08-02 20:05:50 +02:00
Lorin Werthen
74bfb6611a
merge 2016-08-02 20:02:31 +02:00
Lorin Werthen
3f8eb79ab4
fix 2016-08-02 20:00:52 +02:00
Lorin Werthen
c6992b8b7c
various stuff 2016-08-02 19:54:18 +02:00
Lorin Werthen
295fedae80
make archive pages pretty 2016-08-02 18:31:40 +02:00
Laurens D'hooge
afc8126c71 markdown corrected 2016-08-01 22:21:13 +02:00
Laurens D'hooge
62dc31d388 merge conflict archives.erb fixed 2016-08-01 21:49:39 +02:00
Laurens D'hooge
b2e9ecb5d6 issue 27 styling resolved 2016-08-01 21:37:26 +02:00
Lorin Werthen
84181be5e8
navigation 2016-07-31 19:28:23 +02:00
Lorin Werthen
3e4f3932cd
gotta keep shit up to date 2016-07-31 17:38:04 +02:00
Lorin Werthen
3f5b6dc670
pushing on master 2016-07-28 17:56:33 +02:00
Wout Schellaert
52685c92cc Remove circle from favicon, fixes #21 2016-07-28 17:54:00 +02:00
Lorin Werthen
a50665d09f
let's try bulma, it's neat 2016-07-27 20:27:28 +02:00
Lorin Werthen
35e493f187
color 2016-07-27 18:13:52 +02:00
Lorin Werthen
8448436a46
add ical support' 2016-07-27 00:13:36 +02:00
Lorin Werthen
73f6279f2f
prototypal project cards 2016-07-26 22:48:59 +02:00
Lorin Werthen
92828d9199
add atom feed 2016-07-26 20:08:42 +02:00
Lorin Werthen
0a64d063b8
musta been drunk when i did this 2016-07-24 13:09:37 +02:00
Lorin Werthen
c9669805ee
pls dont fail 2016-07-24 00:02:19 +02:00
Lorin Werthen
847a4fed43
add simple about page 2016-07-23 23:05:52 +02:00
Lorin Werthen
14ffd7a1ff
mucho worko 2016-07-23 21:17:24 +02:00
Lorin Werthen
d4883824c7
layouting 2016-07-20 21:56:45 +02:00
Lorin Werthen
af48e56698
checks 2016-07-20 19:50:54 +02:00
Lorin Werthen
13733d4088
search page 2016-07-20 18:23:38 +02:00
Lorin Werthen
bce47ca93b
start work on tipue search 2016-07-20 14:38:50 +02:00
Lorin Werthen
f5bd39b72f facebook tag things 2016-07-19 14:14:09 +02:00
Lorin Werthen
5fd40f2944 meta tag work 2016-07-19 13:55:27 +02:00
Lorin Werthen
0e7d9658ab on mouseout ctrl 2016-07-19 11:32:26 +02:00
Lorin Werthen
53ae62440f fix cammie controls and integrity of html 2016-07-19 11:31:12 +02:00
Lorin Werthen
40705033f2 various stuff, including small caps 2016-07-19 08:39:52 +02:00
Lorin Werthen
f8a7fec779 organization 2016-07-18 23:34:38 +02:00
Lorin Werthen
094b7bd365 navbar partial 2016-07-18 16:34:29 +02:00
Lorin Werthen
8180888cfc tile partial 2016-07-18 16:31:45 +02:00
Lorin Werthen
430579f988 fix some remarks 2016-07-18 15:08:41 +02:00
Lorin Werthen
8c37308a4d this is exactly why we need testing/checks 2016-07-18 13:46:16 +02:00
Lorin Werthen
2cc6aa657e less mockup, more real deal 2016-07-18 12:33:35 +02:00
Lorin Werthen
fbb91c3a82 fancy fades! \o/ 2016-07-18 12:07:15 +02:00
Lorin Werthen
c7dfc46229 article list work 2016-07-18 11:52:46 +02:00
Lorin Werthen
472fd2db51 pointer 2016-07-18 11:15:03 +02:00
Lorin Werthen
c45d27020e opengraph 2016-07-18 11:06:45 +02:00
Lorin Werthen
bc3cd8e40e add cammie link 2016-07-18 09:34:01 +02:00
Lorin Werthen
f534646149 add simple cammie page 2016-07-18 09:24:24 +02:00
Lorin Werthen
7dfc506a87 more work on event posts 2016-07-12 23:58:08 +02:00
Lorin Werthen
8b0b211cb0 start eventposts 2016-07-12 23:14:12 +02:00
Lorin Werthen
a1768cc6a4 also color 2016-07-06 11:12:40 +02:00
Lorin Werthen
2e9f1903ad anchor text-decoration 2016-07-06 11:11:39 +02:00
Lorin Werthen
eef138d991 forgot we were using an erb file 2016-07-06 00:20:09 +02:00
Lorin Werthen
a578cc9954 fix #8 2016-07-05 23:57:18 +02:00
Lorin Werthen
2e18e46df0 hover! 2016-07-05 22:38:59 +02:00
Lorin Werthen
ad7cd5eea9 srs bsns 2016-07-05 22:13:14 +02:00
Lorin Werthen
25ec57824f no cors spoofing 2016-06-29 21:39:51 +02:00
Lorin Werthen
476889759d scss and talk to gamification api 2016-06-29 21:38:57 +02:00
Lorin Werthen
338efd67ff style i guess 2016-06-18 01:43:41 +02:00
Wout Schellaert
96d3463ab1 Add fancy favicon 2016-06-16 17:43:40 +02:00
Lorin Werthen
d77f82f5e5 jquery 3 just got released 2016-06-10 12:22:59 +02:00
Lorin Werthen
17aa35c4b1 relative paths 2016-06-09 20:19:02 +02:00
Lorin Werthen
07b82e1cbc https 2016-06-09 20:14:18 +02:00
Lorin Werthen
4beb5f6347 coffeescript + little bit more design 2016-06-09 17:57:40 +02:00
Lorin Werthen
9339cf5a75 index stuff 2016-06-09 16:08:43 +02:00
Lorin Werthen
27b53da67b get rid of default stuff 2016-06-09 15:34:03 +02:00
Lorin Werthen
4900409117 let's go, new site 2016-06-09 14:27:23 +02:00