Commit Graph

236 Commits

Author SHA1 Message Date
Ernie Park
40e52cb96e update video player to accommodate remembering video speeds when switching in sequences and fix bug where play button gets out of sync when switching speeds
--HG--
branch : ernie-static-video-fixes
2012-03-07 02:25:33 -05:00
Reda Lemeden
d4b17006bd Resolve merge conflicts 2012-03-05 17:47:37 -05:00
Reda Lemeden
621943adef Restyled badges view and fixed Firefox button spacing issue in the askbot comments form 2012-03-05 17:45:41 -05:00
Kyle Fiedler
7284d43ef6 Made the time look more friendly 2012-03-05 17:27:19 -05:00
Kyle Fiedler
a6ef534adb Merged with head 2012-03-05 17:00:25 -05:00
Kyle Fiedler
6291748bd3 Added red social icons to give them some more promenance 2012-03-05 16:59:03 -05:00
Ernie Park
09a1771bc0 merge 2012-03-05 15:44:58 -05:00
Ernie Park
b660bab05e dont autoplay video on ios devices 2012-03-05 15:43:00 -05:00
Reda Lemeden
fe83eaef2f Styled wiki headers 2012-03-05 14:33:42 -05:00
Ernie Park
cf71d90d9b merge default into branch
--HG--
branch : ernie-static-fix-ios-video
2012-03-05 12:09:18 -05:00
Reda Lemeden
ece5dde5b5 merge 2012-03-05 11:59:55 -05:00
Reda Lemeden
e5772237d2 Fixed question and answer styles 2012-03-05 11:59:31 -05:00
Reda Lemeden
a60cdf5d77 Removed letter-spacing from question titles 2012-03-05 11:12:42 -05:00
Piotr Mitros
6b35212615 Askbot jquery 2012-03-04 10:44:07 -05:00
Jean-Michel Claus
407788f8ad Merge 2012-03-02 12:31:12 -05:00
Jean-Michel Claus
42ac1d0e12 Added missing file ocw-hw1.pdf 2012-03-02 12:06:27 -05:00
Ernie Park
0da6c6d6f9 regenerate marketing.css, there was a merge conflict that wasnt resolved previously 2012-03-02 11:13:52 -05:00
Piotr Mitros
d456e6ec69 Symlink for html5 shiv as a short-term pre-ship workaround for a 404 2012-03-01 19:09:07 -05:00
Reda Lemeden
6b5b3d5d7b Merge 2012-03-01 16:23:22 -05:00
Reda Lemeden
d57c80b595 Wiki and Askbot bug fixes 2012-03-01 16:21:40 -05:00
Ernie Park
4661404cc8 merge
--HG--
branch : ernie-static-fix-ios-video
2012-03-01 15:43:53 -05:00
Ernie Park
6b0655be55 prevent autoplay on iOS devices (which doesnt work anyway). fixes videos so user can click play and it'll play
--HG--
branch : ernie-static-fix-ios-video
2012-03-01 15:43:29 -05:00
Kyle Fiedler
53c8c35bba Added styles for new ie warning 2012-03-01 15:31:23 -05:00
Kyle Fiedler
c1c4eabf27 Added fix for tootip styles and fixed top bar issues 2012-03-01 13:40:30 -05:00
Reda Lemeden
5942c13b39 Added Wiki navigation icons 2012-02-28 17:32:56 -05:00
Reda Lemeden
bb84687817 Resolved application.css 2012-02-28 10:44:52 -05:00
Reda Lemeden
de6ce64bc3 Merge 2012-02-28 10:43:22 -05:00
Reda Lemeden
c69cd51843 Added colored voting arrows 2012-02-28 10:39:57 -05:00
Kyle Fiedler
d2c1c7952d reverted speed dropdown 2012-02-28 09:45:58 -05:00
Piotr Mitros
026eb70981 Video player instrumented to see speeds 2012-02-27 18:22:00 -05:00
Reda Lemeden
60ac290b62 Minor Askbot bug fixes 2012-02-27 17:01:36 -05:00
Kyle Fiedler
010f817841 added styles for speeds in video player 2012-02-27 15:36:17 -05:00
Kyle Fiedler
565bf5a66c Added styles for minor fixes including course updates fix 2012-02-27 12:21:12 -05:00
Kyle Fiedler
84640da40c added slightly darker social icons an hover css 2012-02-22 16:29:16 -05:00
Kyle Fiedler
b12e4cf36d added new images and styles for social icons in the marketing footer 2012-02-22 16:21:59 -05:00
Kyle Fiedler
56755618d9 merged heads 2012-02-22 15:04:19 -05:00
Kyle Fiedler
97ac71c88c added closed caption image 2012-02-22 15:03:59 -05:00
Piotr Mitros
55c1a4352f Merge in data/static for jmc's stuff 2012-02-22 13:28:14 -05:00
Jean-Michel Claus
3015ed7a81 Removed files from old locations
--HG--
branch : jmclaus-sound-labs
2012-02-22 12:29:55 -05:00
Jean-Michel Claus
2df697a6bb Merge
--HG--
branch : jmclaus-sound-labs
2012-02-22 12:14:47 -05:00
Jean-Michel Claus
39fa4b738a added symlinks to audio labs
--HG--
branch : jmclaus-sound-labs
2012-02-22 11:14:44 -05:00
Kyle Fiedler
c4062f40b5 Added some new styles for amplifier 2012-02-22 10:48:47 -05:00
Kyle Fiedler
b81617e070 Added styles from the sidebar brnach 2012-02-21 17:14:37 -05:00
Kyle Fiedler
36005b0056 Added style for askbot-profile 2012-02-20 17:25:19 -05:00
Kyle Fiedler
e844a6f006 Added styles for the profile page in askbot 2012-02-20 15:25:34 -05:00
Kyle Fiedler
93c50f0aeb Added styles for the bottom navigation on the textbook: 2012-02-20 11:19:37 -05:00
Kyle Fiedler
48a3133714 merged heads 2012-02-20 10:44:07 -05:00
Kyle Fiedler
db9ca0772f Fix ie enrollment issues by hiding form 2012-02-20 10:43:46 -05:00
cjt
9025ea34c8 clean up old versions of schematic tool from static/js 2012-02-18 15:07:14 -05:00
Bridger Maxwell
6498c8862c Generated css 2012-02-17 00:46:30 -05:00