3b5e17ef55
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
35 lines
850 B
SCSS
35 lines
850 B
SCSS
@import 'bourbon/bourbon';
|
|
|
|
@import 'base/reset';
|
|
@import 'base/font_face';
|
|
@import 'base/mixins';
|
|
@import 'base/variables';
|
|
@import 'base/base';
|
|
@import 'base/extends';
|
|
@import 'base/animations';
|
|
|
|
// Multicourse styles
|
|
@import 'shared/forms';
|
|
@import 'shared/footer';
|
|
@import 'shared/header';
|
|
@import 'shared/course_object';
|
|
@import 'shared/course_filter';
|
|
@import 'shared/modal';
|
|
@import 'shared/activation_messages';
|
|
|
|
@import 'multicourse/home';
|
|
@import 'multicourse/dashboard';
|
|
@import 'multicourse/courses';
|
|
@import 'multicourse/course_about';
|
|
@import 'multicourse/jobs';
|
|
@import 'multicourse/media-kit';
|
|
@import 'multicourse/about_pages';
|
|
@import 'multicourse/press_release';
|
|
@import 'multicourse/password_reset';
|
|
@import 'multicourse/error-pages';
|
|
@import 'multicourse/help';
|
|
@import 'multicourse/edge';
|
|
|
|
@import 'discussion';
|
|
@import 'news';
|