Commit Graph

95 Commits

Author SHA1 Message Date
Kyle Fiedler
eb71eaa1d8 Changed around most of the marketing styles and updated the content 2012-01-19 15:40:06 -05:00
Piotr Mitros
2d08b32140 Course info 2012-01-17 21:28:55 -05:00
Ernie Park
972001d3e9 merge 2012-01-16 16:25:05 -05:00
Ernie Park
fb9d4fe2a8 merge changes 2012-01-16 16:24:48 -05:00
Piotr Mitros
c05ecb4747 merge 2012-01-14 00:09:53 -05:00
Piotr Mitros
1bd924bef1 Sequence steps logged 2012-01-14 00:09:31 -05:00
pmitros
ea603775ca Making 6.002 page main, moving static pages into static page framework
--HG--
rename : courseinfo.html => index.html
rename : index.html => mitx_global.html
2012-01-13 16:57:02 -08:00
Ernie Park
089b51589a move html5 iframe stylings to sass file 2012-01-13 13:35:38 -05:00
Kyle Fiedler
83c8fb8422 Styled log in popover 2012-01-12 17:18:58 -05:00
Kyle Fiedler
dab31a37be merged design branch 2012-01-12 17:04:50 -05:00
Kyle Fiedler
3fdfe3a39d removed all my old sass cache files
--HG--
branch : kf-homepage
2012-01-12 17:03:39 -05:00
Kyle Fiedler
f0511986b0 Added more style for the marketing pages
--HG--
branch : kf-homepage
2012-01-12 17:03:00 -05:00
Ernie Park
0ce7d742a2 add .scssc to hgignore 2012-01-12 10:38:39 -05:00
Ernie Park
5e9c29654e merging html5 video stuff in 2012-01-12 10:03:20 -05:00
Ernie Park
a1cb0b0a4e enable HTML5 fallback for non-flash enabled browsers and fix transparency issue in flash 2012-01-11 16:05:03 -05:00
Bridger Maxwell
f5bcc41bfd Changed names to match url pattern in urls.py
--HG--
branch : kf-homepage
2012-01-11 15:51:51 -05:00
Kyle Fiedler
2f246156b1 started reworking homepage
--HG--
branch : kf-homepage
2012-01-11 15:47:15 -05:00
Kyle Fiedler
6244031ce4 close wiki design branch
--HG--
branch : kf-wiki
extra : close : 1
2012-01-11 12:20:36 -05:00
Kyle Fiedler
333d76e997 merged in wiki design changes 2012-01-11 12:18:38 -05:00
Kyle Fiedler
d5de197d5f merged in default
--HG--
branch : kf-wiki
2012-01-11 12:12:53 -05:00
Kyle Fiedler
741d174189 Added structure and style for most of the wiki
--HG--
branch : kf-wiki
2012-01-11 11:33:18 -05:00
Piotr Mitros
c99d1035d0 Saving schematics works 2012-01-10 22:42:14 -05:00
Piotr Mitros
fc81719a87 Refactor for new capa question/answer framework 2012-01-10 21:48:42 -05:00
Bridger Maxwell
680e3da1dc Getting simplewiki search to work. 2012-01-10 14:13:06 -05:00
Kyle Fiedler
61a713f2c2 Changed some style for the courseware, fixed the footer links and fixed the modal window 2012-01-09 16:56:22 -05:00
Kyle Fiedler
8b29b15351 Merged courseware branch 2012-01-09 15:14:01 -05:00
Kyle Fiedler
76b4f6467a Added more style for problems and acordion
--HG--
branch : kf-courseware
2012-01-09 14:48:55 -05:00
Kyle Fiedler
1fc4ab7d08 Merged in default
--HG--
branch : kf-courseware
2012-01-09 11:54:13 -05:00
Kyle Fiedler
fceb44ea80 Fix spelling on readme and edit some css
--HG--
branch : kf-courseware
2012-01-09 11:50:52 -05:00
Bridger Maxwell
c217432ab3 Changed simplewiki templates to inherit from main.html and have standard navigation, footer, etc. 2012-01-09 11:44:15 -05:00
Bridger Maxwell
2202ec0931 Merged Mako simplewiki templates 2012-01-09 10:02:24 -05:00
Bridger Maxwell
67fc2586e5 Fixed bugs in templates. Now working as they were originally, but with Mako. 2012-01-08 04:53:22 -05:00
Bridger Maxwell
4ca87c445b Converting SimpleWiki pages to Mako templates. Moving them to templates. Some bugs remain. 2012-01-08 02:20:48 -05:00
Kyle Fiedler
784071573f merged kf-refactor into default 2012-01-06 16:37:46 -05:00
Kyle Fiedler
512381bdd1 Fixed merge confilcts, hopefully
--HG--
branch : kf-refactor
2012-01-06 16:32:51 -05:00
Kyle Fiedler
63ad756a2d Added style for video and sequence
--HG--
branch : kf-refactor
2012-01-06 15:38:21 -05:00
Kyle Fiedler
170f81a487 More style for the textbook page and various style fixes
--HG--
branch : kf-refactor
2012-01-06 13:19:57 -05:00
Piotr Mitros
a0abfe178d Feedback text a bit better. Window clears when submitted 2012-01-06 09:53:33 -05:00
Piotr Mitros
4c7da227a3 Feedback button works 2012-01-05 22:09:51 -05:00
Kyle Fiedler
b98d833762 Added some slight style and new typeface
--HG--
branch : kf-refactor
2012-01-05 21:39:55 -05:00
Kyle Fiedler
47bc1b8a68 Added more to the sass readme
--HG--
branch : kf-refactor
2012-01-05 20:40:27 -05:00
Piotr Mitros
3c95aabbd7 Feedback e-mail template 2012-01-05 20:29:07 -05:00
Piotr Mitros
af7167dbbe Working calculator 2012-01-05 20:28:14 -05:00
Kyle Fiedler
88a3a69c71 added a bunch more overall style
--HG--
branch : kf-refactor
2012-01-05 20:27:07 -05:00
Piotr Mitros
f25219cb74 Login page has 'Remember Me' 2012-01-05 14:28:54 -05:00
Kyle Fiedler
ba557aefae Added layout for courseware, textbooks and profile
--HG--
branch : kf-refactor
2012-01-05 12:17:22 -05:00
Piotr Mitros
e5a2c72123 Wiki now supports circuits, modulo bugs 2012-01-04 19:01:56 -05:00
Kyle Fiedler
2ffe64dc3c Added sass files and readme for generation
--HG--
branch : kf-refactor
2012-01-04 14:36:10 -05:00
Kyle Fiedler
340f4ffca4 Cleaned markup up more
--HG--
branch : kf-refactor
2012-01-04 11:14:37 -05:00
Kyle Fiedler
57a3005f71 Refactored html for navigation
--HG--
branch : kf-refactor
2012-01-03 17:01:48 -05:00