cahrens
|
39714a17d9
|
Merge branch 'master' into bug/christina/cursor-move
Conflicts:
cms/static/js/base.js
|
2013-03-22 16:03:52 -04:00 |
|
cahrens
|
eebef1e647
|
Don't save subsection and unit names until the change event. Fixes bugs #18 and #228.
|
2013-03-22 15:32:13 -04:00 |
|
cahrens
|
8ca6e324af
|
Merge branch 'master' into feature/btalbot/studio-checklists
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/sass/base-style.scss
cms/urls.py
|
2013-03-21 12:23:13 -04:00 |
|
Brian Talbot
|
3b80a90bd0
|
studio - sass cleanup: adding in more color variables, proofing box-sizing and older/rougher unit scss
|
2013-03-20 16:54:14 -04:00 |
|
Brian Talbot
|
06b118ae33
|
studio - sass cleanup: resolved static pages display issue after local merge master
|
2013-03-15 15:23:03 -04:00 |
|
Brian Talbot
|
84a5475d5a
|
studio - sass cleanup: resolving conflicts with local master merge
|
2013-03-15 12:42:33 -04:00 |
|
Brian Talbot
|
a496cc0a1e
|
studio - Sass Cleanup: moved all page/view specific css to their own views and created forms specific sheet
|
2013-03-11 13:28:28 -04:00 |
|
Brian Talbot
|
6418d033dd
|
studio - adding files I forgot to add when cleaning up Sass and originally committing
|
2013-03-08 12:20:40 -05:00 |
|