diff --git a/lms/static/sass/elements/_typography.scss b/lms/static/sass/elements/_typography.scss index 68a3cd50df..3ea9620259 100644 --- a/lms/static/sass/elements/_typography.scss +++ b/lms/static/sass/elements/_typography.scss @@ -271,14 +271,18 @@ %copy-link { border-bottom: 1px dotted transparent; +<<<<<<< HEAD &:hover, &:active, &:focus { +======= + &:hover, &:active { +>>>>>>> LMS: revises semantics and styling for dashboard messages border-color: $link-color-d1; } } %copy-badge { @extend %t-title8; - @extend %t-weight5; + @extend %t-weight3; border-radius: ($baseline/5); padding: ($baseline/2) $baseline; text-transform: uppercase; diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index 47582dd538..9740298cbe 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -75,6 +75,12 @@ margin-bottom: 15px; padding-bottom: 17px; + &:last-child { + border-bottom: none; + margin-bottom: 0; + padding-bottom: 0; + } + &:hover, &:focus { .title .icon { opacity: 1.0; @@ -760,4 +766,64 @@ margin-right: 10px; } } + + // account-related + .user-info { + + // status + .status { + + .list--nav { + margin: ($baseline/2) 0 0 0; + padding: 0; + } + + .nav__item { + @extend %t-weight4; + @include font-size(13); + margin-left: 26px; + } + } + } + + // status - verification + .status--verification { + + .data { + white-space: normal !important; + text-overflow: no !important; + overflow: visible !important; + } + + .list--nav { + margin-left: 26px; + } + + // STATE: is denied + &.is-denied { + + .data { + color: $error-color !important; + } + } + } + + // message + .msg { + margin: ($baseline/2) 0 ($baseline/2) 26px; + } + + .msg__title { + @extend %hd-lv5; + color: $lighter-base-font-color; + } + + .msg__copy { + @extend %copy-metadata; + color: $lighter-base-font-color; + + p { + @extend %t-copy; + } + } } diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index b2326cb01c..eb657d13e4 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -150,10 +150,10 @@
@@ -203,7 +190,7 @@ <% cert_status = cert_statuses.get(course.id) %> <% show_email_settings = (course.id in show_email_settings_for) %> <% course_mode_info = all_course_modes.get(course.id) %> - <%include file='dashboard/dashboard_course_listing.html' args="course=course, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info" /> + <%include file='dashboard/_dashboard_course_listing.html' args="course=course, enrollment=enrollment, show_courseware_link=show_courseware_link, cert_status=cert_status, show_email_settings=show_email_settings, course_mode_info=course_mode_info" /> % endfor diff --git a/lms/templates/dashboard/dashboard_course_listing.html b/lms/templates/dashboard/_dashboard_course_listing.html similarity index 100% rename from lms/templates/dashboard/dashboard_course_listing.html rename to lms/templates/dashboard/_dashboard_course_listing.html diff --git a/lms/templates/dashboard/_dashboard_status_verification.html b/lms/templates/dashboard/_dashboard_status_verification.html new file mode 100644 index 0000000000..da4915cef5 --- /dev/null +++ b/lms/templates/dashboard/_dashboard_status_verification.html @@ -0,0 +1,27 @@ +<%! from django.utils.translation import ugettext as _ %> +<%! + from django.core.urlresolvers import reverse + from courseware.courses import course_image_url, get_course_about_section + import waffle +%> + +<%namespace name='static' file='../static_content.html'/> + +%if verification_status == 'denied': +
  • +
    ${_("Verification Status")}
    ${verification_msg} + + + +
    +

    ${_("Please Note:")}

    +
    +

    ${_("If you fail to pass a verification attempt before the course ends, you will not receive a verified certificate.")}

    +
    +
    +
  • +%endif