Commit Graph

103 Commits

Author SHA1 Message Date
Kyle Fiedler
020fa98784 New video image and css 2012-02-02 12:17:23 -05:00
Kyle Fiedler
b8210482e8 merge 2012-02-01 16:52:30 -05:00
Kyle Fiedler
70220f49bb Added icons and new css 2012-02-01 16:52:16 -05:00
Ernie Park
fe3a6bd7bc add leanmodal minified and original 2012-02-01 13:25:07 -05:00
Ernie Park
b985ef1710 resolve merge 2012-02-01 12:05:38 -05:00
Ernie Park
cc0418ca73 updated sass 2012-02-01 12:03:22 -05:00
Piotr Mitros
d0d858c967 Subs moved to data 2012-01-31 18:22:20 -05:00
fischerl
cdcd8dec03 merge 2012-01-31 16:55:57 -05:00
fischerl
91b3422f04 more subs 2012-01-31 16:55:37 -05:00
Reda Lemeden
c70e705009 Merged main css conflict 2012-01-31 16:17:42 -05:00
Reda Lemeden
e3d74b0ce1 Removed old application.css 2012-01-31 16:06:33 -05:00
Reda Lemeden
aa6170c720 Added Askbot images folder 2012-01-31 16:04:37 -05:00
Reda Lemeden
d42e393036 Merge with default 2012-01-31 16:01:40 -05:00
Reda Lemeden
0edb12e441 Voting widget skinned 2012-01-31 16:00:25 -05:00
Kyle Fiedler
5f7cc6ff83 Merge 2012-01-31 15:29:51 -05:00
Kyle Fiedler
db45a46398 Added compiled css 2012-01-31 15:22:16 -05:00
fischerl
201d494510 added more subs 2012-01-31 11:13:03 -05:00
cjt
b5c05c5c2e get images in the right place 2012-01-31 10:56:38 -05:00
Piotr Mitros
452333c743 Merge 2012-01-30 16:53:42 -05:00
Piotr Mitros
0645756bc7 favicon.ico 2012-01-30 16:53:12 -05:00
Kyle Fiedler
515dd66b67 merge 2012-01-30 15:52:22 -05:00
Kyle Fiedler
98f2c69193 Added images for video player and compiled css 2012-01-30 15:52:03 -05:00
fischerl
754fce5740 merge 2012-01-30 14:19:28 -05:00
fischerl
ebdd67edc1 added lecture 2 subs 2012-01-30 14:16:42 -05:00
Kyle Fiedler
78a2b2239e Compliled sass 2012-01-30 12:09:59 -05:00
Kyle Fiedler
3fa9b89833 Merge 2012-01-30 11:52:18 -05:00
Kyle Fiedler
33060c358a Added new treeview image 2012-01-30 11:51:55 -05:00
cjt
c81bf892bf images for Lab 1 2012-01-30 09:56:47 -05:00
cjt
365e9a49c3 move lab images into data/images 2012-01-30 09:50:53 -05:00
Kyle Fiedler
0510e96a2e merge 2012-01-27 16:09:07 -05:00
Kyle Fiedler
2676c55ea7 added new index shot, fonts and generated css 2012-01-27 16:08:46 -05:00
cjt
cc40a3c049 updated schematic tool files 2012-01-27 12:47:06 -05:00
Kyle Fiedler
7362253824 New video icon 2012-01-27 12:08:58 -05:00
Kyle Fiedler
74d228a9b2 Compiled css 2012-01-26 21:52:39 -05:00
Kyle Fiedler
d2595b91a3 merge 2012-01-26 20:30:14 -05:00
Kyle Fiedler
e76d7ad3b3 icons 2012-01-26 20:28:25 -05:00
Kyle Fiedler
32f5f10b7a Added ingnore file 2012-01-26 18:12:14 -05:00
Kyle Fiedler
a78df52d74 Compiled sass and new images 2012-01-26 18:02:55 -05:00
Ernie Park
6464895847 remove nbsp from empty subtitle li's so it pushes up to the top 2012-01-26 16:25:53 -05:00
Piotr Mitros
475f30a206 Symlinks needed for Askbot 2012-01-26 14:41:42 -05:00
Ernie Park
d440da8f69 merge 2012-01-26 13:04:49 -05:00
Ernie Park
3bb18ec02d compiled sass 2012-01-26 13:04:30 -05:00
Bridger Maxwell
b653c4f2a5 Added styling for alternating wiki history rows. 2012-01-26 12:52:02 -05:00
Bridger Maxwell
75f6002fac Added instructions to wiki edit and create pages. 2012-01-25 20:23:14 -05:00
Bridger Maxwell
f582e49aaf Merged in the extra head. Replaced files with newly generated ones. 2012-01-25 19:31:00 -05:00
Bridger Maxwell
c68f6fc7df Merge 2012-01-25 19:28:44 -05:00
Bridger Maxwell
2c533bddbf Added editing instructions on the wiki edit page. 2012-01-25 19:27:14 -05:00
Kyle Fiedler
c9ae9f27d6 Sass compile 2012-01-25 14:44:18 -05:00
Ernie Park
1114057818 fix merge issues in css, fancybox vs leanmodal 2012-01-25 14:10:03 -05:00
Ernie Park
e3885b0f29 updated css files for leanmodal AFTER pulling and updating template scss from remote 2012-01-25 13:51:41 -05:00