Merge remote-tracking branch 'origin/kf-html-edit' into cpennington/cms-xml-processing
Showing
- cms/static/coffee/main.coffee 5 additions, 0 deletionscms/static/coffee/main.coffee
- cms/static/sass/_base.scss 22 additions, 56 deletionscms/static/sass/_base.scss
- cms/static/sass/_calendar.scss 0 additions, 1 deletioncms/static/sass/_calendar.scss
- cms/static/sass/_layout.scss 53 additions, 0 deletionscms/static/sass/_layout.scss
- cms/static/sass/_problem.scss 0 additions, 71 deletionscms/static/sass/_problem.scss
- cms/static/sass/_section.scss 182 additions, 0 deletionscms/static/sass/_section.scss
- cms/static/sass/_unit.scss 199 additions, 0 deletionscms/static/sass/_unit.scss
- cms/static/sass/_video.scss 0 additions, 33 deletionscms/static/sass/_video.scss
- cms/static/sass/_week.scss 0 additions, 256 deletionscms/static/sass/_week.scss
- cms/static/sass/base-style.scss 2 additions, 2 deletionscms/static/sass/base-style.scss
- cms/templates/unit.html 10 additions, 12 deletionscms/templates/unit.html
- cms/templates/widgets/html-edit.html 41 additions, 0 deletionscms/templates/widgets/html-edit.html
- cms/templates/widgets/module-dropdown.html 1 addition, 1 deletioncms/templates/widgets/module-dropdown.html
- cms/templates/widgets/navigation.html 1 addition, 1 deletioncms/templates/widgets/navigation.html
- cms/templates/widgets/notes.html 21 additions, 0 deletionscms/templates/widgets/notes.html
- cms/templates/widgets/problem-edit.html 39 additions, 64 deletionscms/templates/widgets/problem-edit.html
- cms/templates/widgets/sequence-edit.html 92 additions, 105 deletionscms/templates/widgets/sequence-edit.html
cms/static/sass/_layout.scss
0 → 100644
cms/static/sass/_problem.scss
deleted
100644 → 0
cms/static/sass/_section.scss
0 → 100644
cms/static/sass/_video.scss
deleted
100644 → 0
cms/static/sass/_week.scss
deleted
100644 → 0
cms/templates/widgets/notes.html
0 → 100644
Please register or sign in to comment