Merge pull request #1816 from MITx/feature/btalbot/studio-alerts (7fd8a33b) · Commits · Hsin-Yu Chien / edx-platform-release · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

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

Snippets Groups Projects

7fd8a33b

Commit 7fd8a33b authored 11 years ago by Christina Roberts

Downloads
- Plain Diff

Merge pull request #1816 from MITx/feature/btalbot/studio-alerts

Feature/btalbot/studio-alerts

parents 45bb4d37 78828457

Loading

Changes 17

Expand all Hide whitespace changes

Inline Side-by-side

Showing

cms/djangoapps/contentstore/views.py 6 additions, 0 deletions

cms/djangoapps/contentstore/views.py
cms/static/js/base.js 25 additions, 10 deletions

cms/static/js/base.js
cms/static/js/views/settings/advanced_view.js 15 additions, 11 deletions

cms/static/js/views/settings/advanced_view.js
cms/static/sass/_base.scss 85 additions, 9 deletions

cms/static/sass/_base.scss
cms/static/sass/_cms_mixins.scss 111 additions, 66 deletions

cms/static/sass/_cms_mixins.scss
cms/static/sass/_variables.scss 7 additions, 2 deletions

cms/static/sass/_variables.scss
cms/static/sass/assets/_keyframes.scss 183 additions, 8 deletions

cms/static/sass/assets/_keyframes.scss
cms/static/sass/base-style.scss 1 addition, 0 deletions

cms/static/sass/base-style.scss
cms/static/sass/elements/_alerts.scss 740 additions, 114 deletions

cms/static/sass/elements/_alerts.scss
cms/static/sass/elements/_header.scss 2 additions, 2 deletions

cms/static/sass/elements/_header.scss
cms/templates/base.html 22 additions, 12 deletions

cms/templates/base.html
cms/templates/overview.html 3 additions, 3 deletions

cms/templates/overview.html
cms/templates/settings_advanced.html 57 additions, 15 deletions

cms/templates/settings_advanced.html
cms/templates/unit.html 0 additions, 1 deletion

cms/templates/unit.html
cms/templates/ux-alerts.html 544 additions, 0 deletions

cms/templates/ux-alerts.html
cms/urls.py 2 additions, 0 deletions

cms/urls.py
common/static/sass/_mixins.scss 10 additions, 0 deletions

common/static/sass/_mixins.scss

with 1813 additions and 253 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