Calen Pennington
|
9d00bbf839
|
Merge branch 'master' into asset-pipeline
Conflicts:
static/css
static/css/application.css
|
2012-05-18 11:29:36 -04:00 |
|
Calen Pennington
|
1831ab4ea5
|
Merge remote-tracking branch 'origin/master' into asset-pipeline
Conflicts:
envs/dev.py
sass/README
static/css
static/css/application.css
static/css/marketing-ie.css
static/css/marketing.css
|
2012-05-17 16:48:17 -04:00 |
|
Calen Pennington
|
b80d1904ad
|
Make scss urls relative to the directory that they are in
|
2012-05-17 16:44:36 -04:00 |
|
Calen Pennington
|
bc823d3bfe
|
Merge branch 'master' into asset-pipeline
Conflicts:
djangoapps/multicourse/__init__.py
requirements.txt
sass/_info.scss
sass/_textbook.scss
sass/courseware/_sequence-nav.scss
sass/courseware/_video.scss
sass/index/_base.scss
sass/index/_extends.scss
sass/index/_footer.scss
sass/index/_header.scss
sass/index/_index.scss
sass/index/_variables.scss
sass/layout/_calculator.scss
sass/print.scss
static/css
static/css/application.css
static/css/marketing.css
templates/main.html
templates/marketing.html
templates/sass/index/_base.scss
templates/sass/index/_extends.scss
templates/sass/index/_footer.scss
templates/sass/index/_header.scss
templates/sass/index/_index.scss
templates/sass/index/_variables.scss
templates/sass/marketing/_base.scss
templates/sass/marketing/_extends.scss
templates/sass/marketing/_footer.scss
templates/sass/marketing/_header.scss
templates/sass/marketing/_index.scss
templates/sass/marketing/_variables.scss
|
2012-05-17 16:32:39 -04:00 |
|
Calen Pennington
|
5a4d9691d4
|
Move sass files into a separate directory, for clarity
|
2012-04-20 14:58:46 -04:00 |
|