Commit Graph

254 Commits

Author SHA1 Message Date
Kyle Fiedler
d2b8a2c8ad New sass generated css 2012-03-14 17:42:39 -04:00
Reda Lemeden
ec4c1786cf Fixed askbot layout bug 2012-03-12 17:33:51 -04:00
Ernie Park
4f4f3a75b5 merge 2012-03-11 17:45:56 -04:00
Piotr Mitros
547bf5d52e Added book viewer 2012-03-10 17:10:49 -05:00
Kyle Fiedler
96fedc0cb6 Added image for sliders and styles for sliders 2012-03-08 16:04:14 -05:00
Ernie Park
e8656c2d9e merge 2012-03-08 14:49:40 -05:00
Ernie Park
513d811aec remove console.log lines 2012-03-08 14:49:28 -05:00
Kyle Fiedler
d9479bd33d Added images for real this time and fixed merge conflicts 2012-03-08 14:36:32 -05:00
Kyle Fiedler
16fdcd5700 Added images and css for social links in footer 2012-03-08 14:35:25 -05:00
Piotr Mitros
c991190c02 Merge 2012-03-07 15:30:48 -05:00
Piotr Mitros
5db419d211 Used cookies to store speed
--HG--
branch : ernie-static-video-fixes
2012-03-07 15:27:47 -05:00
Ernie Park
90a70e661f include kyles changes to bold the video speed
--HG--
branch : ernie-static-video-fixes
2012-03-07 14:52:01 -05:00
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
174f50c575 Small visual adjustment for official badges 2012-03-06 17:15:59 -05:00
Reda Lemeden
5baddf5366 Made the official comment style apply to question comments as well 2012-03-06 16:21:26 -05:00
Reda Lemeden
dfc96ba273 Merge and resolve conflict 2012-03-06 16:07:10 -05:00
Reda Lemeden
97b2a05f1b Added official badge styling for Askbot 2012-03-06 16:01:15 -05:00
Kyle Fiedler
6926bb9309 Merged heads and resolved conflict 2012-03-06 14:44:19 -05:00
Kyle Fiedler
2081680588 Added styles for the admin code in courseware 2012-03-06 14:42:56 -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