Commit Graph

2939 Commits

Author SHA1 Message Date
David Ormsbee
a3d48cf22c Merge pull request #207 from MITx/mm-remove-preferred-language
Mm remove preferred language
2012-07-18 12:24:36 -07:00
Bridger Maxwell
7d148d35fe Removed application.css 2012-07-18 13:52:41 -04:00
Matthew Mongeau
519a744f22 Fix message and notice styles. 2012-07-18 13:40:16 -04:00
Galen Frechette
98ee9fb447 adds styles to new inputs on signup form 2012-07-18 13:04:27 -04:00
Matthew Mongeau
5824b2ebe2 Display registered when already registered for a course. 2012-07-18 11:48:02 -04:00
Galen Frechette
72f772d6ff adds styles to reset password page 2012-07-18 10:56:59 -04:00
Matthew Mongeau
63fd5b57dd Fix _modal.scss merge conflicts. 2012-07-18 10:23:44 -04:00
Matthew Mongeau
9bf4b11ae9 Style notice. 2012-07-18 10:11:06 -04:00
Galen Frechette
ba8eb93b43 adds styles to password reset modal 2012-07-17 22:53:03 -04:00
Galen Frechette
14b6ad25a7 changes about page layout to longform blog style layout to accomodate large amounts of copy 2012-07-17 17:49:44 -04:00
sidhanth rao
aded6a4fce hello 2012-07-17 17:02:09 -04:00
Bridger Maxwell
aaa31594b1 Forgot to add changes to this scss file in last commit. 2012-07-17 16:54:13 -04:00
Bridger Maxwell
224ce121e7 Merge branch 'release/1.0' of github.com:MITx/mitx into release/1.0 2012-07-17 16:38:57 -04:00
Bridger Maxwell
b8317619f2 Changed urls for the portal-icons to be relative, which makes them work. 2012-07-17 16:38:48 -04:00
Matthew Mongeau
9c672f7bd0 Hook up forms for forgot password functionality. 2012-07-17 16:27:30 -04:00
Galen Frechette
ba6346cb22 adds one image to about page 2012-07-17 14:54:35 -04:00
Galen Frechette
e65895459a improves course about page header, adds blog post images, works on static page layouts 2012-07-17 14:29:20 -04:00
Galen Frechette
c5ce0bdfea updates copy on about contact and faq, tweeks home page header 2012-07-17 13:02:46 -04:00
Galen Frechette
d55cd78c73 updates and imporves design of the home page header 2012-07-17 12:56:29 -04:00
Bridger Maxwell
d38903ac35 Merge remote-tracking branch 'origin/master' into template_caching
Conflicts:
	lms/static/sass/application.css
2012-07-16 23:33:40 -04:00
Galen Frechette
767469381b renames some scss files for better orginization, sets fixed widths on main containers to avoid akward scaling issues untill media queries can be added for more responsive scaling 2012-07-16 22:23:43 -04:00
Galen Frechette
600aff59a6 imporves course object header typography 2012-07-16 19:29:02 -04:00
Bridger Maxwell
36408a8d5a Removing lms/static/sass/application.css again. 2012-07-16 17:33:51 -04:00
Galen Frechette
96361c3fd5 adds icons to course about page, user nav and dashboard, adds styles to activation pages 2012-07-16 17:29:28 -04:00
Bridger Maxwell
d690a0de24 Removing compiles application.css file. 2012-07-16 17:03:31 -04:00
Galen Frechette
2d3bab4188 styles activation message 2012-07-16 13:34:12 -04:00
Galen Frechette
5033ec656c changes home page header design to accomodate new tagline, adds copy to about page and 1 blog post 2012-07-16 13:11:47 -04:00
Calen Pennington
8ef8162963 Fix courseware problem display 2012-07-16 11:41:51 -04:00
Calen Pennington
ab2995fc85 Remove compiled css files 2012-07-16 11:41:18 -04:00
Galen Frechette
1c027c43d2 hooks up links from login modal to signup modal and signup modal to login modal 2012-07-16 10:27:55 -04:00
Galen Frechette
15b544c50b makes logo bigger, imporves footer layout with additin of new links 2012-07-15 23:11:16 -04:00
Galen Frechette
d9e293f9c5 imporves typography and typography implimentation 2012-07-14 03:11:06 -04:00
Galen Frechette
3be186c142 improves style of video modals 2012-07-13 14:22:04 -04:00
Galen Frechette
cd345ae3bb converts modals to use jquery leanModal 2012-07-13 13:57:50 -04:00
Galen Frechette
3fca8a9dd0 cleans up rss feed on home page, still wip 2012-07-13 13:57:34 -04:00
Galen Frechette
296ae34e34 wip news feed on home page 2012-07-13 13:57:25 -04:00
Galen Frechette
35c5de8128 cleans up home page header design, adds social sharing to header, adds tos, privacy policy, honor code, help and copyright pages, add liks to those pages in footer, finished contact page 2012-07-13 13:57:02 -04:00
Galen Frechette
1ea8bd2666 imporves visual design of course info/profile page 2012-07-13 13:56:44 -04:00
Galen Frechette
8a5e3bf4d2 adds pressrelease page, breaks about content into seperate pages, imporvoves some visual elements of about and jobs pages 2012-07-13 13:56:14 -04:00
Calen Pennington
305cd30da9 The path user by url is based on the output css file, which ends up in static/sass, so only use ../, rather than ../../, to reference images 2012-07-12 16:03:12 -04:00
Bridger Maxwell
5bf6c73259 Merge with master. 2012-07-11 15:26:26 -04:00
Calen Pennington
100422a7f3 Make collectstatic run to completion 2012-07-11 10:14:51 -04:00
Galen Frechette
7a5d645b9f removes user avatar, imporves dashboard design 2012-07-10 19:59:51 -04:00
Galen Frechette
7f4de5df30 simplifies jobs page 2012-07-10 19:59:51 -04:00
Galen Frechette
597c1db585 updates basic html structure and base color 2012-07-10 19:59:51 -04:00
Galen Frechette
d8d3eb144c type tweeks in modals 2012-07-10 19:59:51 -04:00
Galen Frechette
8faa539a1a makes some tweeks to global nav style, home page header and font styles 2012-07-10 19:59:51 -04:00
Galen Frechette
f7a1873aee adds banner images to and refines header on find courses pages, various visual tweeks and imporvements 2012-07-10 19:59:50 -04:00
Galen Frechette
1be9196d3c wip header, wip header refactoring, improves course object visual design, improves footer 2012-07-10 19:59:50 -04:00
Calen Pennington
fdd9663699 Merge remote-tracking branch 'origin/master' into dormsbee/multicourse
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	lms/djangoapps/courseware/views.py
	lms/templates/index.html
	lms/templates/info.html
	lms/templates/main.html
	lms/templates/navigation.html
	requirements.txt
2012-07-10 13:39:19 -04:00