cahrens
|
0a063342cf
|
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
|
2013-03-21 13:56:32 -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
|
67c6852b5c
|
studio - checklists: removing not needed sass variable for animating height
|
2013-03-21 10:01:39 -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
|
8cf2cc6f78
|
studio - sass cleanup: local merge with master and small comment/organization tweaks to variables and base-styles
|
2013-03-20 10:42:35 -04:00 |
|
Brian Talbot
|
66a8735a58
|
studio - Checklists: initial design and front end proofing/firming up - WIP
|
2013-03-13 10:50:34 -04:00 |
|
Brian Talbot
|
1b5f040021
|
studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI
|
2013-03-12 21:57:40 -04:00 |
|
Brian Talbot
|
3b2c970248
|
studio - reorganized and documented used Sass for studio
|
2013-03-08 11:47:11 -05:00 |
|
Brian Talbot
|
5a1795db85
|
studio - soft landing UI: basic signin/sign up styling and sign up markup/templating
|
2013-02-04 00:19:26 -05:00 |
|
Brian Talbot
|
1144b0eeed
|
studio - soft landing UI: initial header and templating work
|
2013-02-03 22:22:11 -05:00 |
|
Brian Talbot
|
83ad950887
|
studio - revised course nav: plumbed in current html and scss progress into header
|
2013-02-01 20:48:59 -05:00 |
|
Brian Talbot
|
2ee488733c
|
cms pull request 1160 - brought back all css changes lost in this request - mostly overview related
|
2012-12-15 00:25:29 -05:00 |
|
Christina Roberts
|
e57b5b1431
|
Merge pull request #1160 from MITx/feature/btalbot/cms-gradable
Overview page allows user to specify grading policy per subsection
|
2012-12-14 14:09:28 -08:00 |
|
Brian Talbot
|
69c26a08e3
|
settings/style - general UI clean up - wip
|
2012-12-13 13:06:56 -05:00 |
|
Tom Giannattasio
|
2be1f852e7
|
clean up of users page
|
2012-12-13 11:28:59 -05:00 |
|
Tom Giannattasio
|
5b81d6b8cc
|
cleaned up subsection and unit page
|
2012-12-13 11:28:59 -05:00 |
|
Tom Giannattasio
|
052b6f695a
|
cleaned up editor styles; cleaned up static tabs page
|
2012-12-13 11:26:10 -05:00 |
|
Tom Giannattasio
|
95dfc730dc
|
new header styles; collapse all button added to courseware
|
2012-12-13 11:20:30 -05:00 |
|
Don Mitchell
|
909fd93c80
|
Merge branch 'feature/btalbot/cms-gradable' of github.com:MITx/mitx into feature/btalbot/cms-gradable
Conflicts:
cms/static/sass/_variables.scss
|
2012-12-13 10:40:49 -05:00 |
|
Don Mitchell
|
e75f63e957
|
More merge repairs. Hopefully done.
|
2012-12-12 17:13:55 -05:00 |
|
Don Mitchell
|
ea6532efd7
|
Fix screwed up merge
|
2012-12-12 16:51:05 -05:00 |
|
Brian Talbot
|
bdebc60266
|
assignments - wip
|
2012-12-12 13:30:24 -05:00 |
|
Brian Talbot
|
5239dcc9bd
|
gradable sections - adding in assets and markup - wip
|
2012-12-12 13:23:02 -05:00 |
|
Brian Talbot
|
ab87ff6b20
|
settings - field alignment, radio/checkbox formatting
|
2012-11-19 14:55:32 -05:00 |
|
Brian Talbot
|
bc4d5f413d
|
settings - various style/alignment tweaks to inline/existinf fields
|
2012-11-19 09:54:08 -05:00 |
|
Brian Talbot
|
1a297674ce
|
added in fields for problems and discussions portions of CMS settings
|
2012-11-15 14:31:16 -05:00 |
|
Tom Giannattasio
|
fcc725e76d
|
finished calendar styles
|
2012-10-11 14:53:45 -04:00 |
|
Tom Giannattasio
|
fec710abde
|
added edge logo; added edge temp landing page
|
2012-10-11 12:29:14 -04:00 |
|
Tom Giannattasio
|
8f0b068459
|
styled log in form
|
2012-10-01 16:30:28 -04:00 |
|
Calen Pennington
|
96a914216c
|
Fix up overview page with new design mockup
|
2012-10-01 15:28:12 -04:00 |
|