edx-platform

Files

Don Mitchell 0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into

feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py

2012-12-11 10:55:10 -05:00

vendor

put normalize in vendor folder

2012-07-09 11:26:46 -04:00

_alerts.scss

template for 404 and 500 errors

2012-10-11 09:58:35 -04:00

_assets.scss

removed box shadow on embed xmls

2012-10-17 15:20:03 -04:00

_base.scss

Merge remote-tracking branch 'origin/feature/cale/cms-master' into

2012-12-11 10:55:10 -05:00

_calendar.scss

Added fixes to some style and one Cale fix to get things working properly

2012-09-11 14:05:07 -04:00

_cms_mixins.scss

update styles fixed; tweaks to white button mixins; add update to top of list; render updates upon save

2012-11-30 10:41:10 -05:00

_content-types.scss

tightened unit treeview styles

2012-10-10 15:45:51 -04:00

_course-info.scss

get CodeMirror to work - set the right background in the .scss, make sure the textarea is visible before binding it to CodeMirror

2012-12-07 14:38:03 -05:00

_courseware.scss

Merge pull request #1089 from MITx/feature/studio/tom/speedups

2012-11-30 08:55:31 -08:00

_dashboard.scss

fixed padding on a few buttons

2012-11-30 07:51:14 -05:00

_fonts.scss

Added style for the calendar view and section view

2012-07-03 16:19:19 -04:00

_graphics.scss

most of the styling and function changes made

2012-11-28 15:10:46 -05:00

_header.scss

added handling for long class names in the header

2012-10-30 12:57:47 -04:00

_import.scss

removed css comment

2012-10-15 14:37:05 -04:00

_index.scss

Added more styles includeing the index page more color changes and header styles

2012-07-30 09:51:49 -04:00

_jquery-ui-calendar.scss

Fix path to ui icon

2012-10-23 13:40:49 -04:00

_keyframes.scss

Added more styles includeing the index page more color changes and header styles

2012-07-30 09:51:49 -04:00

_landing.scss

Cleaning up logos for edge landing page

2012-10-12 10:31:46 -04:00

_layout.scss

Added more styles includeing the index page more color changes and header styles

2012-07-30 09:51:50 -04:00

_lms.scss

most of the styling and function changes made

2012-11-28 15:10:46 -05:00

_login.scss

transition added to log in button

2012-10-17 12:55:53 -04:00

_mixins.scss

Merge branch 'course-info' into feature/dhm/cms-settings

2012-11-19 16:00:27 -05:00

_modal.scss

cross-browser css3

2012-10-05 10:29:36 -04:00

_module-header.scss

Added styles to be more consistant across pages

2012-06-25 11:21:24 -04:00

_problem.scss

Refactored the css and fixed some smaller bugs

2012-06-25 11:21:24 -04:00

_reset.scss

Add basic overview.html from tom's wireframe to CMS

2012-10-01 15:12:29 -04:00

_section.scss

Added styles for buttons

2012-07-30 09:51:49 -04:00

_settings.scss

Grading mostly working

2012-12-10 16:32:33 -05:00

_static-pages.scss

finished styling for static tabs; required some rework of global styles

2012-11-28 15:39:43 -05:00

_subsection.scss

disabled policy names always and removed edit button

2012-10-24 14:46:46 -04:00

_unit.scss

add sidebar column; fixed main column float bug

2012-11-30 10:40:19 -05:00

_users.scss

most of the styling and function changes made

2012-11-28 15:10:46 -05:00

_variables.scss

settings - field alignment, radio/checkbox formatting

2012-11-19 14:55:32 -05:00

_video.scss

Refactored the css and fixed some smaller bugs

2012-06-25 11:21:24 -04:00

_week.scss

Refactored the css and fixed some smaller bugs

2012-06-25 11:21:24 -04:00

.gitignore

Merge branch 'feature/btalbot/cms-settings' of

2012-11-27 12:12:43 -05:00

base-style.scss

Merge remote-tracking branch 'origin/feature/cale/cms-master' into

2012-12-11 10:55:10 -05:00

README.txt

Added new readme info and started to rework some of the css

2012-06-22 09:42:22 -04:00

README.txt

Sass Watch:

sass --watch cms/static/sass:cms/static/sass -r ./cms/static/sass/bourbon/lib/bourbon.rb