John Jarvis 78987cc400 resolving merge conflicts

2013-03-19 16:16:32 -04:00

..

_activation_messages.scss

renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling

2012-07-16 22:23:43 -04:00

_course_filter.scss

renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling

2012-07-16 22:23:43 -04:00

_course_object.scss

Fix course short description display (now that they're xmodules)

2013-02-13 16:17:12 -05:00

_footer.scss

edx.org redesign - revised temporary login/register views to fit with design requirements/fixes from marketing team's overall design changes to site's visual theme

2013-03-12 15:04:00 -04:00

_forms.scss

pearson registration - revised contact calls to action and order in status section, edited flash message copy/styling, added in strawman state for disabled form/closed registration state of form, added in strawman state for demographics rejected flash message, revised accomodations text labe and isntructions

2013-01-14 17:31:05 -05:00

_header.scss

edx.org redesign - revised temporary login/register views to fit with design requirements/fixes from marketing team's overall design changes to site's visual theme

2013-03-12 15:04:00 -04:00

_modal.scss

First pass at implementing problem history.

2013-02-15 01:30:14 -05:00

_tooltips.scss

Added tooltip styles, made all buttons the same, and other small changes throughout the courseware

2012-08-13 15:05:43 -04:00