edx-platform

Files

cahrens f91060d197 Merge branch 'master' into feature/cas/manual-policy

Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py

2013-02-19 13:27:35 -05:00

vendor

put normalize in vendor folder

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

_account.scss

studio - nav and soft landing various QA fixes

2013-02-12 17:03:48 -05:00

_alerts.scss

studio - manual policy editor: stubbed in notification UI and testing code

2013-02-11 15:16:45 -05:00

_assets.scss

studio - resolved scss that relied on old body classes

2013-02-11 16:09:33 -05:00

_base.scss

studio - nav: resolved Firefox browser chrome page-shifting bug

2013-02-13 11:37:47 -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

resolving merge conflict and missing Sass mixin

2013-02-15 14:10:52 -05:00

_content-types.scss

tightened unit treeview styles

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

_course-info.scss

temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog)

2013-02-01 09:41:51 -05:00

_courseware.scss

studio - overview drag and drop: removed unused scss and hid new unit button while dragging

2013-02-04 14:35:04 -05:00

_dashboard.scss

tweaked body color and window styles; adjusting new buttons

2012-12-13 11:20:30 -05:00

_export.scss

studio - course export UI alpha - roughing in states/views

2012-12-26 09:10:05 -05:00

_extends.scss

studio - revising course-based navigation - initial scss setup

2013-02-01 19:57:17 -05:00

_fonts.scss

Added style for the calendar view and section view

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

_footer.scss

studio - soft landing UI: how it works pathing, html and basic layout styling

2013-02-04 09:39:36 -05:00

_graphics.scss

Tom cruft to be deleted, problem editor CSS moved to correct location.

2013-01-09 11:06:18 -05:00

_header.scss

studio - nav: generalizing is-selected styling

2013-02-13 13:40:46 -05:00

_import.scss

removed css comment

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

_index.scss

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

_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

2012-12-13 12:35:17 -05:00

_modal.scss

studio - soft landing/nav: added in functionality/content to soft landing view and started punch list

2013-02-05 11:34:28 -05: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

resolving merge conflict and missing Sass mixin

2013-02-15 14:10:52 -05:00

_section.scss

Added styles for buttons

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

_settings.scss

Merge branch 'master' into feature/cas/manual-policy

2013-02-19 13:27:35 -05:00

_static-pages.scss

studio - soft landing: revised page title structure and values

2013-02-07 14:23:00 -05:00

_subsection.scss

studio - soft landing/nav: added in functionality/content to soft landing view and started punch list

2013-02-05 11:34:28 -05:00

_unit.scss

resolving merge conflict and missing Sass mixin

2013-02-15 14:10:52 -05:00

_users.scss

clean up of users page

2012-12-13 11:28:59 -05:00

_variables.scss

studio - soft landing UI: basic signin/sign up styling and sign up markup/templating

2013-02-04 00:19:26 -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

More merge repairs. Hopefully done.

2012-12-12 17:13:55 -05:00

base-style.scss

studio - soft landing UI: how it works pathing, html and basic layout styling

2013-02-04 09:39:36 -05:00

bourbon

Somehow linked file disappeared again.

2012-12-12 10:49:22 -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