Brian Talbot 8ec4c09615 local merge conflict resolution

2013-02-13 13:41:35 -05:00

..

client_templates

studio - nav and soft landing various QA fixes

2013-02-12 17:03:48 -05:00

coffee

Add vendor files to files.json for the cms jasmine tests to work.

2013-01-31 13:48:38 -05:00

css

studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon

2013-01-22 23:32:51 -05:00

img

studio - soft landing: added in edX Studio logo

2013-02-05 14:14:14 -05:00

js

studio: nav - clicking anywhere but nav's dropdowns will close them, fixed link outline and is-selected styling

2013-02-13 12:03:30 -05:00

sass

local merge conflict resolution

2013-02-13 13:41:35 -05:00