696 Commits

Author	SHA1	Message	Date
cahrens	5acf9cb3d2	Reformat to 4 spaces.	2013-02-15 14:46:41 -05:00
Brian Talbot	a5e2b5c53a	resolving merge conflict and missing Sass mixin	2013-02-15 14:10:52 -05:00
Brian Talbot	6c95460761	studio - resolving merge from master	2013-02-15 09:15:06 -05:00
Brian Talbot	54cc51bccf	studio - soft landing: changed strong elem colors to be more subtle since we're not using new nomenclature	2013-02-14 09:02:51 -05:00
Brian Talbot	0af6b991f0	studio - nav: generalizing is-selected styling	2013-02-13 13:40:46 -05:00
Brian Talbot	d3e67be766	studio: nav - clicking anywhere but nav's dropdowns will close them, fixed link outline and is-selected styling	2013-02-13 12:03:30 -05:00
Brian Talbot	fdd809409f	studio - nav: resolved Firefox browser chrome page-shifting bug	2013-02-13 11:37:47 -05:00
Brian Talbot	714f69a57e	studio - resolving merge conflicts in settings from a recent rebase	2013-02-13 09:07:53 -05:00
Brian Talbot	fccb3d7a73	studio - nav and soft landing various QA fixes	2013-02-12 17:36:36 -05:00
Brian Talbot	0a2b74110e	studio - nav and soft landing various QA fixes	2013-02-12 17:03:48 -05:00
Don Mitchell	d569c559ca	Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding ... Conflicts: cms/djangoapps/contentstore/views.py cms/static/js/views/settings/main_settings_view.js cms/templates/index.html cms/templates/settings.html	2013-02-12 16:57:00 -05:00
Don Mitchell	76d675ba16	fix npe for time (bug 185)	2013-02-12 15:20:02 -05:00
Don Mitchell	40668133f7	Fix bug which I know I fixed before (perhaps on another branch?) to ... ensure old time had a value before comparing it to new time.	2013-02-12 15:11:35 -05:00
Brian Talbot	540710f553	studio - nav revamp: added in dynamic course org and number to header	2013-02-12 14:22:42 -05:00
Don Mitchell	c9c026be62	Fixed urls	2013-02-12 12:15:07 -05:00
Brian Talbot	7ca267fd78	studio - debugging grading settings JS errors WIP	2013-02-12 11:56:54 -05:00
Brian Talbot	22b959d657	studio - link wiring and spot styling changes for new nav/soft landing/settings work	2013-02-12 11:16:37 -05:00
Don Mitchell	8bc9564d92	clean up note to self	2013-02-11 16:45:36 -05:00
Don Mitchell	777e0ef9c5	The other one was too inclusive	2013-02-11 16:36:34 -05:00
Don Mitchell	565f5f0adc	Stop simple clicks from paging to top w/o disrupting dnd	2013-02-11 16:28:22 -05:00
Brian Talbot	8f5d8a98c7	studio - resolved sidebar content organization and styling	2013-02-11 16:20:25 -05:00
Brian Talbot	2150386a21	studio - resolved scss that hid works in progress	2013-02-11 16:16:10 -05:00
Brian Talbot	715cea51a4	studio - resolved scss that relied on old body classes	2013-02-11 16:09:33 -05:00
Don Mitchell	ae4a854e18	Bug 180	2013-02-11 15:46:58 -05:00
Brian Talbot	ea709684d0	studio - settings: synched up styling/controls for existing video with other existing fields	2013-02-11 12:13:25 -05:00
Brian Talbot	34272beba3	studio - merge resolving	2013-02-11 12:09:01 -05:00
Brian Talbot	77343519c6	studio - settings: revising enumerated item lists	2013-02-11 12:08:31 -05:00
Don Mitchell	773dfce68d	Try to make server and validation errors work together. Getting double ... errors when there are parent and child views both defining on error handlers still.	2013-02-11 12:04:45 -05:00
Brian Talbot	1936b47ba5	studio - small display tweaks to setting form new/remove actions	2013-02-11 09:01:52 -05:00
Brian Talbot	5730cf45b7	studio - window class revamp	2013-02-11 08:57:34 -05:00
Brian Talbot	ed15997259	studio - settings: grading revamp WIP	2013-02-11 08:48:01 -05:00
Brian Talbot	210086fed3	studio - settings: grading revamp WIP	2013-02-08 13:42:36 -05:00
Brian Talbot	1b679750ad	studio - settings: more revamp of tabs to views WIP	2013-02-08 12:36:21 -05:00
Brian Talbot	dc07e7375f	studio - settings: revamp of tabs to views WIP	2013-02-08 09:36:18 -05:00
Don Mitchell	9f5eeaf815	Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding ... Conflicts: cms/templates/settings.html cms/templates/widgets/header.html	2013-02-07 14:56:48 -05:00
Don Mitchell	31393043d0	More for that commit	2013-02-07 14:46:42 -05:00
Don Mitchell	9cd1162a60	Grading and details split out. Put the unimplemented tabs into a single ... file not used.	2013-02-07 14:45:24 -05:00
Brian Talbot	ed42fa8830	studio - soft landing: revised page title structure and values	2013-02-07 14:23:00 -05:00
Brian Talbot	5b9609abf6	studio - soft landing: various fixes/tweaks	2013-02-07 14:09:47 -05:00
Brian Talbot	fedd0aac9a	studio - course nav: added in styling to account for stateful menus	2013-02-07 11:25:11 -05:00
Brian Talbot	903115d6a9	studio - soft landing: refined user icon vs. dropdown icon styles	2013-02-07 11:07:18 -05:00
Brian Talbot	5674dd19c4	studio - soft landing and nav: slight visual tweaks to soft landing UI and added in support link + new tab/window and modal management JS	2013-02-07 09:58:52 -05:00
Brian Talbot	cb9d960a28	studio - soft landing: style dropdown arrows	2013-02-06 15:46:10 -05:00
Brian Talbot	d00a1f35c7	studio - soft landing: resolved not signed in header nav length issue	2013-02-06 15:00:40 -05:00
Brian Talbot	d11f10cc66	studio - course nav: corrected JS behavior of dropdowns to hide all others and self-hide appropriately	2013-02-06 14:37:09 -05:00
Brian Talbot	1dae21e969	studio - course nav: styled dropdown navigation	2013-02-06 14:16:49 -05:00
Brian Talbot	b0be1cd3dc	studio - soft landing: revised app nav flexible grid	2013-02-06 11:36:08 -05:00
Brian Talbot	b98c643aaf	studio - merging soft landing local work with rebased branch	2013-02-06 10:59:59 -05:00
Brian Talbot	bb789e758b	studio - course nav: general flex-grid layout - WIP	2013-02-06 09:57:03 -05:00
Don Mitchell	0f5571f499	Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding	2013-02-06 09:48:09 -05:00