Commit Graph

790 Commits

Author SHA1 Message Date
Tom Giannattasio
f7e20801cd added toast style error message styling 2012-09-07 11:44:17 -04:00
Kyle Fiedler
012edbfd40 Fix main navigation and footer links also make text not italic 2012-09-07 11:14:26 -04:00
David Ormsbee
bea6db620a Merge pull request #533 from MITx/feature/halogenandtoast/calculator
Put in calculator in courseware
2012-09-06 13:00:09 -07:00
Tom Giannattasio
5304c9cb99 delegated tooltips 2012-09-06 11:39:23 -04:00
Kyle Fiedler
54caa320ef fixed list items in html in the courseware 2012-09-06 10:21:33 -04:00
David Ormsbee
5e9fce5cae Merge branch 'master' into feature/halogenandtoast/calculator 2012-09-05 13:58:12 -04:00
Kyle Fiedler
e7a7c71324 Added icon to mark it as having a due date 2012-08-31 17:58:08 -04:00
Tom Giannattasio
d8591c286d basic discussion profile styles 2012-08-31 16:14:11 -04:00
Arjun Singh
1c176d369b add margin between checkbox and text 2012-08-29 03:25:08 -07:00
Carlos Andrés Rocha
8b0d1f09e0 Refactored wiki cheatsheet code. 2012-08-27 18:30:38 -04:00
Kyle Fiedler
9d6bf9a8fd Added some fixes for the calculator 2012-08-27 10:15:31 -04:00
Tom Giannattasio
9b5285ad8a Merge branch 'master' into feature/rocha/wiki-cheatsheet 2012-08-27 09:08:48 -04:00
Tom Giannattasio
7d14632c3a added log in button to unauthenticated courseware 2012-08-24 16:41:12 -04:00
Tom Giannattasio
d1760f9a22 styled markdown modal and link 2012-08-24 16:14:04 -04:00
Tom Giannattasio
9cab1d9de8 fixed merge conflict 2012-08-24 13:33:48 -04:00
Tom Giannattasio
b494441e7a started new gradebook functionality 2012-08-23 16:40:48 -04:00
Carlos Andrés Rocha
d94ef54549 Added cheatsheet popup to wiki editor. 2012-08-23 16:30:58 -04:00
Tom Giannattasio
9a3a4f4a88 set active accordion state 2012-08-23 13:10:14 -04:00
Kyle Fiedler
773055cf54 fix wiki falsh message 2012-08-23 10:28:31 -04:00
Tom Giannattasio
2c1571d66c applied line height to course content wrapper to avoid strange line heights with improper markup 2012-08-23 10:04:00 -04:00
Tom Giannattasio
cf2f5d2af2 Merge branch 'master' into feature/tomg/fall-design 2012-08-23 08:24:58 -04:00
Tom Giannattasio
163eb9d49f fixed bottom sequence nav buttons and firefox outling bug 2012-08-23 08:24:54 -04:00
Arjun Singh
1c9029c163 cs188 styling 2012-08-22 22:57:14 -07:00
David Ormsbee
4e7ba6e651 Merge pull request #513 from MITx/feature/bridger/new_wiki
Feature/bridger/new wiki
2012-08-22 20:18:36 -07:00
Bridger Maxwell
e7732bf32f Wiki directory links now go to the article, with a smaller link for viewing sub-listings. 2012-08-22 21:05:17 -04:00
Calen Pennington
e206bf2ffc Merge pull request #505 from MITx/feature/tomg/fall-design
Feature/tomg/fall design
2012-08-22 13:34:39 -07:00
David Ormsbee
c86ee73bd8 Merge pull request #504 from MITx/feature/bridger/new_wiki
Feature/bridger/new wiki
2012-08-22 13:13:33 -07:00
Tom Giannattasio
a05cf05462 Merge branch 'master' into feature/tomg/fall-design 2012-08-22 16:09:30 -04:00
Tom Giannattasio
2c827c46f9 fixed firefox outline bugs 2012-08-22 16:09:09 -04:00
Kyle Fiedler
f4f8b7bf73 Added delete page and padding and hid th on overflow 2012-08-22 15:39:24 -04:00
Kyle Fiedler
7464332180 added fix for error styles and swapped some the button order 2012-08-22 15:09:20 -04:00
David Ormsbee
8b8ee9f434 Merge pull request #500 from MITx/feature/cale/university-branding
Feature/cale/university branding
2012-08-22 12:02:19 -07:00
Kyle Fiedler
d0c92aa159 Added styles for the wiki directory 2012-08-22 14:43:03 -04:00
Calen Pennington
b841591b0a Remove special styling for courseware header logo 2012-08-22 14:08:36 -04:00
Kyle Fiedler
02f29c22c9 Added stsyles for toc 2012-08-22 13:41:20 -04:00
Bridger Maxwell
14382702bc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
Conflicts:
	lms/templates/wiki/settings.html
2012-08-22 13:09:42 -04:00
Tom Giannattasio
d2808981cb fixed wiki breadcrumb arrow bug 2012-08-22 12:09:57 -04:00
Tom Giannattasio
fb1d9ca06c Merge branch 'master' into feature/tomg/fall-design 2012-08-22 11:41:19 -04:00
Tom Giannattasio
7d903c4089 sidebar hover and firefox bug fixes 2012-08-22 11:40:59 -04:00
Tom Giannattasio
b7ce475adb accordion hovers 2012-08-22 09:35:17 -04:00
Tom Giannattasio
885efc47c4 darker background for increased contrast 2012-08-22 09:03:38 -04:00
Arjun Singh
a9126aa276 Fixed syllabus to look good with new courseware styling 2012-08-22 05:25:48 -07:00
Tom Giannattasio
441d1955f9 fixed anonymous header bug 2012-08-22 07:34:55 -04:00
Bridger Maxwell
e655b4a3b3 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
Conflicts:
	cms/static/sass/_base.scss
	repo-requirements.txt
2012-08-21 22:25:21 -04:00
Tom Giannattasio
bbc95cb589 fixed accordion nav glitch 2012-08-21 19:25:32 -04:00
Tom Giannattasio
88505b3948 fixed discussion sidebar 2012-08-21 18:41:06 -04:00
Tom Giannattasio
bd536f8aec Merge branch 'master' into feature/tomg/fall-design 2012-08-21 18:13:40 -04:00
Tom Giannattasio
e762844c35 new sequence nav functionality - accommodates an infinite number of items 2012-08-21 18:12:59 -04:00
Victor Shnayder
2c19d01441 Merge pull request #479 from MITx/feature/arjun/syllabus
Adding a syllabus page (accessible via course navigation)
2012-08-21 14:33:07 -07:00
Kyle Fiedler
3273de93fe make tutorial headers normal size 2012-08-21 16:01:48 -04:00