Commit Graph

182 Commits

Author SHA1 Message Date
Piotr Mitros
d85e36cd87 Merge 2012-01-28 13:30:43 -05:00
Piotr Mitros
81d7be7e45 Schematic wiki bug fixed 2012-01-28 13:29:49 -05:00
Piotr Mitros
849c5d928c Slightly better docs 2012-01-27 23:13:15 -05:00
Piotr Mitros
80e2421ee6 Password reset hardcoded to right domain. We should fix later 2012-01-27 22:35:10 -05:00
Bridger Maxwell
9cd32615e0 Added 'view revision' on wiki history 2012-01-27 17:24:19 -05:00
Kyle Fiedler
a58d36bff9 Fixed conflicts 2012-01-27 16:12:11 -05:00
Kyle Fiedler
ccafe302be refactor some of the index html 2012-01-27 16:08:03 -05:00
Kyle Fiedler
0dc1465248 Change fonts to link to our server 2012-01-27 16:05:17 -05:00
Ernie Park
92e5cff869 clean up video files, use native controls and have HTML5 fallback 2012-01-27 14:40:16 -05:00
Kyle Fiedler
e0299cd6de Styled textbook navigation 2012-01-27 14:04:18 -05:00
Kyle Fiedler
f7ca1a5b21 Added new video icon 2012-01-27 12:04:31 -05:00
Reda Lemeden
f0a4ae55c5 Merge with head 2012-01-27 10:22:29 -05:00
Reda Lemeden
b8bc5201ac new question list layout 2012-01-27 10:21:53 -05:00
Kyle Fiedler
1a04693e63 Added wiki basic html and search styles 2012-01-26 21:51:18 -05:00
Kyle Fiedler
0708f8d03f Merge conflicts 2012-01-26 18:00:28 -05:00
Kyle Fiedler
8b2109ab46 Merge in video layout 2012-01-26 17:55:02 -05:00
Kyle Fiedler
e59f3ed206 More styles for sequence
--HG--
branch : kf-video-layout
2012-01-26 17:52:13 -05:00
Kyle Fiedler
7e86b8384b Added more sequence styles
--HG--
branch : kf-video-layout
2012-01-26 17:33:20 -05:00
Kyle Fiedler
f2a748e4a6 Added some style for video sequence made topbar extend better
--HG--
branch : kf-video-layout
2012-01-26 14:54:00 -05:00
Piotr Mitros
13482e2f91 Merge 2012-01-26 14:29:14 -05:00
Piotr Mitros
a6ca113a37 Fixed bad link on help.html 2012-01-26 14:28:57 -05:00
Kyle Fiedler
7cfc50fae8 Video scss refactor
--HG--
branch : kf-video-layout
2012-01-26 14:16:51 -05:00
Kyle Fiedler
57d129a3cf Start to fix video layout
--HG--
branch : kf-video-layout
2012-01-26 14:16:27 -05:00
Ernie Park
7c12d9c2be merge 2012-01-26 13:19:35 -05:00
Ernie Park
2ba88b53c7 update marketing template blocks, smarter and takes in just a class for header, fixes bug with no picture for mitx_global page 2012-01-26 13:19:22 -05:00
Kyle Fiedler
5188826e1a fix more minor things with the layout 2012-01-26 12:59:26 -05:00
Bridger Maxwell
dd6c6e540f Added styling for alternating wiki history rows. 2012-01-26 12:51:49 -05:00
Ernie Park
042e1fdf8c remove fancybox references for css/js 2012-01-26 11:27:42 -05:00
Reda Lemeden
5d257f7d03 Merge with Head 2012-01-26 09:37:31 -05:00
Reda Lemeden
41e1415aa9 New question list stylesheet 2012-01-26 09:36:38 -05:00
Ernie Park
a02f9c65b5 remove _fancybox.scss, no longer needed 2012-01-26 00:17:00 -05:00
Ernie Park
53b121d9c9 use © rather than (c) 2012-01-25 23:27:52 -05:00
Ernie Park
242b201047 merge heads 2012-01-25 23:13:24 -05:00
Ernie Park
20f605ebc5 move duplicate code in static marketing sites to marketing.html block templates 2012-01-25 23:13:10 -05:00
Bridger Maxwell
b5167fe816 Added instructions to wiki edit and create pages. 2012-01-25 20:22:54 -05:00
Bridger Maxwell
c17ca29a29 Added editing instructions on the wiki edit page. 2012-01-25 19:26:54 -05:00
Reda Lemeden
9c1dc60b77 Merge 2012-01-25 15:10:40 -05:00
Reda Lemeden
33b5c87126 Styled the tabula rasa buttons 2012-01-25 15:09:45 -05:00
Kyle Fiedler
cc64762653 Clean up on marketing styles 2012-01-25 15:00:58 -05:00
Kyle Fiedler
b2e1ba7474 Manualy switch over some styles from Fancybox to leanbox 2012-01-25 14:43:49 -05:00
Ernie Park
e025165010 merge 2012-01-25 14:20:06 -05:00
Kyle Fiedler
b5e40a695e Merge 2012-01-25 14:19:13 -05:00
Kyle Fiedler
94f0b58bc7 started fixing layout problems 2012-01-25 14:15:53 -05:00
Reda Lemeden
589aa6bafc Merge with head 2012-01-25 14:13:12 -05:00
Reda Lemeden
bd2e82c28b Styled the question order sort 2012-01-25 14:09:38 -05:00
Ernie Park
7adda62fc7 fix merge 2012-01-25 13:45:28 -05:00
Ernie Park
5eab8ba70b switch from fancybox to leanmodal and update .hgignore 2012-01-25 13:43:09 -05:00
Kyle Fiedler
c1543c7f49 Added new styles for errors 2012-01-25 12:39:24 -05:00
Reda Lemeden
55deb0d4a2 Fixed the sidebar layout issue in the discussion page 2012-01-25 12:32:09 -05:00
Kyle Fiedler
ff1ee559c4 Merge 2012-01-25 12:30:35 -05:00