From 6aba6219c3795324e7575785a8d74ec2b35edefb Mon Sep 17 00:00:00 2001 From: Brian Jacobel Date: Mon, 20 Jun 2016 13:39:05 -0400 Subject: [PATCH 1/2] Add a third fixed case where images could overflow (refs #12735) --- lms/static/sass/discussion/views/_thread.scss | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lms/static/sass/discussion/views/_thread.scss b/lms/static/sass/discussion/views/_thread.scss index 58cc8aa74f..c552894829 100644 --- a/lms/static/sass/discussion/views/_thread.scss +++ b/lms/static/sass/discussion/views/_thread.scss @@ -134,10 +134,6 @@ body.discussion { border-radius: 3px; } } - - img { - max-width: 100%; - } } .discussion-response .response-body { @@ -207,3 +203,10 @@ body.view-in-course .discussion-article { } } } + +.thread-wrapper, +.forum-new-post-form { + img { + max-width: 100%; + } +} From 03095643c67803deaf34623b54173fdc81cc91f5 Mon Sep 17 00:00:00 2001 From: Clinton Blackburn Date: Mon, 20 Jun 2016 09:31:52 -0400 Subject: [PATCH 2/2] Exposed admin for LogoutViewConfiguration ECOM-4610 --- common/djangoapps/student/admin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/djangoapps/student/admin.py b/common/djangoapps/student/admin.py index 46dd3fa03e..5486416c54 100644 --- a/common/djangoapps/student/admin.py +++ b/common/djangoapps/student/admin.py @@ -11,7 +11,7 @@ from xmodule.modulestore.django import modulestore from config_models.admin import ConfigurationModelAdmin from student.models import ( UserProfile, UserTestGroup, CourseEnrollmentAllowed, DashboardConfiguration, CourseEnrollment, Registration, - PendingNameChange, CourseAccessRole, LinkedInAddToProfileConfiguration, UserAttribute + PendingNameChange, CourseAccessRole, LinkedInAddToProfileConfiguration, UserAttribute, LogoutViewConfiguration ) from student.roles import REGISTERED_ACCESS_ROLES @@ -183,6 +183,8 @@ admin.site.register(CourseEnrollmentAllowed) admin.site.register(Registration) admin.site.register(PendingNameChange) admin.site.register(DashboardConfiguration, ConfigurationModelAdmin) +admin.site.register(LogoutViewConfiguration, ConfigurationModelAdmin) + # We must first un-register the User model since it may also be registered by the auth app. admin.site.register(User, UserAdmin)