Brian Talbot
ed3f3b02d6
studio - course export UI alpha - roughing in states/views
2012-12-26 09:10:05 -05:00
Don Mitchell
a46c1f4883
Updated underscore (using _.invert())
...
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
2012-12-11 14:18:13 -05:00
Don Mitchell
0a91a98dd0
Merge remote-tracking branch 'origin/feature/cale/cms-master' into
...
feature/dhm/cms-settings
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/course_info.js
cms/static/js/template_loader.js
cms/static/js/views/course_info_edit.js
cms/templates/base.html
cms/templates/course_info.html
cms/urls.py
2012-12-11 10:55:10 -05:00
Tom Giannattasio
a98cead8ee
added basic lms styles
2012-11-20 13:02:08 -05:00
Tom Giannattasio
d68945de33
started adding settings page
2012-10-30 15:04:21 -04:00
Tom Giannattasio
f10d1773c7
added open sans pull
2012-10-15 14:44:53 -04:00
Tom Giannattasio
c7cdaf8080
styled import page
2012-10-12 11:58:43 -04:00
Chris Dodge
14a1a7da31
allow importing of .tar.gz packages of courseware
2012-10-12 10:33:31 -04:00
Tom Giannattasio
b685af44eb
started 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
07ac0d0642
styled/tweaked users page
2012-10-10 15:46:59 -04:00
Tom Giannattasio
4c50f13e99
added templates/styles for static pages
2012-10-09 14:47:15 -04:00
Tom Giannattasio
6b4d9ba0cd
setup landing template
2012-10-03 17:26:14 -04:00
Tom Giannattasio
44d4a4b0d9
started asset library template -wip
2012-10-02 17:02:47 -04:00
Tom Giannattasio
8478f7af64
styled course list page
2012-10-01 16:37:24 -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
Calen Pennington
4381674ec5
Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms
2012-10-01 15:17:40 -04:00
Calen Pennington
44805ca383
Make discussion js work for cms as well as lms so that inline discussion xmodules load
2012-10-01 15:16:54 -04:00
Calen Pennington
ea8ab0f809
Add basic overview.html from tom's wireframe to CMS
2012-10-01 15:12:29 -04:00
Kyle Fiedler
d53e4bd38f
Added more styles includeing the index page more color changes and header styles
2012-07-30 09:51:49 -04:00
Calen Pennington
8a0270ea2b
Allow for modular css from XModules, and split capa module css out as a test
2012-07-24 16:14:04 -04:00
Kyle Fiedler
8a4d860a1e
put normalize in vendor folder
2012-07-09 11:26:46 -04:00
Kyle Fiedler
c8da987436
Added new icons for all of the content
2012-07-09 10:04:20 -04:00
Kyle Fiedler
3081258836
Refactored the css and fixed some smaller bugs
2012-06-25 11:21:24 -04:00
Kyle Fiedler
5908d844b8
Added styles to be more consistant across pages
2012-06-25 11:21:24 -04:00
Calen Pennington
f2080fde62
Porting latest changes from ui_prototype
2012-06-13 14:43:01 -04:00
Calen Pennington
a333612cce
Add templates directly from cms_proto/ui_prototype
2012-06-13 11:54:17 -04:00
