edx-platform

Files

cahrens 6629d5d3a3 Merge branch 'master' into talbs/studio-authorship

Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html

2013-07-22 12:15:42 -04:00

assets

Studio: abstracts and formalizes set animation/transition Sass variables

2013-07-10 09:17:59 -04:00

elements

Merge branch 'master' into talbs/studio-authorship

2013-07-22 12:15:42 -04:00

vendor

cleaned up some test styles for fontawesome deployment

2013-05-22 15:55:47 -04:00

views

Merge branch 'master' into talbs/studio-authorship

2013-07-22 12:15:42 -04:00

_base.scss

Merge branch 'master' into talbs/studio-authorship

2013-07-22 12:15:42 -04:00

_mixins.scss

2012-12-13 12:35:17 -05:00

_reset.scss

Changed @include box-shadow() to box-shadow

2013-07-10 09:17:58 -04:00

_shame.scss

Studio: overrides authorship ui toggling animation paramters

2013-07-10 15:15:59 -04:00

_variables.scss

Studio: refining timing variable comment in Sass

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

.gitignore

Don't ignore the old directories for xmodule sass and coffeescript

2013-04-29 07:32:16 -04:00

base-style.scss

initial html and sass for textbook upload

2013-07-09 19:15:59 -04:00

README.txt

Added new readme info and started to rework some of the css

2012-06-22 09:42:22 -04:00

README.txt

Sass Watch:

sass --watch cms/static/sass:cms/static/sass -r ./cms/static/sass/bourbon/lib/bourbon.rb