Greg Price a0fb4d6c85 Merge branch 'master' into drupal-new ...

Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html

2013-05-10 10:30:10 -04:00

..

_animations.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

_base.scss

Merge branch 'master' into drupal-new

2013-05-10 10:30:10 -04:00

_extends.scss

added truncation for super long titles

2012-08-10 11:48:07 -04:00

_font_face.scss

Changed around the css

2012-07-23 12:38:21 -04:00

_mixins.scss

LMS - adding back in a Sass mixin that seems to still have dependencies

2013-02-21 09:16:06 -05:00

_reset.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

_variables.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