Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

5b4c501a

Commit 5b4c501a authored 12 years ago by Calen Pennington

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/kf-html-edit' into cpennington/cms-xml-processing

parents ced91369 863568ec

No related merge requests found

Changes 17

Hide whitespace changes

Inline Side-by-side

Showing

cms/static/coffee/main.coffee 5 additions, 0 deletions

cms/static/coffee/main.coffee
cms/static/sass/_base.scss 22 additions, 56 deletions

cms/static/sass/_base.scss
cms/static/sass/_calendar.scss 0 additions, 1 deletion

cms/static/sass/_calendar.scss
cms/static/sass/_layout.scss 53 additions, 0 deletions

cms/static/sass/_layout.scss
cms/static/sass/_problem.scss 0 additions, 71 deletions

cms/static/sass/_problem.scss
cms/static/sass/_section.scss 182 additions, 0 deletions

cms/static/sass/_section.scss
cms/static/sass/_unit.scss 199 additions, 0 deletions

cms/static/sass/_unit.scss
cms/static/sass/_video.scss 0 additions, 33 deletions

cms/static/sass/_video.scss
cms/static/sass/_week.scss 0 additions, 256 deletions

cms/static/sass/_week.scss
cms/static/sass/base-style.scss 2 additions, 2 deletions

cms/static/sass/base-style.scss
cms/templates/unit.html 10 additions, 12 deletions

cms/templates/unit.html
cms/templates/widgets/html-edit.html 41 additions, 0 deletions

cms/templates/widgets/html-edit.html
cms/templates/widgets/module-dropdown.html 1 addition, 1 deletion

cms/templates/widgets/module-dropdown.html
cms/templates/widgets/navigation.html 1 addition, 1 deletion

cms/templates/widgets/navigation.html
cms/templates/widgets/notes.html 21 additions, 0 deletions

cms/templates/widgets/notes.html
cms/templates/widgets/problem-edit.html 39 additions, 64 deletions

cms/templates/widgets/problem-edit.html
cms/templates/widgets/sequence-edit.html 92 additions, 105 deletions

cms/templates/widgets/sequence-edit.html

with 668 additions and 602 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment