Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3
Conflicts: common/templates/course_modes/choose.html lms/templates/verify_student/photo_verification.html
Showing
- common/templates/course_modes/choose.html 165 additions, 94 deletionscommon/templates/course_modes/choose.html
- lms/static/sass/application.scss.mako 1 addition, 0 deletionslms/static/sass/application.scss.mako
- lms/static/sass/base/_mixins.scss 58 additions, 8 deletionslms/static/sass/base/_mixins.scss
- lms/static/sass/base/_variables.scss 42 additions, 1 deletionlms/static/sass/base/_variables.scss
- lms/static/sass/elements/_controls.scss 208 additions, 0 deletionslms/static/sass/elements/_controls.scss
- lms/static/sass/elements/_typography.scss 144 additions, 0 deletionslms/static/sass/elements/_typography.scss
- lms/static/sass/views/_verification.scss 978 additions, 389 deletionslms/static/sass/views/_verification.scss
- lms/templates/verify_student/photo_verification.html 350 additions, 222 deletionslms/templates/verify_student/photo_verification.html
- lms/templates/verify_student/show_requirements.html 132 additions, 48 deletionslms/templates/verify_student/show_requirements.html
lms/static/sass/elements/_controls.scss
0 → 100644
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment