diff --git a/common/djangoapps/student/views/dashboard.py b/common/djangoapps/student/views/dashboard.py index 9c7e1d0727..af8a5fc5ec 100644 --- a/common/djangoapps/student/views/dashboard.py +++ b/common/djangoapps/student/views/dashboard.py @@ -828,14 +828,6 @@ def student_dashboard(request): enr for enr in course_enrollments if entitlement.enrollment_course_run.course_id != enr.course_id ] - # Collect all program types the user is enrolled in - enrolled_program_types = [] - if getattr(settings, 'ENABLE_DEMOGRAPHICS_COLLECTION', False): - enrolled_program_types = { - _program.get('type_attrs', {}).get('slug') - for _program in meter.engaged_programs - if _program.get('type_attrs', {}).get('slug') is not None - } context = { 'urls': urls, 'programs_data': programs_data, @@ -886,7 +878,6 @@ def student_dashboard(request): 'recovery_email_message': recovery_email_message, 'recovery_email_activation_message': recovery_email_activation_message, 'show_load_all_courses_link': show_load_all_courses_link(user, course_limit, course_enrollments), - 'enrolled_program_types': enrolled_program_types, # TODO START: clean up as part of REVEM-199 (START) 'course_info': get_dashboard_course_info(user, course_enrollments), # TODO START: clean up as part of REVEM-199 (END) diff --git a/lms/static/sass/base/_build.scss b/lms/static/sass/base/_build.scss index 3aa8501618..a36bffce87 100644 --- a/lms/static/sass/base/_build.scss +++ b/lms/static/sass/base/_build.scss @@ -7,20 +7,10 @@ @import 'bootstrap/variables'; @import 'bootstrap/scss/functions'; @import 'bootstrap/scss/variables'; -@import 'bootstrap/scss/mixins/background-variant'; @import 'bootstrap/scss/mixins/box-shadow'; @import 'bootstrap/scss/mixins/breakpoints'; -@import 'bootstrap/scss/mixins/float'; @import 'bootstrap/scss/mixins/grid'; -@import 'bootstrap/scss/mixins/hover'; @import 'bootstrap/scss/mixins/reset-text'; -@import 'bootstrap/scss/mixins/screen-reader'; -@import 'bootstrap/scss/mixins/text-truncate'; -@import 'bootstrap/scss/mixins/text-emphasis'; -@import 'bootstrap/scss/mixins/text-hide'; -@import 'bootstrap/scss/mixins/visibility'; -@import 'bootstrap/scss/utilities'; - // Bootstrap components @import 'bootstrap/scss/popover'; diff --git a/lms/static/sass/elements/_system-feedback.scss b/lms/static/sass/elements/_system-feedback.scss index 27602c9460..07fd02912e 100644 --- a/lms/static/sass/elements/_system-feedback.scss +++ b/lms/static/sass/elements/_system-feedback.scss @@ -120,7 +120,7 @@ box-shadow: none; border-top: 1px solid #579cc5; padding: 20px 20px 20px 40px; - margin: -16px 0 10px 0; + margin: -16px 0 5px 0; } .fa-close { diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index de7cc4ada3..f6551b2df9 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -525,8 +525,6 @@ order: 2; .wrapper-find-courses { - margin-bottom: $baseline * 0.5; - .course-advertise { @include clearfix(); @@ -578,9 +576,31 @@ } } - .profile-sidebar { - margin-bottom: $baseline * 0.5; + .wrapper-coaching { + border: 1px solid $border-color-l3; + margin: 20px 0; + .coaching-signup { + padding: 20px; + + .coaching-prompt { + font-size: 20px; + line-height: 28px; + font-weight: bold; + } + + .coaching-link .btn-neutral { + display: block; + text-align: center; + margin: 20px 20px 0; + border-radius: 20px; + padding: 10px; + border: 1px solid theme-color('primary'); + } + } + } + + .profile-sidebar { ul { padding: 0; border: 1px solid theme-color("light"); @@ -589,6 +609,7 @@ // Responsive behavior @include media-breakpoint-down(md) { + margin: 0 $baseline $baseline*2; padding: 0; max-width: 100%; } diff --git a/lms/static/sass/shared/_forms.scss b/lms/static/sass/shared/_forms.scss index 777b6446e7..3dd8e52ec9 100644 --- a/lms/static/sass/shared/_forms.scss +++ b/lms/static/sass/shared/_forms.scss @@ -54,14 +54,9 @@ textarea { height: 60px; } -/* -Added :not(.btn-reset) because this selector is overly broad and adding an escape -path is easier than actually resetting all the bits or testing the entire platform -UI after making this code less upsetting. -*/ input[type="submit"], input[type="button"], -button:not(.btn-reset), +button, .button { border-radius: 3px; diff --git a/themes/edx.org/lms/static/images/quote_prompt.png b/themes/edx.org/lms/static/images/quote_prompt.png deleted file mode 100644 index d183adb69c..0000000000 Binary files a/themes/edx.org/lms/static/images/quote_prompt.png and /dev/null differ diff --git a/themes/edx.org/lms/static/sass/partials/lms/theme/_dashboard.scss b/themes/edx.org/lms/static/sass/partials/lms/theme/_dashboard.scss deleted file mode 100644 index be55b832a6..0000000000 --- a/themes/edx.org/lms/static/sass/partials/lms/theme/_dashboard.scss +++ /dev/null @@ -1,51 +0,0 @@ -.dashboard { - .demographics-banner { - background-color: #23419f; - border-radius: 12px; - @media (min-width: 1200px) { - height: 64px; - } - .demographics-banner-icon { - height: 140px; - } - .demographics-banner-prompt { - font-size: 24px; - line-height: 24px; - } - .demographics-banner-btn { - color: #23419f; - border-radius: 20px; - font-size: 14px; - min-width: 150px; - .fa-thumbs-up { - font-size: 24px; - } - } - } - .side-container { - .wrapper-coaching { - border: 1px solid $gray-500; - margin-bottom: $baseline * 0.5; - - .coaching-signup { - padding: 20px; - - .coaching-prompt { - font-size: 20px; - line-height: 28px; - font-weight: bold; - } - - - .coaching-link .btn-neutral { - display: block; - text-align: center; - margin: 20px 20px 0; - border-radius: 20px; - padding: 10px; - border: 1px solid theme-color('primary'); - } - } - } - } -} diff --git a/themes/edx.org/lms/static/sass/partials/lms/theme/_extras.scss b/themes/edx.org/lms/static/sass/partials/lms/theme/_extras.scss index 1f104fa2e0..c57107fe37 100644 --- a/themes/edx.org/lms/static/sass/partials/lms/theme/_extras.scss +++ b/themes/edx.org/lms/static/sass/partials/lms/theme/_extras.scss @@ -7,7 +7,6 @@ // rules into modular pieces. @import 'certificates'; -@import 'dashboard'; // Ensure the header matches the edx.org marketing site header diff --git a/themes/edx.org/lms/templates/dashboard.html b/themes/edx.org/lms/templates/dashboard.html index 891392b328..bf9010e783 100644 --- a/themes/edx.org/lms/templates/dashboard.html +++ b/themes/edx.org/lms/templates/dashboard.html @@ -140,26 +140,6 @@ from student.models import CourseEnrollment
- <% - MB_SLUG = "microbachelors" - enrolled_in_mb_program = MB_SLUG in enrolled_program_types - account_mfe_url = getattr(settings, 'ACCOUNT_MICROFRONTEND_URL', '') or '' - %> - % if getattr(settings, 'ENABLE_DEMOGRAPHICS_COLLECTION', False) and enrolled_in_mb_program: - -
- -
- ${_("Want to make edX better for everyone?")} -
- -
- - % endif

${_("My Courses")}