718 Commits

Author	SHA1	Message	Date
Brian Talbot	8b5f088eb9	studio - fixed alignment of new section field and controls	2013-02-20 16:43:13 -05:00
Brian Talbot	266e8951a4	made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750	2013-02-19 17:18:09 -05:00
Brian Talbot	fca98c19a5	studio - adding in info icon to page intro help and making icon classes consistent in all new references	2013-02-19 12:13:08 -05:00
cahrens	596de8ab2c	Hook up "View Live" buttons and get "New Static Tab" working again.	2013-02-19 11:34:41 -05:00
Brian Talbot	9eb02a8a26	studio - resolving base.js spacing/conflicts	2013-02-15 16:57:42 -05:00
cahrens	5acf9cb3d2	Reformat to 4 spaces.	2013-02-15 14:46:41 -05:00
Brian Talbot	3c6caa611c	resolving local merge	2013-02-15 14:24:42 -05:00
Brian Talbot	a5e2b5c53a	resolving merge conflict and missing Sass mixin	2013-02-15 14:10:52 -05:00
Brian Talbot	cb127d473d	studio - page headers: revised where new course form fields are placed in dashboard	2013-02-15 11:40:06 -05:00
Brian Talbot	20553b00d3	resolving merge conflict with master	2013-02-15 09:32:38 -05:00
Brian Talbot	6c95460761	studio - resolving merge from master	2013-02-15 09:15:06 -05:00
Brian Talbot	9feb810006	studio - final prep of introduction areas (with fix for current page content margins)	2013-02-14 13:16:10 -05:00
Brian Talbot	c81f958788	studio - final prep of introduction areas (with fix for current page content margins)	2013-02-14 13:00:14 -05:00
Brian Talbot	9b09d043bd	studio - adding introduction areas to all templates and infrastructure for its contnet	2013-02-14 12:49:58 -05:00
Brian Talbot	47c117bf03	studio - page headers: resolved new course update creation JS issue caused by new markup	2013-02-14 10:52:25 -05:00
Brian Talbot	1a1be106ae	studio - page headers: added in view live links to course dashboard	2013-02-14 10:14:10 -05:00
Brian Talbot	2024f9eeca	studio - page headers: added view course button to course outline	2013-02-14 09:48:19 -05:00
Brian Talbot	6ade6983ae	studio - page headers: added in logic to style page actions' height based on title having a subtitle or not	2013-02-14 09:38:32 -05:00
Brian Talbot	41dc655cce	resolving local merge conflict	2013-02-14 09:03:46 -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	c250bc8b59	studio - page headers: setting up needed future CSS	2013-02-13 16:59:56 -05:00
Brian Talbot	e23c99961d	studio - page headers: completed basic styling and simple page set-ups	2013-02-13 15:03:26 -05:00
Brian Talbot	8ec4c09615	local merge conflict resolution	2013-02-13 13:41:35 -05:00
Brian Talbot	0af6b991f0	studio - nav: generalizing is-selected styling	2013-02-13 13:40:46 -05:00
Brian Talbot	e13db29efc	resolving merge from feature/btalbot/studio-softlanding	2013-02-13 12:42:15 -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	70e11e823c	studio - made all page heading chrome have consistent markup	2013-02-12 15:07:32 -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
Brian Talbot	8976818c78	studio - header UI: in progress markup changes WIP	2013-02-12 09:16:24 -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