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
7 lines
199 B
SCSS
7 lines
199 B
SCSS
@mixin box-sizing ($box) {
|
|
// content-box | border-box | inherit
|
|
-webkit-box-sizing: $box;
|
|
-moz-box-sizing: $box;
|
|
box-sizing: $box; *behavior: url(/static/scripts/boxsizing.htc);
|
|
}
|