Commit Graph

330 Commits

Author SHA1 Message Date
Tom Giannattasio
1bd790fabb finished attachment styles 2012-08-17 16:46:40 -04:00
Tom Giannattasio
c253474297 added modal functionality for attachments page 2012-08-17 15:59:31 -04:00
Tom Giannattasio
e47f3ccf35 added CodeMirror styles for the circuit editor 2012-08-17 15:26:25 -04:00
Tom Giannattasio
63ba133fbb added Code Mirror styles 2012-08-17 15:10:24 -04:00
Bridger Maxwell
b05bace12a Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
Conflicts:
	lms/templates/wiki/base.html
2012-08-17 14:48:06 -04:00
Bridger Maxwell
8595cb24b2 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
Conflicts:
	lms/templates/wiki/base.html
2012-08-17 14:44:25 -04:00
Bridger Maxwell
6b716c2883 Put in CodeMirror editor with inline circuits. 2012-08-17 14:32:29 -04:00
Tom Giannattasio
f67a356466 added additional bootstrap js files 2012-08-17 14:14:07 -04:00
Tom Giannattasio
b5b5978130 started styling attachments page 2012-08-17 13:32:40 -04:00
Tom Giannattasio
ad45a44a7c added bootstrap js and other dependencies; tweaked settings template 2012-08-17 09:37:42 -04:00
Tom Giannattasio
b0b10aa598 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:35:56 -04:00
Bridger Maxwell
2de55d074b Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:34:38 -04:00
Tom Giannattasio
490eb7a32b styled changes, new article and delete pages 2012-08-16 17:31:05 -04:00
Tom Giannattasio
bb6d6d9ac8 edit page styles 2012-08-16 16:41:41 -04:00
Kyle Fiedler
24ed4a4dae MAnage images 2012-08-16 12:06:20 -04:00
Kyle Fiedler
ad7061e41f Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav 2012-08-16 11:33:05 -04:00
Calen Pennington
3efea9cbb0 Merge pull request #425 from MITx/feature/bridger/new_wiki
Feature/bridger/new wiki
2012-08-16 07:31:56 -07:00
Bridger Maxwell
d064d29cd8 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-15 23:01:27 -04:00
Bridger Maxwell
48e9dc8031 Added bootstrap-modal for the wiki preview modals. 2012-08-15 20:07:05 -04:00
Tom Giannattasio
13c2bb588e added styles for main article, sidebar and breadcrumb 2012-08-15 15:59:46 -04:00
Kyle Fiedler
6d7225bebb Added some final touches to askbot 2012-08-15 13:51:10 -04:00
Kyle Fiedler
ff1f090737 Added more fixes for askbot also fixed some of the extra padding 2012-08-15 13:51:10 -04:00
Kyle Fiedler
0804ff7a75 Added styles for single question and profile view 2012-08-15 13:51:10 -04:00
Kyle Fiedler
bbe9432508 Lots of askbot fixes 2012-08-15 13:51:10 -04:00
Tom Giannattasio
8daea9c465 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-15 13:11:00 -04:00
Tom Giannattasio
abf26dced9 started styles 2012-08-15 13:10:47 -04:00
Tom Giannattasio
a58a047582 moved global nav class 2012-08-14 16:12:36 -04:00
Tom Giannattasio
5aefda8d51 modified zebra stripes 2012-08-14 16:09:32 -04:00
Tom Giannattasio
dd92f51f02 added fluid widths 2012-08-14 16:09:32 -04:00
Tom Giannattasio
d673895eaa added drag functionality 2012-08-14 16:09:32 -04:00
Tom Giannattasio
defa5b3159 basic gradebook template built; basic scroll functionality built 2012-08-14 16:09:32 -04:00
Tom Giannattasio
9871050f94 started gradebook 2012-08-14 16:09:32 -04:00
Calen Pennington
a7b88550c7 Merge pull request #401 from MITx/feature/kfiedler/courseware-style
Added tooltip styles, made all buttons the same, and other small changes...
2012-08-13 12:29:48 -07:00
Kyle Fiedler
731f1cd7a8 Added tooltip styles, made all buttons the same, and other small changes throughout the courseware 2012-08-13 15:05:43 -04:00
Tom Giannattasio
ee0cbf66f9 added a cleaner arrow implementation 2012-08-13 10:19:06 -04:00
ichuang
f99eb930ac new static/admin files for django 1.4 admin 2012-08-10 15:25:42 -04:00
Calen Pennington
310788ca08 Merge pull request #384 from MITx/feature/tomg/fall-design
fixed course name title bar bug
2012-08-10 10:05:59 -07:00
Tom Giannattasio
538185173a added truncation for super long titles 2012-08-10 11:48:07 -04:00
Tom Giannattasio
022c65a6b4 fixed class name header bug 2012-08-10 11:40:16 -04:00
Calen Pennington
1f1a87d970 Merge pull request #379 from MITx/feature/victor/keep-accordion-state
Make accordion remember state
2012-08-10 07:15:57 -07:00
Victor Shnayder
1c3038ff3a Make accordion remember state
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
2012-08-09 19:47:08 -04:00
Tom Giannattasio
ced521c17d cleaned up textbook nav styles 2012-08-09 14:44:50 -04:00
David Ormsbee
b78c038bf2 Merge pull request #375 from MITx/dormsbee/new_jobs
Dormsbee/new jobs
2012-08-09 10:00:14 -07:00
Tom Giannattasio
3c23aca898 styled bulleted lists on jobs page 2012-08-09 12:26:32 -04:00
Tom Giannattasio
3d3ee02e52 started textbook nav styles 2012-08-09 12:16:13 -04:00
Tom Giannattasio
e82582e329 added course name to global nav bar 2012-08-09 11:17:26 -04:00
Kyle Fiedler
971ec9891e Added new selections styles 2012-08-08 16:27:48 -04:00
Kyle Fiedler
ccc1f1dfd5 Removed padding and added line-height for the tutorials 2012-08-08 16:27:48 -04:00
Kyle Fiedler
17d072711b Make the sidebar links more standard, and remove some of their styling 2012-08-08 16:27:47 -04:00
Kyle Fiedler
dd6ec19e80 Make the modal window work in the courseware 2012-08-07 11:59:49 -04:00