Max Rothman c97314413b Merge branch 'release' into release-merge-test ...

Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py

2015-07-17 17:42:03 -04:00

..

_about_pages.scss

SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions.

2015-01-05 17:30:13 -05:00

_account.scss

Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155

2015-06-26 13:23:59 -07:00

_course_about.scss

New pre-requisite course feature via milestones app

2015-01-15 15:17:38 -05:00

_courses.scss

fixup! removed css comments from _courses.scss, fixed rebase issue which resulted in having only 1 course on tablet (medium) size layouts

2015-07-01 13:46:56 +02:00

_dashboard.scss

Merge branch 'release' into release-merge-test

2015-07-17 17:42:03 -04:00

_edge.scss

Move edx branding into edx-theme directory

2015-01-09 10:48:20 -05:00

_error-pages.scss

SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions.

2015-01-05 17:30:13 -05:00

_help.scss

SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions.

2015-01-05 17:30:13 -05:00

_home.scss

search input element styling improvements, test clean up

2015-07-01 13:46:55 +02:00

_jobs.scss

SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions.

2015-01-05 17:30:13 -05:00

_media-kit.scss

SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions.

2015-01-05 17:30:13 -05:00

_press_release.scss

SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions.

2015-01-05 17:30:13 -05:00

_survey-page.scss

Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course

2014-10-30 13:11:02 -04:00