Adam Palay 67890b3c66 resolve merge conflict with hotfix branch

2013-09-03 16:00:24 -04:00

..

annotatable

Added TODO and explanation for the top-level scss variables.

2013-03-18 15:43:43 -04:00

capa

Merge pull request #504 from edx/feature/vik/oe-ui

2013-08-22 12:23:29 -07:00

codemirror

final changes to codemirror styling, and clean up style for settings button clearing

2013-05-15 12:05:43 -04:00

combinedopenended

minor cleanup of pull request comments within scss files, along with removal of some whitespace in text fixture file for rubrics

2013-08-20 01:33:06 -04:00

crowdsource_hinter

Fixed a rebase error in responsetypes.

2013-08-26 09:40:05 -04:00

editor

cleaned up latex styling, polyfill function wrapper, draft number template update for polyfill

2013-05-16 09:50:16 -04:00

foldit

Included styling and template

2013-02-25 18:18:46 -05:00

gst

gst integration into studio

2013-07-26 17:22:27 +03:00

html

xmodule scss - resolved some general span styling that would override basic em or strong type styling

2013-02-19 09:59:36 -05:00

poll

Fixed bug where in firefox a marked poll button was not highlighted in blue.

2013-03-19 19:29:09 +02:00

problem

updated sass transitions to use newer bourbon syntax

2013-07-10 09:18:00 -04:00

sequence

fixes back nav button

2013-07-25 15:32:43 -04:00

tabs

Add TabsEditingDescriptor for VideoAlpha

2013-08-05 13:38:32 +03:00

video

Fix multiple video bug

2013-09-03 18:49:46 +03:00

word_cloud

word cloud: return percents

2013-05-13 14:44:08 +03:00

wrapper

poll and conditional finished

2013-02-15 18:48:39 +02:00