Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

351 Commits

Author SHA1 Message Date
John Jarvis
78987cc400 resolving merge conflicts 2013-03-19 16:16:32 -04:00
Brian Talbot
a455c6b1e4 edx.org - added in error state revisions and modal window tweaks 2013-03-19 13:57:14 -04:00
Brian Talbot
dc60d107e9 edx.org - added in new login and registration visual banners per marketing request 2013-03-19 09:53:52 -04:00
Brian Talbot
d23679ea4e edx.org redesign - revised temporary login/register views to fit with design requirements/fixes from marketing team's overall design changes to site's visual theme 2013-03-12 15:04:00 -04:00
Brian Talbot
d0fca477a8 edx.org - university pages' main banner images are now centered when window resizes 2013-02-20 16:12:36 -05:00
Brian Talbot
f2abc3c3e5 lms - revised classes and styling mechanics for login/register forms and added necessary screen-reader mixin for other visually hidden text in those pages 2013-02-20 09:15:27 -05:00
Brian Talbot
b2839514f2 Merge branch 'drupal-new' of github.com:MITx/mitx into drupal-new 2013-02-19 17:22:57 -05:00
Brian Talbot
1f247ceb0c edX Homepage - revised layout (HTML/CSS) for new edX universities and created logo assets 2013-02-19 16:40:21 -05:00
John Jarvis
dabcb51746 resolving merge conflicts 2013-02-19 12:43:06 -05:00
Brian Talbot
38e3d7371b drupal integration - added in right side copy to registration marketing requested 2013-01-24 12:46:35 -05:00
Brian Talbot
8374534802 drupal integration - revised copy, layout, and styles per marketing feedback 2013-01-23 18:22:13 -05:00
Brian Talbot
cbe35eeab3 drupal integration - further color sync, copy edits, and removing courseware button when on login page 2013-01-23 18:22:13 -05:00
Brian Talbot
e1fae8e885 drupal integration - color syncing with marketing site standards 2013-01-23 18:22:13 -05:00
Brian Talbot
bb66f8963f drupal integration - revised general page background for shorter content pages, small visual tweaks to footer 2013-01-23 18:22:13 -05:00
Brian Talbot
a15bf74f7c drupal integration - styled and revised markup/copy for password reset modal 2013-01-23 18:22:13 -05:00
Brian Talbot
de4f35df77 drupal integration - plumbing in password reset UI updates - wip 2013-01-23 18:22:13 -05:00
Brian Talbot
2019af4170 drupal integration - revised/proofed header and footer styles to match spacing of marketing site and renamed social icons 2013-01-23 18:22:13 -05:00
Brian Talbot
42d4b4d69b drupal integration - revised padding between content and footer globally, removed secondary form actions for time being 2013-01-23 18:22:13 -05:00
Brian Talbot
d6354fd8b1 drupal integration - revised general header HTML and Sass to coincide with marketing site nav and theme 2013-01-23 18:22:12 -05:00
Brian Talbot
eaeae03315 drupal integration - further sass refinment and hiding example error states 2013-01-23 18:22:12 -05:00
Brian Talbot
009ac06d4d drupal integration - added unified account-centric Sass, which holds registration/login styling 2013-01-23 18:22:12 -05:00
Brian Talbot
7c7d0da5b4 drupal integration - styled page layout, form fields and states, added in status message areas/standards and revised Sass 2013-01-23 18:22:12 -05:00
Brian Talbot
6bff41708d cleaning up LMS Sass variables a bit 2013-01-23 18:22:12 -05:00
Brian Talbot
1db87e0533 drupal integration - added sass files to architecture and plumbed HTML for login and register views 2013-01-23 18:22:12 -05:00
Chris Dodge
44cfcb88a3 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-17 20:30:22 -05:00
David Ormsbee
18d5792025 Merge pull request #1302 from MITx/bugfix/brian/pearson-reg 
Bugfix/brian/pearson reg
 2013-01-17 11:42:00 -08:00
Carlos Andrés Rocha
00f83d03a0 Restore /faq page, and moved new content to /help 2013-01-17 10:47:50 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
Brian Talbot
a756776836 pearson registration - revised rejection message text on dashboard, synced up email edx link text, revised contact styles/markup to remove giant red button dashboard for rejections 2013-01-16 17:26:29 -05:00
Brian Talbot
b16fa04371 pearson registration - resolved box-sizing display issue that caused form fields to not show text/be editable in Firefox/Mozilla 2013-01-16 15:08:23 -05:00
Brian Wilson
bfb5f5e5bd Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg 2013-01-16 11:24:46 -05:00
Brian Wilson
fb251cacbe Merge branch 'feature/brian/pearson-reg' of github.com:MITx/mitx into feature/brian/pearson-reg 2013-01-15 15:42:29 -05:00
Brian Wilson
32b2d1b97f Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations 2013-01-15 15:42:09 -05:00
Brian Talbot
540232f54d revised minor syntax/line indents on faq scss and js 2013-01-15 15:30:53 -05:00
Brian Talbot
a4e53d7a7f pearson registration - restyled and tweaked markup for registration closed message and styled disabled labels appropriately 2013-01-15 14:52:39 -05:00
Brian Talbot
4e83f748b7 pearson registration - revised contact calls to action and order in status section, edited flash message copy/styling, added in strawman state for disabled form/closed registration state of form, added in strawman state for demographics rejected flash message, revised accomodations text labe and isntructions 2013-01-14 17:31:05 -05:00
Carlos Andrés Rocha
2f99d38e90 Update FAQ page: new content and styling 2013-01-14 14:17:39 -05:00
Brian Talbot
5d40d22136 revised rejected state error message content, markup, and styling on registration's right hand side status area 2013-01-11 09:52:46 -05:00
Brian Talbot
759bb137b4 pearson registration - adjusted style for rejected message state on dashboard 2013-01-10 17:08:01 -05:00
Brian Talbot
a388263298 pearson registration - giving registration call to actions on dashboard a bit more room 2013-01-09 16:06:10 -05:00
Brian Talbot
329982a665 pearson registration - fixed layout issue with submission errors 2013-01-08 11:48:07 -05:00
Brian Talbot
bbe0120d5c pearson registration - changed accepted classes, content, and styling to use the term process instead 2013-01-08 11:41:01 -05:00
Brian Talbot
352f284624 pearson registration - revised UI states for reg form, simplified markup for form fields, synched button styles/text b/t registration form and dashboard 2013-01-08 11:37:26 -05:00
Brian Talbot
b41f68c801 pearson registration - changing registration status states to progress-based states UI - wip 2013-01-07 17:14:11 -05:00
Brian Talbot
2ec11e5b92 pearson registration - refined error output and accommodation field display toggling 2013-01-07 15:15:50 -05:00
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
 2013-01-07 12:34:48 -05:00
Brian Talbot
04524ef58f media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text 2013-01-04 10:02:14 -05:00
Carlos Andrés Rocha
25cb6d5a22 Minor style changes to home page and media kit page 
[#41872203]
 2013-01-03 18:06:22 -05:00
Brian Talbot
a67b54bf82 media kit - added initial styles to media kit page 2013-01-03 17:10:16 -05:00
Brian Talbot
e10e87e6ec media kit - revised link styling on homepage 2013-01-03 14:21:07 -05:00